Add gaurd clause to protect rails crash if email.yml is not present
Resolving local merge conflicts
Add error handling for email yml
Merge pull request #114 from banana-slugs-2014/yml-fix

Yml fix