--find-links=http://www.pythonware.com/products/pil/
# django
-Django>=1.4,<1.5
+Django>=1.6,<1.7
+fnpdjango>=0.1.15,<0.2
South>=0.7 # migrations for django
-django-pipeline>=1.2.24,<1.3
+django-pipeline>=1.3,<1.4
django-pagination>=1.0
django-maintenancemode>=0.10
-django-piston>=0.2.2,<0.2.3
-#django-jsonfield
--e git+git://github.com/bradjasper/django-jsonfield.git@2f427368ad70bf8d9a0580df58ec0eb0654d62ae#egg=django-jsonfield
+django-piston>=0.2.2.1,<0.2.3
+jsonfield>=0.9.20
django-picklefield
-#django-allauth>=0.4,<0.5
-# version of django-allauth 0.4 with install script fixed
--e git+git://github.com/pennersr/django-allauth.git@3a03db9b2ecca370af228df367bd8fa52afea5ea#egg=django-allauth
+django-modeltranslation
+django-allauth>=0.16,<0.17
+
pytz
-pyScss
+
+# Some contrib apps still need it
+simplejson
django-honeypot
django-uni-form
python-memcached
-piwik
+django-piwik
python-fb
# Feedparser
-Feedparser>=4.1
+Feedparser>=5.1
-# PIL
-PIL>=1.1.6
+Pillow
mutagen>=1.17
sorl-thumbnail>=11.09,<12
# MySQL-python>=1.2,<2.0
# celery tasks
-django-celery>=2.5.1
-django-kombu
+django-celery>=3.1,<3.2
# spell checking
pyenchant
# OAI-PMH
pyoai
-egenix-mx-base
+## egenix-mx-base # Doesn't play nice with mx in dist-packages.
sunburnt
+django-getpaid>=1.6,<1.7