Fixed typo
Merge branch 'working' of github.com:rackspace/pyrax into working
Merge branch 'working' of github.com:rackspace/pyrax into working
Includes fixes for issues #138, #139 and #140