Set 'ENV' to be '(ENV)' in the subject lines of emails. Also changed the message block header from '>' to '|+' which preserves newlines and formatting as it is in the config file itself (minus leading space, of course).
Updated Capfile to so it will not exit with error status due to deploy:restart task not being defined.
Merge branch 'refs/heads/development' into staging