version bump submodule
merge conflict
remove rabbitmq from the services that monit watches
Merge pull request #27 from rackerjoe/master

Merged automatically by jenkins after successful build test