Merge branch 'stable' of github.com:iPlantCollaborativeOpenSource/atmosphere
Stop updating metadata if the instance has terminated
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Added pubkey for dboss
Fixed spacing in pub keys
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere
Merge branch 'stable' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Allocation won't search providers that are inactive or end-dated. Better logging in task deploy failure
Moving from environ['HOME'] to os.path.expanduser('~')
Fix deny_host_whitelist problem. Fix USER_HOME_DIR. PEP8 Compliance.

Fixed in v2.

	modified:   init_files/v2/atmo_init_full.py
Fix deny_host_whitelist problem. Fix USER_HOME_DIR. PEP8 Compliance.

Fixed in v1.

	modified:   init_files/v1/atmo-initer.rb
	modified:   init_files/v1/atmo_init_full.py
Fix spacing around checkbox for licensing.
	modified:   resources/js/cf2/templates/instance_screen/request_imaging_form.html
Merge conflicts resolved between stable/master
Merge conflicts resolved between stable/master
Atmo_init_full v2 supports appending '/etc/motd.more' to the respective MotD for CentOS/Ubuntu.. Re-organization of file op's
Admins can update application regardless of ProviderMachines existance on the cloud
Added 'status' line to admin panel for machine requests
Bad line missing description=
[ATMO-271] Remove api/v1/ endpoint.
	modified:   atmosphere/urls.py
Refactored the Deploy_chain() to be a list of links, so that link_error will notify users when deploy has failed by setting their status to: 'active - deploy_failed'