New utility script: check_volumes.py - Prints the username and all volumes associated with the username
Replacement jwt.py and changes for OAuth. Bugfix when selecting specific users on OpenStack image requests
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into stable

Conflicts:
	authentication/jwt.py
	core/models/machine_request.py
Improve /api/v1/identity endpoint.

* Add support for multiple identities per provider
* Ignore inactive or end_dated providers.

	modified:   api/identity.py
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into stable
Remove /beta endpoint in production.
	modified:   atmosphere/urls.py
Protect against sizes that are undefined.
	modified:   resources/js/cf2/views/new_instance_screen/instance_size_dropdown.js
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into stable
Fix bug introduced with new client side capacity code.
	modified:   resources/js/cf2/views/new_instance_screen/instance_size_dropdown.js
	modified:   resources/js/cf2/views/new_instance_screen/new_instance_screen.js
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into stable
@Steve FOR SHAME!! Using str.title to format!

* One Line Fixes Are The Best.

	modified:   core/models/provider.py
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into stable
Update to the new Havana Openstack location name.

* Name changed per Edwin's request.

	modified:   scripts/import_users_from_euca.py
Update to the new Havana Openstack location name.

* Part deux.

	modified:   scripts/import_core_services.py
Changes to production atmosphere

* Allowed hosts in unicode
* added 'get_staff_users' to ldap protocol
* Removed write_app_data until metadata to avoid conflicts with production data
* Scripts changes
* ENFORCING suspend when allocation is exceeded.
Added iplant matching to show openstack functionality
Merge conflict resolved
Merge branch 'stable' of github.com:iPlantCollaborativeOpenSource/atmosphere

Conflicts:
	scripts/import_core_services.py
Fix to SSLErroor uncaught in rtwo/linktest
Change prepare_driver to use get_esh_driver instead of DriverManager.
	modified:   api/__init__.py