diff --git a/requirements/base.txt b/requirements/base.txt
index 7023ca0..8449e82 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -3,21 +3,18 @@ django >= 1.7, < 1.9
 django-appconf
 django-compressor
 django-contrib-comments
+django-ckeditor
 django-extra-views
 django-grappelli
-django-imagekit
 django-markdown
-django-social-auth
-feedparser
+easy-thumbnails
+flup
 icalendar
-jsmin
-markdown < 2.5
-MySQL-python
+markdown
 pillow
 psycopg2
 PyJWT
 python-social-auth
 pytz==2013d
 requests
-requests-oauthlib
-django-ckeditor
+requests-oauthlib
\ No newline at end of file
diff --git a/requirements/development.txt b/requirements/development.txt
index 4405d8d..e60116c 100644
--- a/requirements/development.txt
+++ b/requirements/development.txt
@@ -1,6 +1,7 @@
 -r base.txt
+flake8
+autoflake
 django-debug-toolbar
 django-sslserver
 rosetta
 sqlparse
-bzr+https://code.launchpad.net/~adam.russell/pyexiv2/pyexiv2-0.3