Add changes suggested by python-modernize
Missing colon
Add six as a requirement
Convert iterator to list to allow extension with + operator
Stray tab
Merge branch 'py2and3' of github.com:Russell-Jones/django-wiki into python3
Add six to travis requirements.txt
Try to work around (necessary) absence of force_unicode in Django on python 3
Replace basestring with six.string_types
Import only string_types from six
Start using from __future__ import unicode_literals everywhere
Remove u from  u"" and u''
Start to remove calls to unicode()
Correct position of from future import
Convert filter iterator to list() to allow subscript
Merge branch 'master' into python3
Add python 3.2 and 3.3 to trigger branch tci build
Switch to Pillow and the dev version of sorl v12
Merge pull request #229 from benjaoming/master

Merge changes to master into python3
Switch to python3-style unicode everywhere str()
Switch to python3-style unicode everywhere str()
Move to python3-style unicode everywhere str()