Changes made to stable being checked in..
Conflicts have been merged
Bugs found and fixed while debugging prod
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into stable
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into stable
Update sha1sum for atmo_init_full.py
	modified:   init_files/30/atmo-initer.rb
machine_requests to show the new_machine if it exists.
	modified:   api/serializers.py
Improve error logging.
	modified:   authentication/decorators.py
	modified:   service/tasks/driver.py
	modified:   service/tasks/volume.py
Added *.json to .gitignore.
	modified:   .gitignore
Use created_by_identity to access provider from core.models.Instance.
	modified:   api/notification.py
Added provider credentials to the admin screen