project.clj version bump to 2.2.0
Merge branch 'master' into macosx