Fiddled a little
Merge branch 'controller' of github.com:GOAAAT/tuningcomplete into controller

Conflicts:
	app/app.ls
Controller: Disconnect does disconnecty things.