Modified exc. message to provide details about offending volume
Removed references to default project. Bugfix on project exchange, create new permission for ProjectOwner
Hotfix for machine requests that error twice in a row
add cf2 route to apache conf

For serving up the Arturo UI on the Tropo server
Merge pull request #7 from iPlantCollaborativeOpenSource/add-cf2-router-to-apache-conf

add cf2 route to apache conf
Making progress through filter_applications, progress marker.
Added three utility methods using 'socket' module to acquire and test IP address/hostname
Merge branch 'herja' into abyssinian-nightjar
Removed reference to get_default_project
Updated celery-flower to accept ADMIN_USER and ADMIN_PASS for basic authorization (While OAuth2 is down til next update)
Merge branch 'ATMO-503_Volume_check_failed' into abyssinian-nightjar
Merge branch 'abyssinian-nightjar' into filter_applications
Updated the steps for deploying celery's default file to atmosphere service scripts
Add driver and resource caching using redis.

* Add service.cache module.
* Remove references to rtwo implementation details in core model
  helper methods.
* Update versions in requirements.

	modified:   core/models/instance.py
	modified:   core/models/size.py
	modified:   requirements.txt
	new file:   service/cache.py
Remove auth for celery's flower.
	modified:   extras/init.d/celeryd.default
Use service.cache in api.instance.

	modified:   api/instance.py
Add VolumeStatusHistory to Volume.

* Add VolumeStatusHistory.
* Add VolumeStatus.
* Update Volume to use VolumeStatusHistory.

	new file:   core/migrations/0060_auto__add_volumestatus.py
	new file:   core/migrations/0061_auto__add_volumestatushistory.py
	modified:   core/models/volume.py
Use service.cache module.
	modified:   service/allocation.py
	modified:   service/quota.py
	modified:   service/tasks/allocation.py
PEP8 Compliance.
	modified:   api/project.py
Use the same atmosphere instance token through the entire deploy.
	modified:   service/deploy.py
	modified:   service/instance.py
	modified:   service/task.py
	modified:   service/tasks/driver.py