Made updates to match golang/oauth2 latest (breaking) changes.

See changes to TokenExtra() here:
https://github.com/golang/oauth2/commit/0ae3d4edc99f765dc1513a9605aa96e82877a20a