Saving current work on django 1.6
Merge remote-tracking branch 'origin/django-1.6'

Conflicts:
	johnny/backends/memcached.py
	johnny/cache.py
	johnny/tests/cache.py
	johnny/tests/testapp/urls.py
	johnny/tests/web.py
	johnny/transaction.py
	manage.py
	settings.py
Fixes tests after merging django-1.6 branch.