Begin refactoring for better separation of client/server and logic/presentation
Merge branch 'master' of https://github.com/Dewb/grotto

Conflicts:
	server/server.coffee