Back to original script =)
Merge branch 'master' of github.com:cirope/puppet

Conflicts:
	modules/unicorn/templates/init.sh.erb