Fixes a server bug and removes a resolved TODO
Merge branch 'master' of github.com:datalurkur/Bushido-Mongers