Merge branch 'abyssinian-nightjar' of github.com:iPlantCollaborativeOpenSource/atmosphere into abyssinian-nightjar
Add the resources.py script to analyze our OpenStack resource usage.

	new file:   scripts/resources.py
Add CLI script for adding ldap users to Atmosphere.

Remove broken import script for core services. The new script provides more flexibility.
	deleted:    import_core_services.py
	new file:   import_ldap.users.py
Merge branch 'herja' of github.com:iPlantCollaborativeOpenSource/atmosphere into herja
PEP8 Compliance.
	modified:   core/models/machine.py
Add cors support.
	modified:   atmosphere/settings/__init__.py
	modified:   requirements.txt
PEP8 and rearrange imports.
	modified:   service/deploy.py
PEP8 Compliance.
PEP8 Compliance. Rearrange imports.
	modified:   service/tasks/driver.py
Merge branch 'herja' into abyssinian-nightjar

Conflicts:
	api/application.py
	api/machine.py
	api/project.py
	atmosphere/urls.py
	authentication/decorators.py
	core/models/machine.py
	resources/js/cf2/views/feedback_link.js
Merge branch 'abyssinian-nightjar' of github.com:iPlantCollaborativeOpenSource/atmosphere into abyssinian-nightjar

Conflicts:
	api/application.py
	api/machine.py
	api/project.py
	atmosphere/urls.py
	authentication/decorators.py
	core/models/machine.py
	service/tasks/driver.py
Updated name to fit 'import user' script naming conventions
Remove append_slash to conform with new API urls.py changes
Optional end-slash to support new and old UI way of calling URLs
Fix deployment of init_files

Continued to add optional / to urls found in the Main App conf.
Fix to apache.conf to retrieve init_files when using troposphere
Send emails when deploy fails
Improve robustness on init_files.

Atmo_init_full will no longer crash if JSON metadata cannot be retrieved
TYPO! Missing commas in denyhost list
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere

Conflicts:
	extras/apache/atmo.conf.dist