rackspace/pyrax — pull request #149 by EdLeafe (2013-07-29 12:20:59+00:00)
Title: Restore several reverted commits, and fix some others

Somehow I managed to overwrite the changes to the working branch while working on a fork. This replaces all of those changes, and adds several fixes suggested by PR #148.