Merge pull request #245 from damjanek/master

Get rid of connecting to RMQ via VIP