Revert boostrap order change

Added comment explaining why.

client/remote.go

@@ -58,22 +58,24 @@ func (remote *RemoteVPS) Bootstrap(runner SSHSession, name string, config *Confi
 		return err
 	}
 
-	println("\n>> Step 3/4: Fetching daemon API token...")
-	token, err := remote.getDaemonAPIToken(runner, config.Version)
+	// This step needs to run before any other commands that rely on
+	// the daemon image, since the daemon is loaded here.
+	println("\n>> Step 3/4: Starting daemon...")
 	if err != nil {
 		return err
 	}
-	remote.Daemon.Token = token
-	err = config.Write()
+	err = remote.DaemonUp(runner, config.Version, remote.IP, remote.Daemon.Port)
 	if err != nil {
 		return err
 	}
 
-	println("\n>> Step 4/4: Starting daemon...")
+	println("\n>> Step 4/4: Fetching daemon API token...")
+	token, err := remote.getDaemonAPIToken(runner, config.Version)
 	if err != nil {
 		return err
 	}
-	err = remote.DaemonUp(runner, config.Version, remote.IP, remote.Daemon.Port)
+	remote.Daemon.Token = token
+	err = config.Write()
 	if err != nil {
 		return err
 	}

client/remote_test.go

@@ -106,8 +106,8 @@ func TestBootstrap(t *testing.T) {
 	// Make sure all commands are formatted correctly
 	assert.Equal(t, string(dockerScript), session.Calls[0])
 	assert.Equal(t, string(keyScript), session.Calls[1])
-	assert.Equal(t, tokenScript, session.Calls[2])
-	assert.Equal(t, daemonScript, session.Calls[3])
+	assert.Equal(t, daemonScript, session.Calls[2])
+	assert.Equal(t, tokenScript, session.Calls[3])
 }
 
 func TestInstrumentedBootstrap(t *testing.T) {