tests passing
bump version
Merge branch 'develop' into spark-1.1

Conflicts:
	dev-resources/log4j.properties
	project.clj
oops
Merge branch 'spark-1.1' into develop

Conflicts:
	project.clj