Merge branch 'gunnr' of github.com:iPlantCollaborativeOpenSource/atmosphere
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Merge branch 'herja' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Merge branch 'herja' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Merge branch 'herja' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Merge branch 'herja' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Merge branch 'herja' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Remove console.log testing messages
Update instance_list_item.js

Fix bug that was preventing instance loading bars to be created.
Checks if the provider is of the openstack type

If provider is of the openstack type, then progress bars load.
PEP8 Compliance.
	modified:   core/tasks/instance.py
Merge branch 'gunnr' into herja
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere into herja
Merge branch 'herja' of github.com:iPlantCollaborativeOpenSource/atmosphere into herja

Conflicts:
	resources/js/cf2/views/sidebar/instance_list_item.js