Redirect ZK log4j to slf4j and logback
Some more fixes to get assembly working
Merge branch 'urmilan/sbt-assembly' of https://github.com/socrata/geospace into urmilan/sbt-assembly

Conflicts:
	project/build.scala