Fixed some issues

Conflicts:

	templates/monit/unicorn.erb