Pulled sorting out into its own method
Implemented query for combo_data with arel
Implemented filtering with arel, improved date eq filter
Merge remote-tracking branch 'wupdiwup/master'