Update dependencies. Update format for pip 1.5.
	modified:   requirements.txt
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere
Limit upper bounds of celery version.
Open range of ipython
	modified:   requirements.txt
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere

Conflicts:
	requirements.txt
	modified:   requirements.txt
	modified:   templates/cf2/index.html
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere