Update to rails 4 scope notation