move all server stuff into root dir to make heroku happy
Gavin made some changes to the client code.
Merge branch 'master' of github.com:theodi/colleen