HOTFIX - 'suspended - resuming' and 'active - suspending' will both disable Suspend/Restart actions
Bad format
Add count to clean_empty_ips, fix variable name, update flower access list.

	modified:   extras/init.d/celeryd.default
	modified:   service/instance.py
	modified:   service/tasks/driver.py
Add new machine image icons.

	new file:   resources/machine_images/maloof_ico.png
	new file:   resources/machine_images/maloof_ico_1.png
	new file:   resources/machine_images/symap_img.png
	new file:   resources/machine_images/symap_img_1.png
Ops changes: devices must be detached from fixed ip port, remove network when all instances are inactive
UPDATE RTWO: repair_instance_networking script added
Merge branch 'herja' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into herja
Merge branch 'herja' into abyssinian-nightjar