PEP8 Compliance.
	modified:   service/cache.py
Remove old imports.
	modified:   web/views.py
Update to pypi depedencies.
	modified:   requirements.txt
Merge branch 'abyssinian-nightjar' of github.com:iPlantCollaborativeOpenSource/atmosphere into abyssinian-nightjar

Conflicts:
	requirements.txt