Fixes 'Scope variable name is a FalseClass, not a string' with puppet 3
Merge remote-tracking branch 'dhutty/master'

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