Various changes
Merge branch 'dair' of https://github.com/jtopjian/puppet-admin into dair