Git pull merge.
Begin new workflow for quantum. A single public router and unique subnet ranges.
Renamed functions to be pep8 compliant.
	modified:   core/models/profile.py
	modified:   scripts/import_users.py
	modified:   service/accounts/openstack.py
	modified:   service/api/__init__.py
	modified:   service/driver.py
	modified:   service/drivers/openstackUserManager.py
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere

Conflicts:
	service/api/__init__.py
	service/drivers/openstackNetworkManager.py

	modified:   authentication/protocol/ldap.py
	modified:   core/admin.py
	new file:   init_files/30/mount_volume
	modified:   resources/js/cf2/collections/base.js
	modified:   resources/js/cf2/collections/instances.js
	modified:   resources/js/cf2/collections/machines.js
	modified:   resources/js/cf2/collections/notifications.js
	modified:   resources/js/cf2/collections/providers.js
	modified:   resources/js/cf2/collections/sizes.js
	modified:   resources/js/cf2/collections/volumes.js
	modified:   resources/js/cf2/models/instance.js
	modified:   resources/js/cf2/templates/instance_screen/resize_instance_form.html
	modified:   resources/js/cf2/views/instance_screen/instance_tabs_holder.js
	modified:   resources/js/cf2/views/instance_screen/resize_instance_form.js
	modified:   service/api/__init__.py
	modified:   service/api/instance.py
	modified:   service/drivers/eucalyptus_driver.py
	modified:   service/drivers/openstackImageManager.py
	modified:   service/drivers/openstackNetworkManager.py
	modified:   service/tasks/driver.py