Use stephenrjohnson/puppet to manage puppetmaster configuration
Merge branches 'passenger' and 'master'