Checkpoint work so it can be worked on at home
Merge branch 'master' into squeel-query-fix
Merge branch 'master' into squeel-query-fix
First step toward completely restructuring filters to be controller-based rather than model-based.
Progress toward better filtering code.
Merge branch 'master' into squeel-query-fix
Fitlers work at the test level; need to wire up to the GUI.
GEM updates
'or' filters now working! WHEEEE!
And again
This time for sure!
Travis is being a pain...
Update .travis.yml
Update .travis.yml
Update .travis.yml
Update database.travis.yml
Update database.travis.yml
Update .travis.yml
Update test_helper.rb
Hopefully this will fix Travis' wagon!