Update version.
Update requirements to address minor version changes that affect Atmosphere.

	modified:   atmosphere/version.py
	modified:   requirements.txt
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere

Conflicts:
	requirements.txt