Changes $alias to $fcgi_alias to preent Puppet complaining about using that name
Merge branch 'change-alias-variable-name'

Conflicts:
	templates/fastcgi/server.erb