Merge branch 'base64-working' of github.com:jasondunsmore/pyrax into jasondunsmore-base64-working
Merge branch 'jasondunsmore-base64-working' into working