Small classes rename.
Compatibility with Django 1.6
Merge branch 'master' into dev

Conflicts:
	gu_multihost/admin.py
	gu_multihost/metadata.py
	gu_multihost/models.py
	gu_multihost/templatetags/multihost.py
	gu_multihost/urls.py
	gushuley/multihost/__init__.py
	requirements.txt
Merge branch 'dev' of github.com:agushuley/django-multihost into dev

Conflicts:
	gu_multihost/mh_utils.py
	gushuley/multihost/mh_utils.py
	gushuley/multihost/middleware.py