fixed the subject line for feedback e-mails
some minor changes
fixing merge conflicts
removing duplicate gems
Merge pull request #154 from jjliang/master

merge me