Merge pull request #4 from mattdvhope/mod2

Pull request to merge mod2 with master.
Merge pull request #5 from mattdvhope/mod3

Pull request to merge mod3 with master.
Merge pull request #6 from mattdvhope/mod3

Pull request to merge mod3 with master.
Merge pull request #7 from mattdvhope/mod4

Pull request to merge mod4 with master.
Merge pull request #8 from mattdvhope/mod4

First half of Week 4 pull-request.
Merge pull request #9 from mattdvhope/mod4

Configured mailer for production
Worked on yml