Rearrange requirements so that we always have test requirements installed

requirements.txt

@@ -4,9 +4,7 @@ beautifulsoup==3.2.1
 boto==2.6.0
 django-celery==3.0.11
 django-countries==1.5
-django-debug-toolbar-mongo
 django-followit==0.0.3
-django-jasmine==0.3.2
 django-keyedcache==1.4-6
 django-kombu==0.9.4
 django-mako==0.1.5pre
@@ -19,29 +17,20 @@ django-ses==0.4.1
 django-storages==1.1.5
 django-threaded-multihost==1.4-1
 django==1.4.3
-django_debug_toolbar
-django_nose==1.1
-dogapi==1.2.1
-dogstatsd-python==0.2.1
-factory_boy==1.3.0
 feedparser==5.1.3
 fs==0.4.0
 GitPython==0.3.2.RC1
 glob2==0.3
 http://sympy.googlecode.com/files/sympy-0.7.1.tar.gz
-ipython==0.13.1
 lxml==3.0.1
 mako==0.7.3
 Markdown==2.2.1
-mock==0.8.0
 MySQL-python==1.2.4c1
 networkx==1.7
-newrelic==1.8.0.13
 nltk==2.0.4
-nosexcover==1.0.7
 numpy==1.6.2
 paramiko==1.9.0
-path.py
+path.py==3.0.1
 Pillow==1.7.8
 pip
 pygments==1.5
@@ -51,11 +40,37 @@ python-memcached==1.48
 python-openid==2.2.5
 pytz==2012h
 PyYAML==3.10
-rednose==0.3
 requests==0.14.2
 scipy==0.11.0
 Shapely==1.2.16
 sorl-thumbnail==11.12
 South==0.7.6
-sphinx==1.1.3
 xmltodict==0.4.1
+
+# Used for debugging
+ipython==0.13.1
+
+
+# Metrics gathering and monitoring
+dogapi==1.2.1
+dogstatsd-python==0.2.1
+newrelic==1.8.0.13
+
+# Used for documentation gathering
+sphinx==1.1.3
+
+# Used for testing
+coverage==3.6
+factory_boy==1.3.0
+lettuce==0.2.15
+mock==0.8.0
+nosexcover==1.0.7
+pep8==1.4.5
+pylint==0.27.0
+rednose==0.3
+selenium==2.31.0
+splinter==0.5.0
+django_nose==1.1
+django-jasmine==0.3.2
+django_debug_toolbar
+django-debug-toolbar-mongo

test-requirements.txt

-coverage==3.6
-pylint==0.27.0
-pep8==1.4.5
-lettuce==0.2.15
-selenium==2.31.0
-splinter==0.5.0
-