god fix
god configs

Conflicts:
	environments/production/manifests/god.pp
god conf.d dir
init script god

Conflicts:
	modules/god/init-god.sh.erb
god location
moved god to external repo