Server is split up into modules
Merge branch 'master' of https://github.com/lfowles/drunken-bugfixes