Upgrade from makefile version to tutor

[frohro]

An interesting thing is that the config.yml seems to get modified by trying to start tutor. it is missing a number of items if I look at it now, including the port numbers.
Rob