Adding heartbeat, on socket close code and close reason, and refactoring code to use WebSocket enums rather
Increasing heartbeat time interval
Using MS suffix
Fix Flash docs
Add Flash examples to Readme and alias Flash in all Views
Phoenix.Controller.Flash no longer auto-aliased in Controllers
Merge pull request #362 from gjaldon/flash-docs

Flash docs
Fix errors on phoenix.js client and handle heartbeat messages
Resolve conflicts
Update phoenix.js template source
Add channel heartbeat enhancement
Make constructor Browserify compatible
Make constructor Browserify compatible
Merge remote-tracking branch 'origin/master'
Merge pull request #364 from dokie/master

Internal Constructor compatible with Browserify
Import Plug.Conn into router, closes #365