Fixed a typo. Manual merge of GitHub #326.
Merge branch 'working' of github.com:rackspace/pyrax into working