made email work on Steve's server
Merge branch 'master' of https://github.com/anniekyles/great_north