Merge pull request #65 from mdidier9/WebSocket

Web socket
updated tests-- still need more to check happy path
Merge pull request #66 from mdidier9/pingas_controller_spec

updated tests-- still need more to check happy path
Fixed user settings lists from dissppearing
Merge branch 'master' into WebSocket