revert back to pusher
Merge branch 'revert_to_pusher'

Conflicts:
	app/models/message.rb
	app/views/layouts/_pusher.html.erb
	app/views/messages/create.js.erb
Merge remote-tracking branch 'origin/master'