All but one server.peer.spec.js tests are passing, need to merge in work from master
All but one server.peer.spec.js tests are passing, need to merge in work from master

RocHack/grooveboat,RocHack/grooveboat