resque to be start/stopped by blue
stableish
Fix merge
udate readme
udate readme
Merge branch 'origin/master' into origin/working

Conflicts:
	templates/monit.conf.erb