Update env requirement files

requirements/base.txt

-Django>=1.6.4,<=1.7.99
-MySQL-python==1.2.5
-Pillow==2.4.0
+Django==1.7.7
 django-autoslug==1.7.2
+django-jsonfield==0.9.13
 django-sendfile==0.3.6
 django-split-settings==0.1.1
 djangorestframework==2.4.4
+drf-nested-routers==0.9.0
 eav-django==1.4.7
-python-memcached==1.53
+MySQL-python==1.2.5
+Pillow==2.7.0
 python-ldap==2.4.19
-django-jsonfield==0.9.13
-drf-nested-routers
+python-memcached==1.53
\ No newline at end of file

requirements/conda-dev-env.txt

+# This file may be used to create an environment using:
+# $ conda create --name <env> --file <this file>
+# platform: osx-64
+binstar=0.10.1=py27_3
+clyent=0.3.4=py27_0
+freetype=2.4.10=1
+jpeg=8d=1
+libtiff=4.0.2=1
+openssl=1.0.1k=1
+pillow=2.7.0=py27_0
+pip=6.1.1=py27_0
+python=2.7.9=1
+python-dateutil=2.4.2=py27_0
+pytz=2015.2=py27_0
+pyyaml=3.11=py27_0
+readline=6.2=2
+requests=2.6.0=py27_0
+setuptools=15.0=py27_0
+six=1.9.0=py27_0
+sqlite=3.8.4.1=1
+tk=8.5.18=0
+yaml=0.1.4=1
+zlib=1.2.8=0