preso and websocket cleanup
Merge branch 'master' of github.com:krimple/quizzo-ete