Remove all files related to faye and attempt at using Websockets
Resolve merge conflicts