Various small bugfixes for a non-pagerduty, non-ses deployment.

Hi folks,

When deploying on a non-pagerduty, non-SES deployment, I had a few issues.  Let me know what you think.  I can split up the PR if you want.

Thanks!