Fixed CI Version
Merge github.com:soluvas/puppet-nginx into HEAD

Conflicts:
	templates/codeigniter.erb