Fix for Rails 4

Here's how you merge the scopes together as in issue #8 and some tests for this behavior

Please let me know when you've released so I can switch back to the official gem.