Upgrade scopes for Rails 4
Merge pull request #1 from jonsgreen/master

Upgrade scopes for Rails 4