Making private methods protected to allow mocking.
Merge branch 'master' of github.com:jtreminio/Puphpet