better logging of doc update conflicts in case processing and one fix

Case:61447
Merge pull request #68 from dimagi/update-conflicts

better logging of doc update conflicts in case processing and one fix
include location uuids in case json export
Merge branch 'master' into droos
Merge pull request #69 from dimagi/droos

add location to case json export
case "subcase" wrapping in cloucdcare API (NOT EXHAUSTIVE)
Merge pull request #70 from dimagi/droos

return cases wrapped as correct document subclass in cloudcare api
Add a couple of missing deps; possibly not true casexml deps (TODO: figure that out)
Set up quieter test logging
Merge pull request #71 from kennknowles/missing-deps

Missing deps
Spew couch version
Spew uname -a
Spew lsb_release -a
Add PPA and upgrade couchdb to 1.3
Merge pull request #72 from kennknowles/couch-fixey

Couch fixey
Merge branch 'master' into case_multimedia

Conflicts:
	setup.py