begin socket mocha tests
refactor tests into two files, tests pass
server tests pass
merge master 11/16 with server-side tests
Merge branch 'master' into mocha
Merge pull request #52 from kinetech/mocha

Mocha server tests
Merge branch 'master' of https://github.com/kinetech/Performance
Merge branch 'master' into serverstate