Typo on HypervisorCapacityExceptions
Missing api/hypervisor.py
Merge branch 'gunnr' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into gunnr