Changing order of __init__ args for OAuth2Token for backwards compati…

…bility.

Updated hgignore

Untagged 2.0.15

Committing http://codereview.appspot.com/2734041/ on behalf of api.ni…

…ckm at google dot com

Preparation for release 2.0.12

merge