Merge conflict resolved
Fix to SSLErroor uncaught in rtwo/linktest
Allow atmo-init-full to fail gracefully when dhcp does not exist
Added routine for CentOS 5.8 to install DHCP exit hooks
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.