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

.travis/Gemfile

@@ -3,6 +3,8 @@ source 'https://rubygems.org'
 group :rake do
   gem 'puppetlabs_spec_helper'
   gem 'librarian-puppet-maestrodev'
+  gem 'open3_backport', :platforms => :ruby_18
+  gem 'json',           :platforms => :ruby_18
 end
 
 if puppetversion = ENV['PUPPET_GEM_VERSION']

manifests/init.pp

@@ -63,7 +63,7 @@ class nginx (
   include stdlib
 
   if (!is_string($worker_processes)) and (!is_integer($worker_processes)) {
-    fail('$worker_processes must be be an integer or have value "auto".')
+    fail('$worker_processes must be an integer or have value "auto".')
   }
   if (!is_integer($worker_connections)) {
     fail('$worker_connections must be an integer.')