Upgrade gemspec, also code to work with Rails 4
Merge branch 'release/1.2.0'

* release/1.2.0:
  Upgrade gemspec, also code to work with Rails 4