reinstate gunicorn in requirements.txt, because it's included in INSTALLED_APPS
Merge branch 'wagtail0.5'
Merge branch 'develop'

Conflicts:
	django-verdant/requirements.txt
Merge branch 'develop'
Merge branch 'develop'
changed footer links for ticket #169