corrected project.clj version string to 2.1.0, min-lein-version bump to 2.3.2
Merge branch 'dev'
Merge branch 'master' into macosx