merging in https://code.google.com/p/goauth2/
finishing merging in https://code.google.com/p/goauth2/