make middleware!
Merge branch 'master' into middleware

Conflicts:
	lib/faye-rails/routing_hooks.rb
Fatal error when the user has the `Rack::Lock` in the stack.
Bump to version 2.0