Fix broken single row upsert + error handling that doesn't work properly
Merge branch 'master' into urmilan/fix-broken-upsert

Conflicts:
	soda-fountain-lib/src/main/scala/com/socrata/soda/server/computation/GeospaceHandler.scala
Merge pull request #18 from socrata/urmilan/fix-broken-upsert

Fix broken single row upsert and error handling