diff --git a/project.clj b/project.clj
index 2f69996..2671cb0 100644
--- a/project.clj
+++ b/project.clj
@@ -1,35 +1,51 @@
 (defproject com.taoensso/nippy "2.6.0-alpha4"
+  :author "Peter Taoussanis <https://www.taoensso.com>"
   :description "Clojure serialization library"
   :url "https://github.com/ptaoussanis/nippy"
   :license {:name "Eclipse Public License"
-            :url  "http://www.eclipse.org/legal/epl-v10.html"}
-  :dependencies [[org.clojure/clojure      "1.4.0"]
-                 [org.clojure/tools.reader "0.8.3"]
-                 [org.iq80.snappy/snappy   "0.3"]
-                 [org.tukaani/xz           "1.4"]]
-  :profiles {:1.4   {:dependencies [[org.clojure/clojure "1.4.0"]]}
-             :1.5   {:dependencies [[org.clojure/clojure "1.5.1"]]}
-             :1.6   {:dependencies [[org.clojure/clojure "1.6.0-beta1"]]}
-             :dev   {:dependencies []}
-             :test  {:jvm-opts ["-Xms1024m" ; Initial heap size
-                                "-Xmx2048m" ; Max heap size
-                                ]
-                     :dependencies [[expectations                  "1.4.56"]
-                                    [org.xerial.snappy/snappy-java "1.1.1-M1"]
-                                    [reiddraper/simple-check       "0.5.6"]
-                                    [org.clojure/data.fressian     "0.2.0"]]}
-             :bench {:dependencies [] :jvm-opts ^:replace ["-server"]}}
-  :aliases {"test-all"    ["with-profile" "+test,+1.4:+test,+1.5:+test,+1.6" "expectations"]
-            "test-auto"   ["with-profile" "+test" "autoexpect"]
-            "start-dev"   ["with-profile" "+dev,+test,+bench" "repl" ":headless"]
-            "start-bench" ["trampoline" "start-dev"]
-            "codox"       ["with-profile" "+test" "doc"]}
-  :plugins [[lein-expectations "0.0.8"]
-            [lein-autoexpect   "1.2.1"]
-            [lein-ancient      "0.5.4"]
-            [codox             "0.6.7"]]
-  :min-lein-version "2.0.0"
-  :global-vars {*warn-on-reflection* true}
+            :url  "http://www.eclipse.org/legal/epl-v10.html"
+            :distribution :repo
+            :comments "Same as Clojure"}
+  :min-lein-version "2.3.3"
+  :global-vars {*warn-on-reflection* true
+                *assert* true}
+  :dependencies
+  [[org.clojure/clojure      "1.4.0"]
+   [org.clojure/tools.reader "0.8.3"]
+   [org.iq80.snappy/snappy   "0.3"]
+   [org.tukaani/xz           "1.4"]
+   [com.taoensso/encore      "0.8.0"]]
+
+  :test-paths ["test" "src"]
+  :profiles
+  {:build {:hooks ^:replace []} ; Workaround to avoid :dev hooks during deploy
+   :1.5  {:dependencies [[org.clojure/clojure "1.5.1"]]}
+   :1.6  {:dependencies [[org.clojure/clojure "1.6.0-beta1"]]}
+   :test {:jvm-opts     ["-Xms1024m" "-Xmx2048m"]
+          :dependencies [[expectations                  "1.4.56"]
+                         [reiddraper/simple-check       "0.5.6"]
+                         [org.xerial.snappy/snappy-java "1.1.1-M1"]
+                         [org.clojure/data.fressian     "0.2.0"]]
+          :plugins [[lein-expectations "0.0.8"]
+                    [lein-autoexpect   "1.2.2"]]}
+   :dev
+   [:1.6 :test
+    {:jvm-opts ^:replace ["-server" "-Xms1024m" "-Xmx2048m"]
+     :hooks []
+     :dependencies []
+     :plugins []}]}
+
+  :plugins [[lein-ancient "0.5.4"]
+            [codox        "0.6.7"]]
+
+  ;; :codox {:sources ["target/classes"]} ; For use with cljx
+  :aliases
+  {"test-all"   ["with-profile" "+test:+1.5,+test:+1.6,+test" "expectations"]
+   "test-auto"  ["with-profile" "+test" "autoexpect"]
+   "start-dev"  ["with-profile" "+dev" "repl" ":headless"]
+   "codox"      ["with-profile" "+test" "doc"]
+   "deploy-lib" ["with-profile" "+dev,+build" "deploy" "clojars"]}
+
   :repositories
   {"sonatype"
    {:url "http://oss.sonatype.org/content/repositories/releases"