Merge pull request #3 from jamonholmgren/remove_boilerplate

Removed boilerplate
Update version of Promotion to 1.2.0
Merge pull request #4 from tmbeihl/patch-1

Update version of Promotion gem in gemfile to 1.2.0
conflicts