Update version.
Update requirements to address minor version changes that affect Atmosphere.

	modified:   atmosphere/version.py
	modified:   requirements.txt
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere

Conflicts:
	requirements.txt
Fixed authentication API and changed init.d

Init.d now allows for faster reboots, authentication works at the API level.
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Add is_atmo_user method to authentication.protocol.ldap.
Implement new command line utility scripts/add_openstack_user.py.
	modified:   authentication/protocol/ldap.py
	new file:   scripts/add_openstack_user.py
Update version. So it's in sync with stable.
	modified:   atmosphere/version.py
InstanceStatusHistory added to models
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
InstanceStatusHistory added to API
* Load testing settings only when DEBUG is true.
* Require local and secrets settings files.

Previously, an exception from badly importing local.py and secrets.py
was caught but nothing was done to bail out. At that time, both files
were thought to be optional to override settings in __init__.py at the
administrator's discretion. Now, they are required to exist on a
per-server basis.
* Fix settings override.
Removed line that destroys all logs from a new image
Implement and fix InstanceStatusHistory functionality for different instance actions.
	modified:   api/instance.py
Add created_by_identity to Instance, Machine, ProviderMachine and Volume.
Add created_by to Volume and ProviderMachine.
	modified:   core/models/instance.py
	modified:   core/models/machine.py
	modified:   core/models/volume.py
Add initial allocation implementation.
Add initial South migration for adding more created_by and
created_by_identity fields. Still nullable.
Add initial service.allocation rules module.

	new file:   core/migrations/0009_auto__add_field_volume_created_by__add_field_volume_created_by_identit.py
	new file:   core/migrations/0010_auto__add_allocation__add_field_identitymembership_allocation.py
	modified:   core/models/__init__.py
	new file:   core/models/allocation.py
	modified:   core/models/group.py
	new file:   service/allocation.py
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere
Added new data migration to fill created_by_identity
	new file:   core/migrations/0011_build_created_by_identity.py
created_by_identity addressed in createInstance
Add allocation to admin.
Add created_by_identity functionality to core.models.instance.
	modified:   core/admin.py
	modified:   core/models/allocation.py
	modified:   core/models/instance.py
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere

Conflicts:
	core/models/instance.py