HOTFIX - 'suspended - resuming' and 'active - suspending' will both disable Suspend/Restart actions
Don't use name, use alias.
Bad format
UPDATE CAS2 --> 2.1, Add auth_prefix to CASClient & SAMLClient
Easier debugging of SAML for CAS testing
Bad varname
Update formatting.
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
Missing import.
	modified:   api/machine.py
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
Fix machine list API endpoint.

* Fix method signature.
* Raise 500 error and use failure_response when there is an error instead of invalid_creds.

	modified:   api/machine.py
Fix method signature.

* Add missing parameter as keyword.
* Fix spelling in debug log.

	modified:   service/tasks/driver.py
Change provider location name hard-coded in script to point to our default provider.
	modified:   scripts/add_openstack_user.py
PEP8 Compliance.

	modified:   core/models/instance.py
Merge branch 'abyssinian-nightjar' of github.com:iPlantCollaborativeOpenSource/atmosphere into abyssinian-nightjar
Changes to ensure codebase works on both NEW and OLD UIs.