fixed issue where channel filtering was triggered on all channel events
Merge remote-tracking branch 'upstream/master' into threadsocket-rails

Conflicts:
	lib/websocket_rails/dispatcher.rb
update .ruby-version and Gemfile.lock
update gemspec to include new websocket-rails-js gem