Revert "<Revert "Revert "Revert "Revert "Revert "Merge branch 'master' of https://github.com/Fonzie2k/puppetmaster""""""

This reverts commit 9e50d486f704e420db2bc8248cdf21b230b05a32.