Add the resources.py script to analyze our OpenStack resource usage.

	new file:   scripts/resources.py
PEP 8 Compliance.
	modified:   api/machine.py
Typo in get_access_list.
	modified:   core/models/machine_request.py
Manually intervention is required to use this script. Raise exception instead of running it.

This script no longer works because it uses groupy, which is currently unsupported.

	modified:   scripts/import_core_services.py
Merge pull request #2 from iPlantCollaborativeOpenSource/abyssinian-nightjar

Abyssinian nightjar
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere
Fix change variable that was being missed by sed
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

Conflicts:

	scripts/import_core_services.py
Remove .iplantc.org references from atmo.conf.dist
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere

Conflicts:
	extras/apache/atmo.conf.dist
Update atmo.conf.dist for crushbone usability
Search and replace
	modified:   atmosphere/settings/__init__.py
Modified logrotate scripts so that they actually.. You know.. Work
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Merge commit '2502122bd5b36af585bed6fade27e19c126ba784'

Conflicts:
	extras/apache/atmo.conf.dist
Merge commit 'd0be0fb'
Merge branch 'abyssinian-nightjar'
Merge branch 'abyssinian-nightjar' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Missed a git add on API Exceptions
Merge branch 'abyssinian-nightjar' of https://github.com/iPlantCollaborativeOpenSource/atmosphere