Fix Rails 4 #with_scope deprecation-warning
Merge pull request #369 from AKoetsier/master

Fixes Rails 4 #with_scope deprecation-warning