Change X-Socrata-Rollup to X-SODA2-Rollup.
They come from query server now instead of query coordinator.
Merge pull request #30 from socrata/rollup-header2

Change X-Socrata-Rollup to X-SODA2-Rollup.
Add parameter $$no_rollup to skip rollup.
Merge pull request #31 from socrata/no-rollup

Add parameter $$no_rollup to skip rollup.
Missing an updated file in test.
Merge pull request #32 from socrata/miss-a-changed-file

Missing an updated file in test.
Setting version to 0.2.1
Setting version to 0.2.2-SNAPSHOT
Merge branch 'master' into urmilan/compute-column-on-add

Conflicts:
	soda-fountain-lib/src/main/scala/com/socrata/soda/server/resources/Resource.scala