Update dependencies. Update format for pip 1.5.
	modified:   .gitignore
	modified:   requirements.txt
	modified:   rtwo/drivers/openstack_network.py
	modified:   rtwo/settings.py
	modified:   rtwo/version.py
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/rtwo