Merge branch 'python3' of github.com:benjaoming/django-wiki into python3

Conflicts:
	.travis/requirements.txt
	wiki/models/urlpath.py
	wiki/tests/__init__.py
	wiki/views/article.py

wiki/views/article.py

@@ -101,7 +101,6 @@ class Create(FormView, ArticleMixin):
                 messages.error(self.request, _("There was an error creating this article: %s") % str(e))
             else:
                 messages.error(self.request, _("There was an error creating this article."))
-            transaction.commit()
             return redirect('wiki:get', '')
 
         url = self.get_success_url()