fix the tests so they're not asserting wrong behaviour
fix activerecord's completely broken where clause merge semantics
fix tests that were relying on AR's ridiculous behaviour
Merge pull request #61 from github/3-0-github+ar-3-1+fix-broken-where-behaviour

[3.0+AR3.1] Backport broken where merge fix