Clean up client controller
Merge branch 'master' of http://github.com/keesjandevries/briefhack
Clean up a few more bits of client controller