Merge pull request #153 from diceydawg/umass_branch

Fixing interactions
fixing merge conflicts
removing duplicate gems
Merge pull request #154 from jjliang/master

merge me
fixing merge conflicts
changing mail to
changing mail to
changing mail to
changing mailer
Merged