diff --git a/.gitignore b/.gitignore
index 4b57895..a125b27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ dist/
 paramiko.egg-info/
 test.log
 docs/
+_build
diff --git a/.travis.yml b/.travis.yml
index c9802a8..29e44e5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,9 @@ python:
 install:
   # Self-install for setup.py-driven deps
   - pip install -e .
-  - pip install coveralls
+  # Dev (doc/test running) requirements
+  - pip install coveralls # For coveralls.io specifically
+  - pip install -r dev-requirements.txt
 script: coverage run --source=paramiko test.py --verbose
 notifications:
   irc:
diff --git a/dev-requirements.txt b/dev-requirements.txt
new file mode 100644
index 0000000..59a1f14
--- /dev/null
+++ b/dev-requirements.txt
@@ -0,0 +1,6 @@
+# For newer tasks like building Sphinx docs.
+# NOTE: Requires Python >=2.6
+invoke>=0.6.1
+invocations>=0.4.4
+sphinx>=1.1.3
+alabaster>=0.1.0
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index 75112a2..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-pycrypto
-tox
diff --git a/site/dev-requirements.txt b/site/dev-requirements.txt
deleted file mode 100644
index 524b806..0000000
--- a/site/dev-requirements.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-invoke>=0.6.1
-invocations>=0.4.4
-sphinx==1.1.3
diff --git a/site/tasks.py b/tasks.py
similarity index 99%
rename from site/tasks.py
rename to tasks.py
index e2d952b..d470dab 100644
--- a/site/tasks.py
+++ b/tasks.py
@@ -1,6 +1,7 @@
 from invoke import Collection
 from invocations import docs, testing
 
+
 # TODO: let from_module specify new name
 api = Collection.from_module(docs)
 # TODO: maybe allow rolling configuration into it too heh
diff --git a/tox-requirements.txt b/tox-requirements.txt
new file mode 100644
index 0000000..26224ce
--- /dev/null
+++ b/tox-requirements.txt
@@ -0,0 +1,2 @@
+# Not sure why tox can't just read setup.py?
+pycrypto
diff --git a/tox.ini b/tox.ini
index 6cb8001..af4fbf2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,5 +2,5 @@
 envlist = py25,py26,py27
 
 [testenv]
-commands = pip install --use-mirrors -q -r requirements.txt
+commands = pip install --use-mirrors -q -r tox-requirements.txt
            python test.py