Merge pull request #68 from visible-difference/develop

Develop merge into master
Merge pull request #70 from visible-difference/develop

Develop merge into master
remove mailer from model for heroku
Merge pull request #71 from visible-difference/master

working changes, back merge into develop