Prep for 1.0 release.
diff --git a/docs/epy/toc-everything.html b/docs/epy/toc-everything.html
index 61deda7..bf92d0b 100644
--- a/docs/epy/toc-everything.html
+++ b/docs/epy/toc-everything.html
@@ -51,10 +51,8 @@
      >apiclient.schema.Schemas</a><br />  <div class="private">
     <a target="mainFrame" href="apiclient.schema._SchemaToStruct-class.html"
      >apiclient.schema._SchemaToStruct</a><br />  </div>
-    <a target="mainFrame" href="django.db.models.fields.subclassing.SubfieldBase-class.html"
-     >django.db.models.fields.subclassing.SubfieldBase</a><br />    <a target="mainFrame" href="google.appengine.ext.db.PropertiedClass-class.html"
-     >google.appengine.ext.db.PropertiedClass</a><br />    <a target="mainFrame" href="mimetools.Message-class.html"
-     >mimetools.Message</a><br />    <a target="mainFrame" href="oauth2client.appengine.AppAssertionCredentials-class.html"
+    <a target="mainFrame" href="google.appengine.ext.db.PropertiedClass-class.html"
+     >google.appengine.ext.db.PropertiedClass</a><br />    <a target="mainFrame" href="oauth2client.appengine.AppAssertionCredentials-class.html"
      >oauth2client.appengine.AppAssertionCredentials</a><br />    <a target="mainFrame" href="oauth2client.appengine.CredentialsModel-class.html"
      >oauth2client.appengine.CredentialsModel</a><br />    <a target="mainFrame" href="oauth2client.appengine.CredentialsProperty-class.html"
      >oauth2client.appengine.CredentialsProperty</a><br />    <a target="mainFrame" href="oauth2client.appengine.FlowProperty-class.html"
@@ -95,9 +93,6 @@
      >oauth2client.locked_file.AlreadyLockedException</a><br />    <a target="mainFrame" href="oauth2client.locked_file.CredentialsFileSymbolicLinkError-class.html"
      >oauth2client.locked_file.CredentialsFileSymbolicLinkError</a><br />    <a target="mainFrame" href="oauth2client.locked_file.LockedFile-class.html"
      >oauth2client.locked_file.LockedFile</a><br />  <div class="private">
-    <a target="mainFrame" href="oauth2client.locked_file._FcntlOpener-class.html"
-     >oauth2client.locked_file._FcntlOpener</a><br />  </div>
-  <div class="private">
     <a target="mainFrame" href="oauth2client.locked_file._Opener-class.html"
      >oauth2client.locked_file._Opener</a><br />  </div>
   <div class="private">
@@ -131,10 +126,9 @@
     <a target="mainFrame" href="apiclient.discovery-module.html#_media_size_to_long"
      >apiclient.discovery._media_size_to_long</a><br />  </div>
     <a target="mainFrame" href="apiclient.discovery-module.html#build"
-     >apiclient.discovery.build</a><br />  <div class="private">
-    <a target="mainFrame" href="apiclient.discovery-module.html#fix_method_name"
-     >apiclient.discovery.fix_method_name</a><br />  </div>
-    <a target="mainFrame" href="apiclient.discovery-module.html#key2param"
+     >apiclient.discovery.build</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#build_from_document"
+     >apiclient.discovery.build_from_document</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#fix_method_name"
+     >apiclient.discovery.fix_method_name</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#key2param"
      >apiclient.discovery.key2param</a><br />    <a target="mainFrame" href="apiclient.http-module.html#set_user_agent"
      >apiclient.http.set_user_agent</a><br />    <a target="mainFrame" href="apiclient.http-module.html#tunnel_patch"
      >apiclient.http.tunnel_patch</a><br />  <div class="private">
@@ -162,7 +156,8 @@
   <div class="private">
     <a target="mainFrame" href="oauth2client.appengine-module.html#_safe_html"
      >oauth2client.appengine._safe_html</a><br />  </div>
-    <a target="mainFrame" href="oauth2client.appengine-module.html#xsrf_secret_key"
+    <a target="mainFrame" href="oauth2client.appengine-module.html#oauth2decorator_from_clientsecrets"
+     >oauth2client.appengine.oauth2decorator_from_clientsecrets</a><br />    <a target="mainFrame" href="oauth2client.appengine-module.html#xsrf_secret_key"
      >oauth2client.appengine.xsrf_secret_key</a><br />  <div class="private">
     <a target="mainFrame" href="oauth2client.client-module.html#_abstract"
      >oauth2client.client._abstract</a><br />  </div>
@@ -175,7 +170,11 @@
   <div class="private">
     <a target="mainFrame" href="oauth2client.client-module.html#_urlsafe_b64decode"
      >oauth2client.client._urlsafe_b64decode</a><br />  </div>
-  <div class="private">
+    <a target="mainFrame" href="oauth2client.client-module.html#credentials_from_clientsecrets_and_code"
+     >oauth2client.client.credentials_from_clientsecrets_and_code</a><br />    <a target="mainFrame" href="oauth2client.client-module.html#credentials_from_code"
+     >oauth2client.client.credentials_from_code</a><br />    <a target="mainFrame" href="oauth2client.client-module.html#flow_from_clientsecrets"
+     >oauth2client.client.flow_from_clientsecrets</a><br />    <a target="mainFrame" href="oauth2client.client-module.html#verify_id_token"
+     >oauth2client.client.verify_id_token</a><br />  <div class="private">
     <a target="mainFrame" href="oauth2client.clientsecrets-module.html#_loadfile"
      >oauth2client.clientsecrets._loadfile</a><br />  </div>
   <div class="private">
@@ -196,85 +195,82 @@
     <a target="mainFrame" href="oauth2client.crypt-module.html#make_signed_jwt"
      >oauth2client.crypt.make_signed_jwt</a><br />    <a target="mainFrame" href="oauth2client.crypt-module.html#verify_signed_jwt_with_certs"
      >oauth2client.crypt.verify_signed_jwt_with_certs</a><br />    <a target="mainFrame" href="oauth2client.locked_file-module.html#validate_file"
-     >oauth2client.locked_file.validate_file</a><br />    <a target="mainFrame" href="oauth2client.tools-module.html#run"
+     >oauth2client.locked_file.validate_file</a><br />    <a target="mainFrame" href="oauth2client.multistore_file-module.html#get_credential_storage"
+     >oauth2client.multistore_file.get_credential_storage</a><br />    <a target="mainFrame" href="oauth2client.tools-module.html#run"
      >oauth2client.tools.run</a><br />    <a target="mainFrame" href="oauth2client.util-module.html#positional"
-     >oauth2client.util.positional</a><br />  <h2 class="toc">All Variables</h2>
-    <a target="mainFrame" href="apiclient-module.html#__package__"
-     >apiclient.__package__</a><br />  <div class="private">
+     >oauth2client.util.positional</a><br />    <a target="mainFrame" href="oauth2client.xsrfutil-module.html#generate_token"
+     >oauth2client.xsrfutil.generate_token</a><br />    <a target="mainFrame" href="oauth2client.xsrfutil-module.html#validate_token"
+     >oauth2client.xsrfutil.validate_token</a><br />  <h2 class="toc">All Variables</h2>
     <a target="mainFrame" href="apiclient.discovery-module.html#DEFAULT_METHOD_DOC"
-     >apiclient.discovery.DEFAULT_METHOD_DOC</a><br />  </div>
-  <div class="private">
-    <a target="mainFrame" href="apiclient.discovery-module.html#DISCOVERY_URI"
-     >apiclient.discovery.DISCOVERY_URI</a><br />  </div>
-  <div class="private">
-    <a target="mainFrame" href="apiclient.discovery-module.html#MULTIPLIERS"
-     >apiclient.discovery.MULTIPLIERS</a><br />  </div>
-  <div class="private">
-    <a target="mainFrame" href="apiclient.discovery-module.html#RESERVED_WORDS"
-     >apiclient.discovery.RESERVED_WORDS</a><br />  </div>
-  <div class="private">
-    <a target="mainFrame" href="apiclient.discovery-module.html#STACK_QUERY_PARAMETERS"
-     >apiclient.discovery.STACK_QUERY_PARAMETERS</a><br />  </div>
-  <div class="private">
-    <a target="mainFrame" href="apiclient.discovery-module.html#URITEMPLATE"
-     >apiclient.discovery.URITEMPLATE</a><br />  </div>
-  <div class="private">
-    <a target="mainFrame" href="apiclient.discovery-module.html#VARNAME"
-     >apiclient.discovery.VARNAME</a><br />  </div>
-  <div class="private">
-    <a target="mainFrame" href="apiclient.discovery-module.html#__package__"
-     >apiclient.discovery.__package__</a><br />  </div>
-  <div class="private">
-    <a target="mainFrame" href="apiclient.discovery-module.html#logger"
-     >apiclient.discovery.logger</a><br />  </div>
-    <a target="mainFrame" href="apiclient.errors-module.html#__package__"
-     >apiclient.errors.__package__</a><br />    <a target="mainFrame" href="apiclient.ext-module.html#__package__"
-     >apiclient.ext.__package__</a><br />    <a target="mainFrame" href="apiclient.http-module.html#DEFAULT_CHUNK_SIZE"
+     >apiclient.discovery.DEFAULT_METHOD_DOC</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#DISCOVERY_URI"
+     >apiclient.discovery.DISCOVERY_URI</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#HttpError"
+     >apiclient.discovery.HttpError</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#HttpRequest"
+     >apiclient.discovery.HttpRequest</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#InvalidJsonError"
+     >apiclient.discovery.InvalidJsonError</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#JsonModel"
+     >apiclient.discovery.JsonModel</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#MIMEMultipart"
+     >apiclient.discovery.MIMEMultipart</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#MIMENonMultipart"
+     >apiclient.discovery.MIMENonMultipart</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#MULTIPLIERS"
+     >apiclient.discovery.MULTIPLIERS</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#MediaFileUpload"
+     >apiclient.discovery.MediaFileUpload</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#MediaModel"
+     >apiclient.discovery.MediaModel</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#MediaUpload"
+     >apiclient.discovery.MediaUpload</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#MediaUploadSizeError"
+     >apiclient.discovery.MediaUploadSizeError</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#RESERVED_WORDS"
+     >apiclient.discovery.RESERVED_WORDS</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#RawModel"
+     >apiclient.discovery.RawModel</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#STACK_QUERY_PARAMETERS"
+     >apiclient.discovery.STACK_QUERY_PARAMETERS</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#Schemas"
+     >apiclient.discovery.Schemas</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#URITEMPLATE"
+     >apiclient.discovery.URITEMPLATE</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#UnacceptableMimeTypeError"
+     >apiclient.discovery.UnacceptableMimeTypeError</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#UnknownApiNameOrVersion"
+     >apiclient.discovery.UnknownApiNameOrVersion</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#UnknownLinkType"
+     >apiclient.discovery.UnknownLinkType</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#VARNAME"
+     >apiclient.discovery.VARNAME</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#copy"
+     >apiclient.discovery.copy</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#httplib2"
+     >apiclient.discovery.httplib2</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#logger"
+     >apiclient.discovery.logger</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#logging"
+     >apiclient.discovery.logging</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#mimeparse"
+     >apiclient.discovery.mimeparse</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#mimetypes"
+     >apiclient.discovery.mimetypes</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#os"
+     >apiclient.discovery.os</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#parse_qsl"
+     >apiclient.discovery.parse_qsl</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#positional"
+     >apiclient.discovery.positional</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#random"
+     >apiclient.discovery.random</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#re"
+     >apiclient.discovery.re</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#simplejson"
+     >apiclient.discovery.simplejson</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#uritemplate"
+     >apiclient.discovery.uritemplate</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#urllib"
+     >apiclient.discovery.urllib</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#urlparse"
+     >apiclient.discovery.urlparse</a><br />    <a target="mainFrame" href="apiclient.http-module.html#DEFAULT_CHUNK_SIZE"
      >apiclient.http.DEFAULT_CHUNK_SIZE</a><br />    <a target="mainFrame" href="apiclient.http-module.html#MAX_URI_LENGTH"
-     >apiclient.http.MAX_URI_LENGTH</a><br />    <a target="mainFrame" href="apiclient.http-module.html#__package__"
-     >apiclient.http.__package__</a><br />    <a target="mainFrame" href="apiclient.mimeparse-module.html#__credits__"
+     >apiclient.http.MAX_URI_LENGTH</a><br />    <a target="mainFrame" href="apiclient.mimeparse-module.html#__credits__"
      >apiclient.mimeparse.__credits__</a><br />    <a target="mainFrame" href="apiclient.mimeparse-module.html#__email__"
-     >apiclient.mimeparse.__email__</a><br />    <a target="mainFrame" href="apiclient.mimeparse-module.html#__package__"
-     >apiclient.mimeparse.__package__</a><br />    <a target="mainFrame" href="apiclient.model-module.html#FLAGS"
-     >apiclient.model.FLAGS</a><br />    <a target="mainFrame" href="apiclient.model-module.html#__package__"
-     >apiclient.model.__package__</a><br />    <a target="mainFrame" href="apiclient.schema-module.html#__package__"
-     >apiclient.schema.__package__</a><br />    <a target="mainFrame" href="oauth2client-module.html#__package__"
-     >oauth2client.__package__</a><br />    <a target="mainFrame" href="oauth2client.anyjson-module.html#__package__"
-     >oauth2client.anyjson.__package__</a><br />    <a target="mainFrame" href="oauth2client.appengine-module.html#OAUTH2CLIENT_NAMESPACE"
+     >apiclient.mimeparse.__email__</a><br />    <a target="mainFrame" href="apiclient.model-module.html#FLAGS"
+     >apiclient.model.FLAGS</a><br />    <a target="mainFrame" href="oauth2client.appengine-module.html#OAUTH2CLIENT_NAMESPACE"
      >oauth2client.appengine.OAUTH2CLIENT_NAMESPACE</a><br />    <a target="mainFrame" href="oauth2client.appengine-module.html#XSRF_MEMCACHE_ID"
-     >oauth2client.appengine.XSRF_MEMCACHE_ID</a><br />    <a target="mainFrame" href="oauth2client.appengine-module.html#__package__"
-     >oauth2client.appengine.__package__</a><br />    <a target="mainFrame" href="oauth2client.appengine-module.html#logger"
+     >oauth2client.appengine.XSRF_MEMCACHE_ID</a><br />    <a target="mainFrame" href="oauth2client.appengine-module.html#logger"
      >oauth2client.appengine.logger</a><br />    <a target="mainFrame" href="oauth2client.client-module.html#EXPIRY_FORMAT"
      >oauth2client.client.EXPIRY_FORMAT</a><br />    <a target="mainFrame" href="oauth2client.client-module.html#HAS_OPENSSL"
      >oauth2client.client.HAS_OPENSSL</a><br />    <a target="mainFrame" href="oauth2client.client-module.html#ID_TOKEN_VERIFICATON_CERTS"
      >oauth2client.client.ID_TOKEN_VERIFICATON_CERTS</a><br />    <a target="mainFrame" href="oauth2client.client-module.html#OOB_CALLBACK_URN"
-     >oauth2client.client.OOB_CALLBACK_URN</a><br />    <a target="mainFrame" href="oauth2client.client-module.html#__package__"
-     >oauth2client.client.__package__</a><br />  <div class="private">
+     >oauth2client.client.OOB_CALLBACK_URN</a><br />  <div class="private">
     <a target="mainFrame" href="oauth2client.client-module.html#_cached_http"
      >oauth2client.client._cached_http</a><br />  </div>
     <a target="mainFrame" href="oauth2client.client-module.html#logger"
      >oauth2client.client.logger</a><br />    <a target="mainFrame" href="oauth2client.clientsecrets-module.html#TYPE_INSTALLED"
      >oauth2client.clientsecrets.TYPE_INSTALLED</a><br />    <a target="mainFrame" href="oauth2client.clientsecrets-module.html#TYPE_WEB"
      >oauth2client.clientsecrets.TYPE_WEB</a><br />    <a target="mainFrame" href="oauth2client.clientsecrets-module.html#VALID_CLIENT"
-     >oauth2client.clientsecrets.VALID_CLIENT</a><br />    <a target="mainFrame" href="oauth2client.clientsecrets-module.html#__package__"
-     >oauth2client.clientsecrets.__package__</a><br />    <a target="mainFrame" href="oauth2client.crypt-module.html#AUTH_TOKEN_LIFETIME_SECS"
+     >oauth2client.clientsecrets.VALID_CLIENT</a><br />    <a target="mainFrame" href="oauth2client.crypt-module.html#AUTH_TOKEN_LIFETIME_SECS"
      >oauth2client.crypt.AUTH_TOKEN_LIFETIME_SECS</a><br />    <a target="mainFrame" href="oauth2client.crypt-module.html#CLOCK_SKEW_SECS"
      >oauth2client.crypt.CLOCK_SKEW_SECS</a><br />    <a target="mainFrame" href="oauth2client.crypt-module.html#MAX_TOKEN_LIFETIME_SECS"
-     >oauth2client.crypt.MAX_TOKEN_LIFETIME_SECS</a><br />    <a target="mainFrame" href="oauth2client.crypt-module.html#__package__"
-     >oauth2client.crypt.__package__</a><br />    <a target="mainFrame" href="oauth2client.crypt-module.html#logger"
-     >oauth2client.crypt.logger</a><br />    <a target="mainFrame" href="oauth2client.django_orm-module.html#__package__"
-     >oauth2client.django_orm.__package__</a><br />    <a target="mainFrame" href="oauth2client.file-module.html#__package__"
-     >oauth2client.file.__package__</a><br />    <a target="mainFrame" href="oauth2client.gce-module.html#META"
-     >oauth2client.gce.META</a><br />    <a target="mainFrame" href="oauth2client.gce-module.html#__package__"
-     >oauth2client.gce.__package__</a><br />    <a target="mainFrame" href="oauth2client.gce-module.html#logger"
-     >oauth2client.gce.logger</a><br />    <a target="mainFrame" href="oauth2client.keyring_storage-module.html#__package__"
-     >oauth2client.keyring_storage.__package__</a><br />  <div class="private">
+     >oauth2client.crypt.MAX_TOKEN_LIFETIME_SECS</a><br />    <a target="mainFrame" href="oauth2client.crypt-module.html#logger"
+     >oauth2client.crypt.logger</a><br />    <a target="mainFrame" href="oauth2client.gce-module.html#META"
+     >oauth2client.gce.META</a><br />    <a target="mainFrame" href="oauth2client.gce-module.html#logger"
+     >oauth2client.gce.logger</a><br />  <div class="private">
+    <a target="mainFrame" href="oauth2client.locked_file-module.html#_FcntlOpener"
+     >oauth2client.locked_file._FcntlOpener</a><br />  </div>
+  <div class="private">
     <a target="mainFrame" href="oauth2client.locked_file-module.html#_Win32Opener"
      >oauth2client.locked_file._Win32Opener</a><br />  </div>
-    <a target="mainFrame" href="oauth2client.locked_file-module.html#__package__"
-     >oauth2client.locked_file.__package__</a><br />    <a target="mainFrame" href="oauth2client.locked_file-module.html#logger"
-     >oauth2client.locked_file.logger</a><br />    <a target="mainFrame" href="oauth2client.multistore_file-module.html#__package__"
-     >oauth2client.multistore_file.__package__</a><br />  <div class="private">
+    <a target="mainFrame" href="oauth2client.locked_file-module.html#logger"
+     >oauth2client.locked_file.logger</a><br />  <div class="private">
     <a target="mainFrame" href="oauth2client.multistore_file-module.html#_multistores"
      >oauth2client.multistore_file._multistores</a><br />  </div>
   <div class="private">
@@ -285,21 +281,14 @@
     <a target="mainFrame" href="oauth2client.tools-module.html#FLAGS"
      >oauth2client.tools.FLAGS</a><br />  </div>
   <div class="private">
-    <a target="mainFrame" href="oauth2client.tools-module.html#__package__"
-     >oauth2client.tools.__package__</a><br />  </div>
-  <div class="private">
     <a target="mainFrame" href="oauth2client.util-module.html#FLAGS"
      >oauth2client.util.FLAGS</a><br />  </div>
   <div class="private">
-    <a target="mainFrame" href="oauth2client.util-module.html#__package__"
-     >oauth2client.util.__package__</a><br />  </div>
-  <div class="private">
     <a target="mainFrame" href="oauth2client.util-module.html#logger"
      >oauth2client.util.logger</a><br />  </div>
     <a target="mainFrame" href="oauth2client.xsrfutil-module.html#DEFAULT_TIMEOUT_SECS"
      >oauth2client.xsrfutil.DEFAULT_TIMEOUT_SECS</a><br />    <a target="mainFrame" href="oauth2client.xsrfutil-module.html#DELIMITER"
-     >oauth2client.xsrfutil.DELIMITER</a><br />    <a target="mainFrame" href="oauth2client.xsrfutil-module.html#__package__"
-     >oauth2client.xsrfutil.__package__</a><br /><hr />
+     >oauth2client.xsrfutil.DELIMITER</a><br /><hr />
 <span class="options">[<a href="javascript:void(0);" class="privatelink"
     onclick="toggle_private();">hide&nbsp;private</a>]</span>