diff --git a/bin/lein b/bin/lein
index 96800587c..eb9988f94 100755
--- a/bin/lein
+++ b/bin/lein
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Ensure this file is executable via chmod a+x lein, then place it
+# Ensure this file is executable via `chmod a+x lein`, then place it
 # somewhere on your $PATH, like ~/bin. The rest of Leiningen will be
 # installed upon first run into the ~/.lein/self-installs directory.
 
diff --git a/bin/release b/bin/release
index c31f7bdaa..5eabd4538 100755
--- a/bin/release
+++ b/bin/release
@@ -48,3 +48,5 @@ echo "Also deploy this release of leiningen-core to Clojars."
 # git push && git push --tags
 # git checkout preview && git merge master && git push
 # Drop version back to SNAPSHOT
+
+# TODO: update windows install instructions on leiningen.org for 2.1
diff --git a/leiningen-core/src/leiningen/core/project.clj b/leiningen-core/src/leiningen/core/project.clj
index a3c273002..5d9bd5697 100755
--- a/leiningen-core/src/leiningen/core/project.clj
+++ b/leiningen-core/src/leiningen/core/project.clj
@@ -311,7 +311,8 @@
   (atom {:default [:base :user :provided :dev]
          :base {:resource-paths ["dev-resources"]
                 :jvm-opts ["-XX:+TieredCompilation" "-XX:TieredStopAtLevel=1"]
-                :test-selectors {:default '(constantly true)}
+                :test-selectors {:default (with-meta '(constantly true)
+                                            {:displace true})}
                 :checkout-deps-shares [:source-paths
                                        :resource-paths
                                        :compile-path]}
diff --git a/leiningen-core/test/leiningen/core/test/project.clj b/leiningen-core/test/leiningen/core/test/project.clj
index e56f35105..87049ac4b 100755
--- a/leiningen-core/test/leiningen/core/test/project.clj
+++ b/leiningen-core/test/leiningen/core/test/project.clj
@@ -201,7 +201,12 @@
                          :profiles
                          {:bar {:foo ^{:replace true, :a 3, :b 2} [3 4]}}}))
                  (merge-profiles [:bar])
-                 :foo meta))))))
+                 :foo meta))))
+    (testing "that built-in ^:replace values are properly replaced"
+      (is (= '(constantly false)
+             (-> (make {:test-selectors {:default '(constantly false)}})
+                 (merge-profiles [:base])
+                 :test-selectors :default))))))
 
 (def test-profiles (atom {:qa {:resource-paths ["/etc/myapp"]}
                           :test {:resource-paths ["test/hi"]}
diff --git a/src/leiningen/test.clj b/src/leiningen/test.clj
index 05a6816fb..91709f2e7 100644
--- a/src/leiningen/test.clj
+++ b/src/leiningen/test.clj
@@ -29,7 +29,7 @@
 
 (defn- form-for-select-namespaces [namespaces selectors]
   `(reduce (fn [acc# [f# args#]]
-             (if (vector? f#)               
+             (if (vector? f#)
                (filter #(apply (first f#) % args#) acc#)
                acc#))
            '~namespaces ~selectors))
@@ -172,7 +172,8 @@ specified test. A default :all test-selector is available to run all tests."
     (let [project (project/merge-profiles project [:leiningen/test :test])
           [nses selectors] (read-args tests project)
           form (form-for-testing-namespaces nses nil (vec selectors))]
-      (try (when-let [n (eval/eval-in-project project form '(require 'clojure.test))]
+      (try (when-let [n (eval/eval-in-project project form
+                                              '(require 'clojure.test))]
              (when (pos? n)
                (throw (ex-info "Tests Failed" {:exit-code n}))))
            (catch clojure.lang.ExceptionInfo e