imrpovements to setup.py
Merge branch 'master' of github.com:cfpb/django-nudge

Conflicts:
	setup.py