Fixed dependencies on clj-jargon that I screwed up in the merge.
Merge branch '1.6.2' into 1.8

Conflicts:
	project.clj