Add djcelery.schedulers.DatabaseScheduler to .gitignore.
Add djcelery.schedulers.DatabaseScheduler to .gitignore.
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere into gunnr
Merge branch 'gunnr' of github.com:iPlantCollaborativeOpenSource/atmosphere into gunnr
Merge branch 'gunnr' of github.com:iPlantCollaborativeOpenSource/atmosphere into herja
Monitor instances is running and enforcing again
Merge branch 'gunnr' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into gunnr
Adjust percentages so that they cannot exceed 100%

while fixing negative AU's to be greater than or equal to zero

	modified:   resources/js/cf2/views/instance_screen/resource_charts.js
Merge branch 'gunnr' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into herja
Remove hypervisor capacity check from resume_instance..
Added simple check after provider machine/application have been loaded. Name conflicts are resolved by trusting 'The Cloud'
Merge branch 'gunnr' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into herja
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere