Merge with latest master from upstream. Fix merge conflict with Leiningen.gitignore

diff --cc Leiningen.gitignore
index 62e854668012efd3cc52da4e995dcc4ea86f983e,211769cbee903b8a6c8821b1aa3933b87970cb02..b8740f70e8bfa81d5a4b62ee88dd0090f68f8645
--- 1/Leiningen.gitignore
--- 2/Leiningen.gitignore
+++ b/Leiningen.gitignore
@@@ -4,4 -4,4 +4,5 @@@ pom.xm
  /classes/
  /targets/
  .lein-deps-sum
 +.lein-repl-history
+ .lein-plugins/