merge pull #711 by fillman (Replace meta_where with squeel, fix pending rspec tests)