Initial migration from hg
Merge branch 'master' into py3

Conflicts:
	AUTHORS
	CHANGELOG.rst
	LICENSE
	docs/conf.py
	storages/__init__.py
	storages/backends/apache_libcloud.py
	storages/backends/couchdb.py
	storages/backends/database.py
	storages/backends/gs.py
	storages/backends/hashpath.py
	storages/backends/image.py
	storages/backends/mogile.py
	storages/backends/mongodb.py
	storages/backends/overwrite.py
	storages/backends/s3boto.py
	storages/backends/sftpstorage.py
	storages/backends/symlinkorcopy.py
	storages/tests/hashpath.py
	storages/tests/s3boto.py
	tox.ini