Merge with origin/master.
	modified:   auth/decorators.py
	modified:   auth/token.py
	modified:   core/models/__init__.py
	modified:   scripts/import_users.py
	modified:   service/api/meta.py
Initial allocation changes.
	modified:   core/__init__.py
	modified:   service/api/__init__.py
	new file:   service/api/allocation.py
	modified:   service/driver.py
	modified:   service/drivers/openstack_driver.py
	modified:   service/linktest.py
	new file:   core/tasks/__init__.py
	new file:   core/tasks/allocation.py
	new file:   core/tasks/synchronize.py
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere

Conflicts:
	scripts/import_users.py
Add service.tasks driver and machine.
Update set_permissions to properly configure extras/ssh.
	modified:   scripts/set_permissions.sh
Add asynchronous deploy through a mixin and celery tasks. Add migrations for authenication.
	new file:   authentication/migrations/0003_initial.py
	modified:   extras/apache/shell.conf
	modified:   init_files/30/atmo-init-full.py
	modified:   service/api/__init__.py
	modified:   service/api/instance.py
	modified:   service/api/machine_export.py
	modified:   service/api/machine_request.py
	modified:   service/driver.py
	modified:   service/instance.py
	modified:   service/machine.py
	modified:   service/mixins/driver.py
	new file:   service/tasks/__init__.py
	modified:   service/tasks/driver.py
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere