Merge pull request #34 from badnack/development

Development
Merge pull request #35 from badnack/development

Development
Merge pull request #36 from badnack/development

Development
Added UserMailer per Devise website instructions
Merge branch 'development' of https://github.com/scalableinternetservices/Suppr into development

Merging mail stuff.
comment
fixing merge