PEP8 Compliance.
	modified:   rtwo/drivers/openstack.py
Fix and refactor occupancy.
	modified:   rtwo/meta.py
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/rtwo
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/rtwo