Fix a bad six rename.

Fixes #77.
Merge branch 'master' of github.com:google/oauth2client