rework port
Merge branch 'pahoughton-devel' of http://github.com/pahoughton/puppet-master into pahoughton-devel
Merge branch 'pahoughton-devel' of http://github.com/pahoughton/puppet-master into pahoughton-devel