Merge branch 'master' of https://github.com/jfryman/puppet-nginx into rip-out-module-data

Conflicts:
	docs/hiera.md

docs/hiera.md

@@ -1,5 +1,6 @@
 # Usage of Hiera
 
+<<<<<<< HEAD
 Passing through parameters from the main Class[nginx] and then having them chain down to Class[nginx::config] creates a ton of unnecessary spaghetti code that makes the module more complex to understand and difficult to extend.
 
 Going forward, it is recommended to declare your changes in Hiera based on the system(s) role and location in your environment. In Puppet < 3.x, this is accomplished with Hiera bindings.

templates/vhost/location_footer.erb

@@ -39,4 +39,3 @@
   <%- end -%>
 <% end -%>
   }
-

templates/vhost/location_header.erb

@@ -1,3 +1,4 @@
+
   location <%= @location %> {
 <% if @internal -%>
     internal;
@@ -52,4 +53,4 @@
     <%- Array(@raw_prepend).each do |line| -%>
     <%= line %>
     <%- end -%>
-<% end -%>
+<% end -%>

templates/vhost/vhost_header.erb

@@ -94,4 +94,3 @@ server {
 
   access_log            <%= @access_log_real %>;
   error_log             <%= @error_log_real %>;
-