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
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