needed for unittest
Merge branch 'pahoughton-test' of github.com:pahoughton/puppet-nginx into pahoughton-test