Merge conflict resolved
Avoid errors when volume, or volume.extras, does not exist
Merge branch 'stable' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Merged with stable, small changes

* Removed logging from test cases (Never saw it anyway..)
* JWT removed from authentication, using standalone JWT from now on.
* Split-out volume logic from api/volume to service/volume.py, now
  api/volume.py looks closer to api/instance.py
* Wrote task 'clear_empty_ips' that will check for empty ip addresses on
  accounts that are no longer using them, and deallocate them back to the pool.
Removed duplicate code. Skip over_allocation_test if in settings.DEBUG or if user does not have an allocation. changed image_id for volume testing
clean_floating_ips returns the number of IPs removed
Add python-httplib2 as a requirement to our deploy.

* This requirement is unnecessary. We should consider using
  urllib2 - even though it is more precarious and more work.

	modified:   service/deploy.py
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into stable
Merge branch 'stable' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into stable
Avoid uniqueness-duplication