Merge pull request #2 from hubspotdevops/rabbitmq_support

Several fixes to handle rabbitmq properly.

I'm also doing a pull request upstream for these changes.
lint several of my changes
lint some issues that were already in existence.