Updated apache conf to avoid 502 Proxy Errors
Updated to use the latest version of rtwo (libcloud_15)
Some small code changes required to fix attach/detach volumes with new RTwo impl.
[ATMO-521] Added support for <api>/identity/#
ATMO-517: Throw 409 Conflict when user attempts to terminate with an attached volume
PEP8 Compliance.
	modified:   api/instance.py
Use pypi version of threepio.
	modified:   requirements.txt
Merge branch 'abyssinian-nightjar' of github.com:iPlantCollaborativeOpenSource/atmosphere into abyssinian-nightjar
Jenkins configuration was wrong. Missing FQDN.
	modified:   atmo.conf.dist
Add force parameter to get_cached_* methods in service.cache.
	modified:   service/cache.py
Fix service.volume.create_volume method to use correct rtwo libcloud method.
	modified:   service/volume.py
Update provider name. Though generally add_openstack_user.py is deprecated.
	modified:   scripts/add_openstack_user.py
Updated apache configuration to use mod_macro
Add test to check volume attachment before call to Async delete
Merge conflicts resolved. Added SSL information to the macro
Merge branch 'abyssinian-nightjar'