Cleaned whitespace
Updates reflecting the new bunny subscribe api
Added heartbeat configuration setting