Release v2.1.4

Update location to match concat expected values

Release v2.1.1

Merge branch 'master' of https://github.com/mburger/puppet-nginx into…

… mburger-master

Conflicts:
	templates/conf.d/nginx.conf.erb

Version bump

Updated Geppetto project file

Merge pull request netmanagers#42 from netmanagers/master

Fix Debian configuration

Lints and fix for default file

Merge and lint netmanagers#33

Merge pull request netmanagers#34 from netmanagers/master

Modify nginx::resource::* to manage different distros