Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
	em-websocket.gemspec
	lib/em-websocket.rb
	lib/em-websocket/connection.rb
	lib/em-websocket/framing07.rb
	lib/em-websocket/handler.rb
	lib/em-websocket/handshake04.rb
	lib/em-websocket/masking04.rb
	lib/em-websocket/message_processor_06.rb
	lib/em-websocket/version.rb
	lib/em-websocket/websocket.rb
	spec/helper.rb
	spec/integration/draft06_spec.rb
	spec/integration/draft13_spec.rb
	spec/unit/framing_spec.rb