Merge branch 'atmo-294' into gunnr
Merge branch 'gunnr' of github.com:iPlantCollaborativeOpenSource/atmosphere into gunnr

Conflicts:
	service/tasks/allocation.py
monitor_instances_for now makes one call for instances and works as expected

Modified the monitor instances algorithm with the help of rtwo.instance 'owner'
attribute and new rtwo.driver method to collect all tenants, swap id for name,
map the tenants to the instances and then run the original method for testing
instance allocation and updating histories.
Merge branch 'gunnr' of https://github.com/iPlantCollaborativeOpenSource/atmosphere