Remove django's database cache. Add new requirements.
	modified:   atmosphere/settings/__init__.py
	modified:   requirements.txt
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere

Conflicts:
	atmosphere/settings/__init__.py