Travis include test on 2.1.1
Updating generator to use correct model for Rails 3 or 4
Merge pull request #19 from mattconnolly/master

Update generators for Rails 3 or 4