Added node_modules to .gitignore, bumped package.json to use a new version of amqp.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	.npmignore
	package.json