diff --git a/.gitignore b/.gitignore
index 39be296605811694feb7c5d809a89e52a9a85e0e..801e831b7a8f2c45073aa139c5c787e1fd709de5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ pom.xml.asc
 .hgignore
 .hg/
 .idea/
+/docs
diff --git a/README.md b/README.md
index f9aaaafb3837a8336e1401e45960f9505cd8358f..07f399e9da6f77311c3985f83ac8420b58ad1247 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,18 @@ FIXME: explanation
 
     $ java -jar metabase-init-0.1.0-standalone.jar [args]
 
+## Documentation
+
+Generate documentation with
+
+    lein marg
+
+## Unit Tests
+
+Run unit tests with
+
+    lein expectations
+
 ## Options
 
 FIXME: listing of options this app accepts.
diff --git a/circle.yml b/circle.yml
new file mode 100644
index 0000000000000000000000000000000000000000..a8b32d3ead3ac50dfb79b8bfc5b0a7998f44ecf7
--- /dev/null
+++ b/circle.yml
@@ -0,0 +1,3 @@
+test:
+  override:
+    - lein expectations
diff --git a/project.clj b/project.clj
index dc4ddd02434e5c7a48255322d87adf2d894fc4a6..40a129d46750227d64e44885fc11c11d1e81e3ac 100644
--- a/project.clj
+++ b/project.clj
@@ -5,6 +5,8 @@
             :url "http://www.eclipse.org/legal/epl-v10.html"}
   :min-lein-version "2.0.0"
   :dependencies [[org.clojure/clojure "1.6.0"]
+                 [expectations "2.0.12"]     ; unit tests
+                 [marginalia "0.7.1"]        ; for documentation
                  [environ "0.5.0"]                              ; easy environment management
                  [org.clojure/tools.logging "0.3.1"]            ; logging framework
                  [log4j/log4j "1.2.17" :exclusions [javax.mail/mail
@@ -13,9 +15,11 @@
                                                     com.sun.jmx/jmxri]]
                  [korma "0.4.0"]                                ; SQL lib
                  ]
-  :plugins [[lein-environ "0.5.0"]
-            [lein-midje "3.1.3"]
-            [cider/cider-nrepl "0.8.2"]                         ; for development w/ Emacs
+  :plugins [[cider/cider-nrepl "0.8.2"]      ; Interactive development w/ cider NREPL in Emacs
+            [lein-environ "0.5.0"]           ; easy access to environment variables
+            [lein-expectations "0.0.7"]      ; run unit tests with 'lein expectations'
+            [lein-midje "3.1.3"]             ; another unit testing option
+            [lein-marginalia "0.7.0"]        ; generate documentation with 'lein marg'
             ]
   :main ^:skip-aot metabase.core
   :target-path "target/%s"