dev is up
Merge branch 'master' of https://github.com/strongjz/puppet