this and that
Merge branch 'master' of github.com:Liberationtech/django-nailgun