Fixed the unpin test
Fixed the failing tests, made exported settings UPPERCASE, use django.conf.settings instead of farnsworth.settings
Merge branch 'master' into dev

Conflicts:
	managers/templates/announcements.html