sjgjohnston: Committing ActionMailer component, and some db migration ch...

...anges/corrections...