Updating gitignore
Merge branch 'master' of https://github.com/cndreisbach/qu
Merge branch 'master' of github.com:cfpb/qu
Adding Intellij .iml to gitignore
merging latest
Merge branch 'master' of github.com:cfpb/qu
Merge branch 'master' of github.com:cfpb/qu
Groundwork for mplementing pagination. "Find" queries now return a map
with 'total', 'size', and 'data' keys. Aggregations return the same for
compatibility. HTML and CSV renderers are updated to expect new data
format. JSON renderer unchanged and consequently returns data in the new
format
Changed get-find and get-aggregation to return a QueryResult record instead of a map
For mongo-aggregation, removed ->/when around group and project because they are required; set the default limit for aggregation much higher because the notion of limiting an aggregation is uncommon, but we do not want to enable massive queries, either. This will need to be reconsidered / refactored out as a configuration setting
Merge branch 'master' of github.com:cfpb/qu
Merge branch 'pagination'
Indentation fixes
Merge pull request #15 from marcesher/master

Integrating the groundwork for mongo pagination
Merge branch 'master' into rest

Conflicts:
	src/cfpb/qu/views.clj