Develop

Reverts earlier patch, syncs with upstream repo, applies new patch to get confirmations working again with node-amqp 0.2.0