PEP8 Compliance and remove libcloud warning.
	modified:   scripts/import_core_services.py
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere
Fixed an LDAP lookup
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
List security groups before renaming them
Removed a consistently-failing test case until it can be resolved
Attempting to fix discrepencies between security group init on havana & grizzly
Back to stable.. i hope..
Use the metadata server's public-hostname for the instance's hostname.
	modified:   init_files/30/atmo-initer.rb
	modified:   init_files/30/atmo_init_full.py
Use atmo-init's existing metadata functionality.

	modified:   init_files/30/atmo-initer.rb
	modified:   init_files/30/atmo_init_full.py
Use 'hostname' instead of 'public-hostname'.
	modified:   init_files/30/atmo-initer.rb
	modified:   init_files/30/atmo_init_full.py
Merged changes with dalloway and used new Openstack JSON metadata service to get the correct hostname. SHA1 updated on initer
Verified working, updated logging and sha1
merging with esteve.
	modified:   init_files/30/atmo-initer.rb
merging with esteve.
	modified:   init_files/30/atmo_init_full.py
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere

Conflicts:
	init_files/30/atmo-initer.rb
	init_files/30/atmo_init_full.py
Added basic support for writing the custom public-hostname to metadata
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Updated hostname and local ip functions to work with new networking-metadata on Atmosphere
PEP8 Compliance..