Merge branch 'master' of github.com:Ladas/rjr

Conflicts:
	lib/rjr/amqp_node.rb