Merge pull request #1 from jlambert121/master

Updated for evenup
Merge pull request #2 from jlambert121/master

Gemfile updates, travis updates, add guard, add modules