cbss commit
Merge branch 'master' of https://github.com/3dfxmadscientist/cbss-server

Combining work togather is why the merge