Merge branch 'master' of https://github.com/jfryman/puppet-nginx