updated main readme

README.md

@@ -84,27 +84,25 @@ $ deactivate
 
 Now install python dependencies
 ```
-$ pip install -r python_dependencies.txt
+$ pip install -r ./conf/dependencies.txt
 ```
 
-python_dependencies.txt
+dependencies.txt
 ```
 Django==1.5.4
 Pillow==2.2.1
 South==0.8.2
-argparse==1.2.1
+gunicorn==18.0
 matplotlib==1.3.0
 nose==1.3.0
 numpy==1.7.1
+psycopg2==2.5.1
 pydicom==0.9.8
 pyparsing==2.0.1
 python-dateutil==2.1
 setproctitle==1.1.8
 six==1.4.1
 tornado==3.1.1
-bleach==1.2.2
-html5lib==0.95
-psycopg2==2.5.1
 yolk==0.4.3
 ```
 
@@ -232,10 +230,10 @@ $ easy_install pip
 
 ##### Install the rest of the dependencies that actually work through PIP
 ```
-$ pip install -r python\_dependencies\_windows.txt
+$ pip install -r dependencies.txt
 ```
 
-python\_dependencies\_windows.txt
+dependencies.txt
 ```
 Django==1.5.4
 South==0.8.2
@@ -347,4 +345,4 @@ If you get an error like "GROUP not found" when going to /users:
   * Add Group "email_validated"
   * Save
 
-Done!
+Done!

conf/dependencies.txt

@@ -0,0 +1,15 @@
+Django==1.5.4
+Pillow==2.2.1
+South==0.8.2
+gunicorn==18.0
+matplotlib==1.3.0
+nose==1.3.0
+numpy==1.7.1
+psycopg2==2.5.1
+pydicom==0.9.8
+pyparsing==2.0.1
+python-dateutil==2.1
+setproctitle==1.1.8
+six==1.4.1
+tornado==3.1.1
+yolk==0.4.3