server fixes
new stuff
Merge branch 'master' of https://github.com/jisnut/cupidcruncher