Merge branch 'master' of /home/git/repositories/paull/puppet-monit into develop
Adding vagrant and puppet-lint updates
Adding travis-ci build status button
Merge branch 'master' into develop
Moving main config to hash based template
Github safe rc
Spec fixes