Initial boostrap upgrade from 2.3.1 to 3.0.0
Updated header and footer on index page
Base level of css changes have been made
Changes made to instances, seetings, alert modals
Volume related changes
Added the most important developer on the project
updated template, views for bootstrap 3
Bad LDAP line caused exceptions..
Support for jenkins and flower added to atmo.conf
Merge branch 'stable' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into stable
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into stable
Required changes to import_users_from_euca.py (run by cron)
Preparing for release of Openstack-Tucson

* AU name fixed in resource usage charts
* Changed allocation delta to one year (Unreachable)
* Updated import_users_from_openstack to make specific changes to staff members
* Updated import_users_from_openstack to increase default quota for all openstack users
* Changed name in scripts from 'HavanaStack' to 'Openstack-Tucson (BETA)'
Simplified by using existing connection information.
	modified:   service/quota.py
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere
Added two scripts for adding a new provider to atmosphere, and adding users to the new provider
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into stable
Quota change that requires an update to rtwo
Requirements.. need pip 1.4.1
Merged