Upgrade to SBT 0.13.5 / latest cloudbees plugin / sbt-license-report
Upgrade to officially released spray-caching
Use latest thirdparty-utils and expanded DiscoveryConfig
Add basic metrics reporting infrastructure
Merge branch 'master' into velvia/add-metrics

Conflicts:
	project/build.scala
	src/main/scala/ScalatraBootstrap.scala
Fix sbt assembly break
Get tests to pass using newer thirdparty-test-utils
Add a bunch of metrics for georegion-coding
Add timing metrics for shapefile decompression and ingest
Merge pull request #26 from socrata/velvia/add-metrics

Add Metrics to Geospace
Merge branch 'master' into urmilan/index-georegions-for-suggestion

Conflicts:
	src/test/scala/com/socrata/geospace/FakeSodaFountain.scala