Initial changes for notification fix.
tidy
Remove logging; fix Gemfile.
Merge branch 'master' into notification_fix
Fix spaces.
Remove commented code.
Set status to empty string in factory email_template_without_status.
Add logging.
Merge branch 'master' into notification_fix