Add new method in authentication.protocol.ldap for add_openstack_user script.
	modified:   authentication/protocol/ldap.py
Commented out old remove_* statements
Conflicting files merged
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into stable
Stable version 0.12.1 prod.
	modified:   atmosphere/settings/__init__.py
	modified:   atmosphere/version.py
	modified:   core/migrations/0011_build_created_by_identity.py
Fixed machine_request import statement
Time allocation will not appear when unused by an identity
Merging stable code