get rid of those pesky .pyc files
get rid of .swp files
we already have dj-static in base.txt so we don't also need it in production.txt
Merge branch 'develop' of github.com:briandant/mentor_up into develop

Conflicts:
	mentorup/users/forms.pyc