Merge Phoenix.WebSocket with Phoenix.Transport.WebSocket
Merge pull request #542 from gjaldon/merge-websocket-modules

Merge Phoenix.WebSocket with Phoenix.Transport.WebSocket