Add stephenrjohnson/puppet
Merge branches 'passenger' and 'production' into production