Merge branch 'develop' into ik-next

Conflicts:
	imagekit/__init__.py
	imagekit/conf.py
	imagekit/generators.py
	imagekit/models/fields/files.py
	imagekit/utils.py
	tests/core/tests.py

docs/changelog.rst

@@ -1,6 +1,17 @@
 Changelog
 =========
 
+v2.0.2
+------
+
+- Fixed the pickling of ImageSpecFieldFile.
+- Signals are now connected without specifying the class and non-IK models
+  are filitered out in the receivers. This is necessary beacuse of a bug
+  with how Django handles abstract models.
+- Fixed a `ZeroDivisionError` in the Reflection processor.
+- `cStringIO` is now used if it's available.
+- Reflections on images now use RGBA instead of RGB.
+
 v2.0.1
 ------
 

docs/conf.py

@@ -50,9 +50,9 @@ copyright = u'2011, Justin Driscoll, Bryan Veloso, Greg Newman, Chris Drackett &
 # built documents.
 #
 # The short X.Y version.
-version = '2.0.1'
+version = '2.0.2'
 # The full version, including alpha/beta/rc tags.
-release = '2.0.1'
+release = '2.0.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

tox.ini

@@ -9,35 +9,35 @@ commands = make test
 [testenv:py27-django14]
 basepython = python2.7
 deps =
-    Django>=1.4
+    Django>=1.4,<1.5
     Pillow
 
 [testenv:py27-django13]
 basepython = python2.7
 deps =
-    Django>=1.3,<=1.4
+    Django>=1.3,<1.4
     Pillow
 
 [testenv:py27-django12]
 basepython = python2.7
 deps =
-    Django>=1.2,<=1.3
+    Django>=1.2,<1.3
     Pillow
 
 [testenv:py26-django14]
 basepython = python2.6
 deps =
-    Django>=1.4
+    Django>=1.4,<1.5
     Pillow
 
 [testenv:py26-django13]
 basepython = python2.6
 deps =
-    Django>=1.3,<=1.4
+    Django>=1.3,<1.4
     Pillow
 
 [testenv:py26-django12]
 basepython = python2.6
 deps =
-    Django>=1.2,<=1.3
+    Django>=1.2,<1.3
     Pillow