Pusher hooked up correctly
Merge branch 'chat-beacon' of ssh://github.com/Crushpath/crushpath-js into chat-beacon

Conflicts:
	chat-beacon.js