Merge branch 'atmo-273'
Merge branch 'atmo-273'
ATMO-294 Improve performance of monitor_instances.

* The old monitor_instances used too many resources and was
  too slow.
* The new monitor_instances doesn't need to work with Euca!
* Currently takes approximately 20 seconds down from > 2 minutes.

	modified:   service/tasks/allocation.py
Merge branch 'atmo-294' into gunnr
Merge branch 'gunnr' of github.com:iPlantCollaborativeOpenSource/atmosphere into gunnr

Conflicts:
	service/tasks/allocation.py