* fixed a silly mistake in the settings file
* changed the makefile so that test does the correct thing (starts up ControllerServer.py and does not startup VMManager.py)