manifests/conf.pp: fixed a typo in error message.
Merge pull request #236 from php-coder/patch-1

manifests/conf.pp: fixed a typo in error message.
workaround missing librarian-puppet dependencies

librarian-puppet-maestrodev gem specifies Ruby 1.8 dependencies incorrectly. open3_backport and json are required on Ruby 1.8
but are not currently installed. See
https://github.com/maestrodev/librarian-puppet/issues/16
Merge pull request #237 from 3flex/patch-1

workaround missing librarian-puppet-maestrodev dependencies
remove sort array in location_custom_cfg_*
Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev