diff --git a/README b/README
index 35ba3da..bc3fd7c 100644
--- a/README
+++ b/README
@@ -1,5 +1,4 @@
-This is a prototype implementation of a client
-for discovery based APIs.
+This is python client library for Google's discovery based APIs.
 
 
 Installation
@@ -9,24 +8,17 @@
 
    $ python setup.py install
 
-If you want to do a "mock install" and simply extend your PYTHONPATH
-for the current shell to include this folder and the packages in it, do
-
-   $ source setpath.sh
-
-from the root of the project directory.
-
 
 Running
 =======
 
 After following the install directions (using setup.py or setpath.sh) you
-should be able to cd to samples/buzz and run buzz.py from there, which will use
-the apiclient library to retrieve the title of the most recent entry in Buzz
-and post a test message.  The first time you run it you will be prompted to
-authorize the application to access your Buzz information.
+should be able to cd to samples/plus and run plus.py from there, which will use
+the apiclient library to retrieve a snippet of text from each entry in Google
+Plus. The first time you run it you will be prompted to authorize the
+application to access your plus information.
 
-   $ python samples/buzz/buzz.py
+   $ python samples/plus/plus.py
 
 
 Third Party Libraries
diff --git a/apiclient/http.py b/apiclient/http.py
index 081a4ed..d2a3a2f 100644
--- a/apiclient/http.py
+++ b/apiclient/http.py
@@ -136,10 +136,10 @@
       response = '{"data": {"id": "tag:google.c...'
       requestBuilder = RequestMockBuilder(
         {
-          'chili.activities.get': (None, response),
+          'plus.activities.get': (None, response),
         }
       )
-      apiclient.discovery.build("buzz", "v1", requestBuilder=requestBuilder)
+      apiclient.discovery.build("plus", "v1", requestBuilder=requestBuilder)
 
     Methods that you do not supply a response for will return a
     200 OK with an empty string as the response content or raise an excpetion if
diff --git a/docs/apiclient.anyjson.html b/docs/apiclient.anyjson.html
index a2995a0..77e5b88 100644
--- a/docs/apiclient.anyjson.html
+++ b/docs/apiclient.anyjson.html
@@ -20,7 +20,7 @@
 <font color="#ffffff" face="helvetica, arial"><big><strong>Modules</strong></big></font></td></tr>
     
 <tr><td bgcolor="#aa55cc"><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt></td><td>&nbsp;</td>
-<td width="100%"><table width="100%" summary="list"><tr><td width="25%" valign=top><a href="simplejson.html">simplejson</a><br>
+<td width="100%"><table width="100%" summary="list"><tr><td width="25%" valign=top><a href="django.utils.simplejson.html">django.utils.simplejson</a><br>
 </td><td width="25%" valign=top></td><td width="25%" valign=top></td><td width="25%" valign=top></td></tr></table></td></tr></table><p>
 <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
 <tr bgcolor="#55aa55">
diff --git a/docs/apiclient.contrib.buzz.html b/docs/apiclient.contrib.buzz.html
deleted file mode 100644
index f8addd0..0000000
--- a/docs/apiclient.contrib.buzz.html
+++ /dev/null
@@ -1,21 +0,0 @@
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head><title>Python: package apiclient.contrib.buzz</title>
-</head><body bgcolor="#f0f0f8">
-
-<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="heading">
-<tr bgcolor="#7799ee">
-<td valign=bottom>&nbsp;<br>
-<font color="#ffffff" face="helvetica, arial">&nbsp;<br><big><big><strong><a href="apiclient.html"><font color="#ffffff">apiclient</font></a>.<a href="apiclient.contrib.html"><font color="#ffffff">contrib</font></a>.buzz</strong></big></big></font></td
-><td align=right valign=bottom
-><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/usr/local/google/home/jcgregorio/projects/apiclient-release/apiclient/contrib/buzz/__init__.py">/usr/local/google/home/jcgregorio/projects/apiclient-release/apiclient/contrib/buzz/__init__.py</a></font></td></tr></table>
-    <p></p>
-<p>
-<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
-<tr bgcolor="#aa55cc">
-<td colspan=3 valign=bottom>&nbsp;<br>
-<font color="#ffffff" face="helvetica, arial"><big><strong>Package Contents</strong></big></font></td></tr>
-    
-<tr><td bgcolor="#aa55cc"><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt></td><td>&nbsp;</td>
-<td width="100%"><table width="100%" summary="list"><tr><td width="25%" valign=top></td><td width="25%" valign=top></td><td width="25%" valign=top></td><td width="25%" valign=top></td></tr></table></td></tr></table>
-</body></html>
\ No newline at end of file
diff --git a/docs/apiclient.contrib.html b/docs/apiclient.contrib.html
deleted file mode 100644
index c0e6977..0000000
--- a/docs/apiclient.contrib.html
+++ /dev/null
@@ -1,24 +0,0 @@
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head><title>Python: package apiclient.contrib</title>
-</head><body bgcolor="#f0f0f8">
-
-<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="heading">
-<tr bgcolor="#7799ee">
-<td valign=bottom>&nbsp;<br>
-<font color="#ffffff" face="helvetica, arial">&nbsp;<br><big><big><strong><a href="apiclient.html"><font color="#ffffff">apiclient</font></a>.contrib</strong></big></big></font></td
-><td align=right valign=bottom
-><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/usr/local/google/home/jcgregorio/projects/apiclient-release/apiclient/contrib/__init__.py">/usr/local/google/home/jcgregorio/projects/apiclient-release/apiclient/contrib/__init__.py</a></font></td></tr></table>
-    <p></p>
-<p>
-<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
-<tr bgcolor="#aa55cc">
-<td colspan=3 valign=bottom>&nbsp;<br>
-<font color="#ffffff" face="helvetica, arial"><big><strong>Package Contents</strong></big></font></td></tr>
-    
-<tr><td bgcolor="#aa55cc"><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt></td><td>&nbsp;</td>
-<td width="100%"><table width="100%" summary="list"><tr><td width="25%" valign=top><a href="apiclient.contrib.buzz.html"><strong>buzz</strong>&nbsp;(package)</a><br>
-</td><td width="25%" valign=top><a href="apiclient.contrib.latitude.html"><strong>latitude</strong>&nbsp;(package)</a><br>
-</td><td width="25%" valign=top><a href="apiclient.contrib.moderator.html"><strong>moderator</strong>&nbsp;(package)</a><br>
-</td><td width="25%" valign=top></td></tr></table></td></tr></table>
-</body></html>
\ No newline at end of file
diff --git a/docs/apiclient.contrib.latitude.html b/docs/apiclient.contrib.latitude.html
deleted file mode 100644
index 99bd5f3..0000000
--- a/docs/apiclient.contrib.latitude.html
+++ /dev/null
@@ -1,21 +0,0 @@
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head><title>Python: package apiclient.contrib.latitude</title>
-</head><body bgcolor="#f0f0f8">
-
-<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="heading">
-<tr bgcolor="#7799ee">
-<td valign=bottom>&nbsp;<br>
-<font color="#ffffff" face="helvetica, arial">&nbsp;<br><big><big><strong><a href="apiclient.html"><font color="#ffffff">apiclient</font></a>.<a href="apiclient.contrib.html"><font color="#ffffff">contrib</font></a>.latitude</strong></big></big></font></td
-><td align=right valign=bottom
-><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/usr/local/google/home/jcgregorio/projects/apiclient-release/apiclient/contrib/latitude/__init__.py">/usr/local/google/home/jcgregorio/projects/apiclient-release/apiclient/contrib/latitude/__init__.py</a></font></td></tr></table>
-    <p></p>
-<p>
-<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
-<tr bgcolor="#aa55cc">
-<td colspan=3 valign=bottom>&nbsp;<br>
-<font color="#ffffff" face="helvetica, arial"><big><strong>Package Contents</strong></big></font></td></tr>
-    
-<tr><td bgcolor="#aa55cc"><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt></td><td>&nbsp;</td>
-<td width="100%"><table width="100%" summary="list"><tr><td width="25%" valign=top></td><td width="25%" valign=top></td><td width="25%" valign=top></td><td width="25%" valign=top></td></tr></table></td></tr></table>
-</body></html>
\ No newline at end of file
diff --git a/docs/apiclient.contrib.moderator.html b/docs/apiclient.contrib.moderator.html
deleted file mode 100644
index b3f5e80..0000000
--- a/docs/apiclient.contrib.moderator.html
+++ /dev/null
@@ -1,21 +0,0 @@
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head><title>Python: package apiclient.contrib.moderator</title>
-</head><body bgcolor="#f0f0f8">
-
-<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="heading">
-<tr bgcolor="#7799ee">
-<td valign=bottom>&nbsp;<br>
-<font color="#ffffff" face="helvetica, arial">&nbsp;<br><big><big><strong><a href="apiclient.html"><font color="#ffffff">apiclient</font></a>.<a href="apiclient.contrib.html"><font color="#ffffff">contrib</font></a>.moderator</strong></big></big></font></td
-><td align=right valign=bottom
-><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/usr/local/google/home/jcgregorio/projects/apiclient-release/apiclient/contrib/moderator/__init__.py">/usr/local/google/home/jcgregorio/projects/apiclient-release/apiclient/contrib/moderator/__init__.py</a></font></td></tr></table>
-    <p></p>
-<p>
-<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
-<tr bgcolor="#aa55cc">
-<td colspan=3 valign=bottom>&nbsp;<br>
-<font color="#ffffff" face="helvetica, arial"><big><strong>Package Contents</strong></big></font></td></tr>
-    
-<tr><td bgcolor="#aa55cc"><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt></td><td>&nbsp;</td>
-<td width="100%"><table width="100%" summary="list"><tr><td width="25%" valign=top></td><td width="25%" valign=top></td><td width="25%" valign=top></td><td width="25%" valign=top></td></tr></table></td></tr></table>
-</body></html>
\ No newline at end of file
diff --git a/docs/apiclient.discovery.html b/docs/apiclient.discovery.html
index e2a00bc..2cec87e 100644
--- a/docs/apiclient.discovery.html
+++ b/docs/apiclient.discovery.html
@@ -26,7 +26,7 @@
 <a href="mimetypes.html">mimetypes</a><br>
 <a href="os.html">os</a><br>
 </td><td width="25%" valign=top><a href="re.html">re</a><br>
-<a href="simplejson.html">simplejson</a><br>
+<a href="django.utils.simplejson.html">django.utils.simplejson</a><br>
 <a href="uritemplate.html">uritemplate</a><br>
 </td><td width="25%" valign=top><a href="urllib.html">urllib</a><br>
 <a href="urlparse.html">urlparse</a><br>
diff --git a/docs/apiclient.errors.html b/docs/apiclient.errors.html
index 93ebd42..80b320f 100644
--- a/docs/apiclient.errors.html
+++ b/docs/apiclient.errors.html
@@ -20,7 +20,7 @@
 <font color="#ffffff" face="helvetica, arial"><big><strong>Modules</strong></big></font></td></tr>
     
 <tr><td bgcolor="#aa55cc"><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt></td><td>&nbsp;</td>
-<td width="100%"><table width="100%" summary="list"><tr><td width="25%" valign=top><a href="simplejson.html">simplejson</a><br>
+<td width="100%"><table width="100%" summary="list"><tr><td width="25%" valign=top><a href="django.utils.simplejson.html">django.utils.simplejson</a><br>
 </td><td width="25%" valign=top></td><td width="25%" valign=top></td><td width="25%" valign=top></td></tr></table></td></tr></table><p>
 <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
 <tr bgcolor="#ee77aa">
diff --git a/docs/apiclient.ext.django_orm.html b/docs/apiclient.ext.django_orm.html
index 91b9e70..e242bd7 100644
--- a/docs/apiclient.ext.django_orm.html
+++ b/docs/apiclient.ext.django_orm.html
@@ -8,7 +8,7 @@
 <td valign=bottom>&nbsp;<br>
 <font color="#ffffff" face="helvetica, arial">&nbsp;<br><big><big><strong><a href="apiclient.html"><font color="#ffffff">apiclient</font></a>.<a href="apiclient.ext.html"><font color="#ffffff">ext</font></a>.django_orm</strong></big></big></font></td
 ><td align=right valign=bottom
-><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/usr/local/google/home/jcgregorio/projects/apiclient/apiclient/ext/django_orm.py">/usr/local/google/home/jcgregorio/projects/apiclient/apiclient/ext/django_orm.py</a></font></td></tr></table>
+><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/usr/local/google/home/jcgregorio/projects/apiclient-release/apiclient/ext/django_orm.py">/usr/local/google/home/jcgregorio/projects/apiclient-release/apiclient/ext/django_orm.py</a></font></td></tr></table>
     <p><tt>#&nbsp;Copyright&nbsp;(C)&nbsp;2010&nbsp;Google&nbsp;Inc.<br>
 #<br>
 #&nbsp;Licensed&nbsp;under&nbsp;the&nbsp;Apache&nbsp;License,&nbsp;Version&nbsp;2.0&nbsp;(the&nbsp;"License");<br>
@@ -65,9 +65,13 @@
 Methods defined here:<br>
 <dl><dt><a name="FlowThreeLeggedField-contribute_to_class"><strong>contribute_to_class</strong></a>(self, cls, name)</dt></dl>
 
-<dl><dt><a name="FlowThreeLeggedField-db_type"><strong>db_type</strong></a>(self)</dt></dl>
+<dl><dt><a name="FlowThreeLeggedField-db_type"><strong>db_type</strong></a> = inner(*args, **kwargs)</dt></dl>
 
-<dl><dt><a name="FlowThreeLeggedField-get_db_prep_value"><strong>get_db_prep_value</strong></a>(self, value)</dt></dl>
+<dl><dt><a name="FlowThreeLeggedField-get_db_prep_lookup"><strong>get_db_prep_lookup</strong></a> = inner(*args, **kwargs)</dt></dl>
+
+<dl><dt><a name="FlowThreeLeggedField-get_db_prep_save"><strong>get_db_prep_save</strong></a> = inner(*args, **kwargs)</dt></dl>
+
+<dl><dt><a name="FlowThreeLeggedField-get_db_prep_value"><strong>get_db_prep_value</strong></a> = inner(*args, **kwargs)</dt></dl>
 
 <dl><dt><a name="FlowThreeLeggedField-to_python"><strong>to_python</strong></a>(self, value)</dt></dl>
 
@@ -82,10 +86,14 @@
 
 <dl><dt><a name="FlowThreeLeggedField-__deepcopy__"><strong>__deepcopy__</strong></a>(self, memodict)</dt></dl>
 
-<dl><dt><a name="FlowThreeLeggedField-__init__"><strong>__init__</strong></a>(self, verbose_name<font color="#909090">=None</font>, name<font color="#909090">=None</font>, primary_key<font color="#909090">=False</font>, max_length<font color="#909090">=None</font>, unique<font color="#909090">=False</font>, blank<font color="#909090">=False</font>, null<font color="#909090">=False</font>, db_index<font color="#909090">=False</font>, rel<font color="#909090">=None</font>, default<font color="#909090">=&lt;class django.db.models.fields.NOT_PROVIDED&gt;</font>, editable<font color="#909090">=True</font>, serialize<font color="#909090">=True</font>, unique_for_date<font color="#909090">=None</font>, unique_for_month<font color="#909090">=None</font>, unique_for_year<font color="#909090">=None</font>, choices<font color="#909090">=None</font>, help_text<font color="#909090">=''</font>, db_column<font color="#909090">=None</font>, db_tablespace<font color="#909090">=None</font>, auto_created<font color="#909090">=False</font>)</dt></dl>
+<dl><dt><a name="FlowThreeLeggedField-__init__"><strong>__init__</strong></a>(self, verbose_name<font color="#909090">=None</font>, name<font color="#909090">=None</font>, primary_key<font color="#909090">=False</font>, max_length<font color="#909090">=None</font>, unique<font color="#909090">=False</font>, blank<font color="#909090">=False</font>, null<font color="#909090">=False</font>, db_index<font color="#909090">=False</font>, rel<font color="#909090">=None</font>, default<font color="#909090">=&lt;class django.db.models.fields.NOT_PROVIDED&gt;</font>, editable<font color="#909090">=True</font>, serialize<font color="#909090">=True</font>, unique_for_date<font color="#909090">=None</font>, unique_for_month<font color="#909090">=None</font>, unique_for_year<font color="#909090">=None</font>, choices<font color="#909090">=None</font>, help_text<font color="#909090">=''</font>, db_column<font color="#909090">=None</font>, db_tablespace<font color="#909090">=None</font>, auto_created<font color="#909090">=False</font>, validators<font color="#909090">=[]</font>, error_messages<font color="#909090">=None</font>)</dt></dl>
 
 <dl><dt><a name="FlowThreeLeggedField-bind"><strong>bind</strong></a>(self, fieldmapping, original, bound_field_class)</dt></dl>
 
+<dl><dt><a name="FlowThreeLeggedField-clean"><strong>clean</strong></a>(self, value, model_instance)</dt><dd><tt>Convert&nbsp;the&nbsp;value's&nbsp;type&nbsp;and&nbsp;run&nbsp;validation.&nbsp;Validation&nbsp;errors&nbsp;from&nbsp;to_python<br>
+and&nbsp;validate&nbsp;are&nbsp;propagated.&nbsp;The&nbsp;correct&nbsp;value&nbsp;is&nbsp;returned&nbsp;if&nbsp;no&nbsp;error&nbsp;is<br>
+raised.</tt></dd></dl>
+
 <dl><dt><a name="FlowThreeLeggedField-formfield"><strong>formfield</strong></a>(self, form_class<font color="#909090">=&lt;class 'django.forms.fields.CharField'&gt;</font>, **kwargs)</dt><dd><tt>Returns&nbsp;a&nbsp;django.forms.<a href="django.db.models.fields.html#Field">Field</a>&nbsp;instance&nbsp;for&nbsp;this&nbsp;database&nbsp;<a href="django.db.models.fields.html#Field">Field</a>.</tt></dd></dl>
 
 <dl><dt><a name="FlowThreeLeggedField-get_attname"><strong>get_attname</strong></a>(self)</dt></dl>
@@ -99,26 +107,31 @@
 
 <dl><dt><a name="FlowThreeLeggedField-get_choices_default"><strong>get_choices_default</strong></a>(self)</dt></dl>
 
-<dl><dt><a name="FlowThreeLeggedField-get_db_prep_lookup"><strong>get_db_prep_lookup</strong></a>(self, lookup_type, value)</dt><dd><tt>Returns&nbsp;field's&nbsp;value&nbsp;prepared&nbsp;for&nbsp;database&nbsp;lookup.</tt></dd></dl>
-
-<dl><dt><a name="FlowThreeLeggedField-get_db_prep_save"><strong>get_db_prep_save</strong></a>(self, value)</dt><dd><tt>Returns&nbsp;field's&nbsp;value&nbsp;prepared&nbsp;for&nbsp;saving&nbsp;into&nbsp;a&nbsp;database.</tt></dd></dl>
-
 <dl><dt><a name="FlowThreeLeggedField-get_default"><strong>get_default</strong></a>(self)</dt><dd><tt>Returns&nbsp;the&nbsp;default&nbsp;value&nbsp;for&nbsp;this&nbsp;field.</tt></dd></dl>
 
 <dl><dt><a name="FlowThreeLeggedField-get_flatchoices"><strong>get_flatchoices</strong></a>(self, include_blank<font color="#909090">=True</font>, blank_choice<font color="#909090">=[('', '---------')]</font>)</dt><dd><tt>Returns&nbsp;flattened&nbsp;choices&nbsp;with&nbsp;a&nbsp;default&nbsp;blank&nbsp;choice&nbsp;included.</tt></dd></dl>
 
 <dl><dt><a name="FlowThreeLeggedField-get_internal_type"><strong>get_internal_type</strong></a>(self)</dt></dl>
 
+<dl><dt><a name="FlowThreeLeggedField-get_prep_lookup"><strong>get_prep_lookup</strong></a>(self, lookup_type, value)</dt><dd><tt>Perform&nbsp;preliminary&nbsp;non-db&nbsp;specific&nbsp;lookup&nbsp;checks&nbsp;and&nbsp;conversions</tt></dd></dl>
+
+<dl><dt><a name="FlowThreeLeggedField-get_prep_value"><strong>get_prep_value</strong></a>(self, value)</dt><dd><tt>Perform&nbsp;preliminary&nbsp;non-db&nbsp;specific&nbsp;value&nbsp;checks&nbsp;and&nbsp;conversions.</tt></dd></dl>
+
 <dl><dt><a name="FlowThreeLeggedField-get_validator_unique_lookup_type"><strong>get_validator_unique_lookup_type</strong></a>(self)</dt></dl>
 
 <dl><dt><a name="FlowThreeLeggedField-has_default"><strong>has_default</strong></a>(self)</dt><dd><tt>Returns&nbsp;a&nbsp;boolean&nbsp;of&nbsp;whether&nbsp;this&nbsp;field&nbsp;has&nbsp;a&nbsp;default&nbsp;value.</tt></dd></dl>
 
 <dl><dt><a name="FlowThreeLeggedField-pre_save"><strong>pre_save</strong></a>(self, model_instance, add)</dt><dd><tt>Returns&nbsp;field's&nbsp;value&nbsp;just&nbsp;before&nbsp;saving.</tt></dd></dl>
 
+<dl><dt><a name="FlowThreeLeggedField-run_validators"><strong>run_validators</strong></a>(self, value)</dt></dl>
+
 <dl><dt><a name="FlowThreeLeggedField-save_form_data"><strong>save_form_data</strong></a>(self, instance, data)</dt></dl>
 
 <dl><dt><a name="FlowThreeLeggedField-set_attributes_from_name"><strong>set_attributes_from_name</strong></a>(self, name)</dt></dl>
 
+<dl><dt><a name="FlowThreeLeggedField-validate"><strong>validate</strong></a>(self, value, model_instance)</dt><dd><tt>Validates&nbsp;value&nbsp;and&nbsp;throws&nbsp;ValidationError.&nbsp;Subclasses&nbsp;should&nbsp;override<br>
+this&nbsp;to&nbsp;provide&nbsp;validation&nbsp;logic.</tt></dd></dl>
+
 <dl><dt><a name="FlowThreeLeggedField-value_from_object"><strong>value_from_object</strong></a>(self, obj)</dt><dd><tt>Returns&nbsp;the&nbsp;value&nbsp;of&nbsp;this&nbsp;field&nbsp;in&nbsp;the&nbsp;given&nbsp;model&nbsp;instance.</tt></dd></dl>
 
 <dl><dt><a name="FlowThreeLeggedField-value_to_string"><strong>value_to_string</strong></a>(self, obj)</dt><dd><tt>Returns&nbsp;a&nbsp;string&nbsp;value&nbsp;of&nbsp;this&nbsp;field&nbsp;from&nbsp;the&nbsp;passed&nbsp;obj.<br>
@@ -134,6 +147,8 @@
 </dl>
 <dl><dt><strong>choices</strong></dt>
 </dl>
+<dl><dt><strong>description</strong></dt>
+</dl>
 <dl><dt><strong>flatchoices</strong></dt>
 <dd><tt>Flattened&nbsp;version&nbsp;of&nbsp;choices&nbsp;tuple.</tt></dd>
 </dl>
@@ -145,6 +160,10 @@
 
 <dl><dt><strong>creation_counter</strong> = 0</dl>
 
+<dl><dt><strong>default_error_messages</strong> = {'blank': &lt;django.utils.functional.__proxy__ object&gt;, 'invalid_choice': &lt;django.utils.functional.__proxy__ object&gt;, 'null': &lt;django.utils.functional.__proxy__ object&gt;}</dl>
+
+<dl><dt><strong>default_validators</strong> = []</dl>
+
 <dl><dt><strong>empty_strings_allowed</strong> = True</dl>
 
 </td></tr></table> <p>
@@ -163,9 +182,13 @@
 Methods defined here:<br>
 <dl><dt><a name="OAuthCredentialsField-contribute_to_class"><strong>contribute_to_class</strong></a>(self, cls, name)</dt></dl>
 
-<dl><dt><a name="OAuthCredentialsField-db_type"><strong>db_type</strong></a>(self)</dt></dl>
+<dl><dt><a name="OAuthCredentialsField-db_type"><strong>db_type</strong></a> = inner(*args, **kwargs)</dt></dl>
 
-<dl><dt><a name="OAuthCredentialsField-get_db_prep_value"><strong>get_db_prep_value</strong></a>(self, value)</dt></dl>
+<dl><dt><a name="OAuthCredentialsField-get_db_prep_lookup"><strong>get_db_prep_lookup</strong></a> = inner(*args, **kwargs)</dt></dl>
+
+<dl><dt><a name="OAuthCredentialsField-get_db_prep_save"><strong>get_db_prep_save</strong></a> = inner(*args, **kwargs)</dt></dl>
+
+<dl><dt><a name="OAuthCredentialsField-get_db_prep_value"><strong>get_db_prep_value</strong></a> = inner(*args, **kwargs)</dt></dl>
 
 <dl><dt><a name="OAuthCredentialsField-to_python"><strong>to_python</strong></a>(self, value)</dt></dl>
 
@@ -180,10 +203,14 @@
 
 <dl><dt><a name="OAuthCredentialsField-__deepcopy__"><strong>__deepcopy__</strong></a>(self, memodict)</dt></dl>
 
-<dl><dt><a name="OAuthCredentialsField-__init__"><strong>__init__</strong></a>(self, verbose_name<font color="#909090">=None</font>, name<font color="#909090">=None</font>, primary_key<font color="#909090">=False</font>, max_length<font color="#909090">=None</font>, unique<font color="#909090">=False</font>, blank<font color="#909090">=False</font>, null<font color="#909090">=False</font>, db_index<font color="#909090">=False</font>, rel<font color="#909090">=None</font>, default<font color="#909090">=&lt;class django.db.models.fields.NOT_PROVIDED&gt;</font>, editable<font color="#909090">=True</font>, serialize<font color="#909090">=True</font>, unique_for_date<font color="#909090">=None</font>, unique_for_month<font color="#909090">=None</font>, unique_for_year<font color="#909090">=None</font>, choices<font color="#909090">=None</font>, help_text<font color="#909090">=''</font>, db_column<font color="#909090">=None</font>, db_tablespace<font color="#909090">=None</font>, auto_created<font color="#909090">=False</font>)</dt></dl>
+<dl><dt><a name="OAuthCredentialsField-__init__"><strong>__init__</strong></a>(self, verbose_name<font color="#909090">=None</font>, name<font color="#909090">=None</font>, primary_key<font color="#909090">=False</font>, max_length<font color="#909090">=None</font>, unique<font color="#909090">=False</font>, blank<font color="#909090">=False</font>, null<font color="#909090">=False</font>, db_index<font color="#909090">=False</font>, rel<font color="#909090">=None</font>, default<font color="#909090">=&lt;class django.db.models.fields.NOT_PROVIDED&gt;</font>, editable<font color="#909090">=True</font>, serialize<font color="#909090">=True</font>, unique_for_date<font color="#909090">=None</font>, unique_for_month<font color="#909090">=None</font>, unique_for_year<font color="#909090">=None</font>, choices<font color="#909090">=None</font>, help_text<font color="#909090">=''</font>, db_column<font color="#909090">=None</font>, db_tablespace<font color="#909090">=None</font>, auto_created<font color="#909090">=False</font>, validators<font color="#909090">=[]</font>, error_messages<font color="#909090">=None</font>)</dt></dl>
 
 <dl><dt><a name="OAuthCredentialsField-bind"><strong>bind</strong></a>(self, fieldmapping, original, bound_field_class)</dt></dl>
 
+<dl><dt><a name="OAuthCredentialsField-clean"><strong>clean</strong></a>(self, value, model_instance)</dt><dd><tt>Convert&nbsp;the&nbsp;value's&nbsp;type&nbsp;and&nbsp;run&nbsp;validation.&nbsp;Validation&nbsp;errors&nbsp;from&nbsp;to_python<br>
+and&nbsp;validate&nbsp;are&nbsp;propagated.&nbsp;The&nbsp;correct&nbsp;value&nbsp;is&nbsp;returned&nbsp;if&nbsp;no&nbsp;error&nbsp;is<br>
+raised.</tt></dd></dl>
+
 <dl><dt><a name="OAuthCredentialsField-formfield"><strong>formfield</strong></a>(self, form_class<font color="#909090">=&lt;class 'django.forms.fields.CharField'&gt;</font>, **kwargs)</dt><dd><tt>Returns&nbsp;a&nbsp;django.forms.<a href="django.db.models.fields.html#Field">Field</a>&nbsp;instance&nbsp;for&nbsp;this&nbsp;database&nbsp;<a href="django.db.models.fields.html#Field">Field</a>.</tt></dd></dl>
 
 <dl><dt><a name="OAuthCredentialsField-get_attname"><strong>get_attname</strong></a>(self)</dt></dl>
@@ -197,26 +224,31 @@
 
 <dl><dt><a name="OAuthCredentialsField-get_choices_default"><strong>get_choices_default</strong></a>(self)</dt></dl>
 
-<dl><dt><a name="OAuthCredentialsField-get_db_prep_lookup"><strong>get_db_prep_lookup</strong></a>(self, lookup_type, value)</dt><dd><tt>Returns&nbsp;field's&nbsp;value&nbsp;prepared&nbsp;for&nbsp;database&nbsp;lookup.</tt></dd></dl>
-
-<dl><dt><a name="OAuthCredentialsField-get_db_prep_save"><strong>get_db_prep_save</strong></a>(self, value)</dt><dd><tt>Returns&nbsp;field's&nbsp;value&nbsp;prepared&nbsp;for&nbsp;saving&nbsp;into&nbsp;a&nbsp;database.</tt></dd></dl>
-
 <dl><dt><a name="OAuthCredentialsField-get_default"><strong>get_default</strong></a>(self)</dt><dd><tt>Returns&nbsp;the&nbsp;default&nbsp;value&nbsp;for&nbsp;this&nbsp;field.</tt></dd></dl>
 
 <dl><dt><a name="OAuthCredentialsField-get_flatchoices"><strong>get_flatchoices</strong></a>(self, include_blank<font color="#909090">=True</font>, blank_choice<font color="#909090">=[('', '---------')]</font>)</dt><dd><tt>Returns&nbsp;flattened&nbsp;choices&nbsp;with&nbsp;a&nbsp;default&nbsp;blank&nbsp;choice&nbsp;included.</tt></dd></dl>
 
 <dl><dt><a name="OAuthCredentialsField-get_internal_type"><strong>get_internal_type</strong></a>(self)</dt></dl>
 
+<dl><dt><a name="OAuthCredentialsField-get_prep_lookup"><strong>get_prep_lookup</strong></a>(self, lookup_type, value)</dt><dd><tt>Perform&nbsp;preliminary&nbsp;non-db&nbsp;specific&nbsp;lookup&nbsp;checks&nbsp;and&nbsp;conversions</tt></dd></dl>
+
+<dl><dt><a name="OAuthCredentialsField-get_prep_value"><strong>get_prep_value</strong></a>(self, value)</dt><dd><tt>Perform&nbsp;preliminary&nbsp;non-db&nbsp;specific&nbsp;value&nbsp;checks&nbsp;and&nbsp;conversions.</tt></dd></dl>
+
 <dl><dt><a name="OAuthCredentialsField-get_validator_unique_lookup_type"><strong>get_validator_unique_lookup_type</strong></a>(self)</dt></dl>
 
 <dl><dt><a name="OAuthCredentialsField-has_default"><strong>has_default</strong></a>(self)</dt><dd><tt>Returns&nbsp;a&nbsp;boolean&nbsp;of&nbsp;whether&nbsp;this&nbsp;field&nbsp;has&nbsp;a&nbsp;default&nbsp;value.</tt></dd></dl>
 
 <dl><dt><a name="OAuthCredentialsField-pre_save"><strong>pre_save</strong></a>(self, model_instance, add)</dt><dd><tt>Returns&nbsp;field's&nbsp;value&nbsp;just&nbsp;before&nbsp;saving.</tt></dd></dl>
 
+<dl><dt><a name="OAuthCredentialsField-run_validators"><strong>run_validators</strong></a>(self, value)</dt></dl>
+
 <dl><dt><a name="OAuthCredentialsField-save_form_data"><strong>save_form_data</strong></a>(self, instance, data)</dt></dl>
 
 <dl><dt><a name="OAuthCredentialsField-set_attributes_from_name"><strong>set_attributes_from_name</strong></a>(self, name)</dt></dl>
 
+<dl><dt><a name="OAuthCredentialsField-validate"><strong>validate</strong></a>(self, value, model_instance)</dt><dd><tt>Validates&nbsp;value&nbsp;and&nbsp;throws&nbsp;ValidationError.&nbsp;Subclasses&nbsp;should&nbsp;override<br>
+this&nbsp;to&nbsp;provide&nbsp;validation&nbsp;logic.</tt></dd></dl>
+
 <dl><dt><a name="OAuthCredentialsField-value_from_object"><strong>value_from_object</strong></a>(self, obj)</dt><dd><tt>Returns&nbsp;the&nbsp;value&nbsp;of&nbsp;this&nbsp;field&nbsp;in&nbsp;the&nbsp;given&nbsp;model&nbsp;instance.</tt></dd></dl>
 
 <dl><dt><a name="OAuthCredentialsField-value_to_string"><strong>value_to_string</strong></a>(self, obj)</dt><dd><tt>Returns&nbsp;a&nbsp;string&nbsp;value&nbsp;of&nbsp;this&nbsp;field&nbsp;from&nbsp;the&nbsp;passed&nbsp;obj.<br>
@@ -232,6 +264,8 @@
 </dl>
 <dl><dt><strong>choices</strong></dt>
 </dl>
+<dl><dt><strong>description</strong></dt>
+</dl>
 <dl><dt><strong>flatchoices</strong></dt>
 <dd><tt>Flattened&nbsp;version&nbsp;of&nbsp;choices&nbsp;tuple.</tt></dd>
 </dl>
@@ -243,6 +277,10 @@
 
 <dl><dt><strong>creation_counter</strong> = 0</dl>
 
+<dl><dt><strong>default_error_messages</strong> = {'blank': &lt;django.utils.functional.__proxy__ object&gt;, 'invalid_choice': &lt;django.utils.functional.__proxy__ object&gt;, 'null': &lt;django.utils.functional.__proxy__ object&gt;}</dl>
+
+<dl><dt><strong>default_validators</strong> = []</dl>
+
 <dl><dt><strong>empty_strings_allowed</strong> = True</dl>
 
 </td></tr></table></td></tr></table>
diff --git a/docs/apiclient.http.html b/docs/apiclient.http.html
index 8dec4c6..d35f7fa 100644
--- a/docs/apiclient.http.html
+++ b/docs/apiclient.http.html
@@ -23,7 +23,7 @@
 <tr><td bgcolor="#aa55cc"><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt></td><td>&nbsp;</td>
 <td width="100%"><table width="100%" summary="list"><tr><td width="25%" valign=top><a href="httplib2.html">httplib2</a><br>
 </td><td width="25%" valign=top><a href="os.html">os</a><br>
-</td><td width="25%" valign=top><a href="simplejson.html">simplejson</a><br>
+</td><td width="25%" valign=top><a href="django.utils.simplejson.html">django.utils.simplejson</a><br>
 </td><td width="25%" valign=top></td></tr></table></td></tr></table><p>
 <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
 <tr bgcolor="#ee77aa">
@@ -105,10 +105,10 @@
 &nbsp;&nbsp;response&nbsp;=&nbsp;'{"data":&nbsp;{"id":&nbsp;"tag:google.c...'<br>
 &nbsp;&nbsp;requestBuilder&nbsp;=&nbsp;<a href="#RequestMockBuilder">RequestMockBuilder</a>(<br>
 &nbsp;&nbsp;&nbsp;&nbsp;{<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'chili.activities.get':&nbsp;(None,&nbsp;response),<br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'plus.activities.get':&nbsp;(None,&nbsp;response),<br>
 &nbsp;&nbsp;&nbsp;&nbsp;}<br>
 &nbsp;&nbsp;)<br>
-&nbsp;&nbsp;apiclient.discovery.build("buzz",&nbsp;"v1",&nbsp;requestBuilder=requestBuilder)<br>
+&nbsp;&nbsp;apiclient.discovery.build("plus",&nbsp;"v1",&nbsp;requestBuilder=requestBuilder)<br>
 &nbsp;<br>
 Methods&nbsp;that&nbsp;you&nbsp;do&nbsp;not&nbsp;supply&nbsp;a&nbsp;response&nbsp;for&nbsp;will&nbsp;return&nbsp;a<br>
 200&nbsp;OK&nbsp;with&nbsp;an&nbsp;empty&nbsp;string&nbsp;as&nbsp;the&nbsp;response&nbsp;content&nbsp;or&nbsp;raise&nbsp;an&nbsp;excpetion&nbsp;if<br>
diff --git a/docs/apiclient.model.html b/docs/apiclient.model.html
index 6010090..b15b85d 100644
--- a/docs/apiclient.model.html
+++ b/docs/apiclient.model.html
@@ -24,7 +24,7 @@
 <tr><td bgcolor="#aa55cc"><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt></td><td>&nbsp;</td>
 <td width="100%"><table width="100%" summary="list"><tr><td width="25%" valign=top><a href="gflags.html">gflags</a><br>
 </td><td width="25%" valign=top><a href="logging.html">logging</a><br>
-</td><td width="25%" valign=top><a href="simplejson.html">simplejson</a><br>
+</td><td width="25%" valign=top><a href="django.utils.simplejson.html">django.utils.simplejson</a><br>
 </td><td width="25%" valign=top><a href="urllib.html">urllib</a><br>
 </td></tr></table></td></tr></table><p>
 <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
diff --git a/docs/apiclient.oauth.html b/docs/apiclient.oauth.html
index 5d76736..de6234c 100644
--- a/docs/apiclient.oauth.html
+++ b/docs/apiclient.oauth.html
@@ -23,7 +23,7 @@
 <a href="httplib2.html">httplib2</a><br>
 </td><td width="25%" valign=top><a href="logging.html">logging</a><br>
 <a href="oauth2.html">oauth2</a><br>
-</td><td width="25%" valign=top><a href="simplejson.html">simplejson</a><br>
+</td><td width="25%" valign=top><a href="django.utils.simplejson.html">django.utils.simplejson</a><br>
 <a href="urllib.html">urllib</a><br>
 </td><td width="25%" valign=top><a href="urlparse.html">urlparse</a><br>
 </td></tr></table></td></tr></table><p>
diff --git a/docs/build.sh b/docs/build.sh
index 47367b1..1f922e7 100755
--- a/docs/build.sh
+++ b/docs/build.sh
@@ -22,11 +22,10 @@
 # Notes: You may have to update the location of the
 #        App Engine library for your local system.
 
-export GOOGLE_APPENGINE=$HOME/projects/google_appengine
+export GOOGLE_APPENGINE=$HOME/projects/google_appengine/
 export DJANGO_SETTINGS_MODULE=fakesettings
 export PYTHONPATH=`pwd`/..:$GOOGLE_APPENGINE
 find ../apiclient/ -name "*.py" | sed "s/\/__init__.py//" | sed "s/\.py//" | sed "s/^\.\.\///" | sed "s#/#.#g" | xargs python `which pydoc` -w
 find ../oauth2client/ -name "*.py" | sed "s/\/__init__.py//" | sed "s/\.py//" | sed "s/^\.\.\///" | sed "s#/#.#g" | xargs python `which pydoc` -w
-find ../httplib2/ -name "*.py" | sed "s/\/__init__.py//" | sed "s/\.py//" | sed "s/^\.\.\///" | sed "s#/#.#g" | xargs python `which pydoc` -w
 find ../uritemplate/ -name "*.py" | sed "s/\/__init__.py//" | sed "s/\.py//" | sed "s/^\.\.\///" | sed "s#/#.#g" | xargs python `which pydoc` -w
 
diff --git a/docs/dyn/analytics.v3.html b/docs/dyn/analytics.v3.html
index 0520383..6949bf9 100644
--- a/docs/dyn/analytics.v3.html
+++ b/docs/dyn/analytics.v3.html
@@ -16,6 +16,8 @@
 
 <dl><dt><a name="Resource-management"><strong><a href="analytics.v3.management.html">management</a></strong></a> = methodResource(self)</dt><dd><tt>A&nbsp;collection&nbsp;resource.</tt></dd></dl>
 
+<dl><dt><a name="Resource-report"><strong><a href="analytics.v3.report.html">report</a></strong></a> = methodResource(self)</dt><dd><tt>A&nbsp;collection&nbsp;resource.</tt></dd></dl>
+
 <hr>
 Data descriptors defined here:<br>
 <dl><dt><strong>__dict__</strong></dt>
diff --git a/docs/dyn/analytics.v3.report.html b/docs/dyn/analytics.v3.report.html
new file mode 100644
index 0000000..fb4d8cf
--- /dev/null
+++ b/docs/dyn/analytics.v3.report.html
@@ -0,0 +1,40 @@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html><head><title>Python: class Resource</title>
+</head><body bgcolor="#f0f0f8">
+<p>
+<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
+<tr bgcolor="#ffc8d8">
+<td colspan=3 valign=bottom>&nbsp;<br>
+<font color="#000000" face="helvetica, arial"><a name="Resource">class <strong>Resource</strong></a>(<a href="__builtin__.html#object">__builtin__.object</a>)</font></td></tr>
+    
+<tr bgcolor="#ffc8d8"><td rowspan=2><tt>&nbsp;&nbsp;&nbsp;</tt></td>
+<td colspan=2><tt>A&nbsp;class&nbsp;for&nbsp;interacting&nbsp;with&nbsp;a&nbsp;resource.<br>&nbsp;</tt></td></tr>
+<tr><td>&nbsp;</td>
+<td width="100%">Methods defined here:<br>
+<dl><dt><a name="Resource-__init__"><strong>__init__</strong></a>(self)</dt></dl>
+
+<dl><dt><a name="Resource-get"><strong>get</strong></a> = method(self, **kwargs)</dt><dd><tt>Returns&nbsp;Analytics&nbsp;report&nbsp;data&nbsp;for&nbsp;a&nbsp;profile.<br>
+&nbsp;<br>
+Args:<br>
+&nbsp;&nbsp;sort:&nbsp;string,&nbsp;A&nbsp;comma-separated&nbsp;list&nbsp;of&nbsp;dimensions&nbsp;or&nbsp;metrics&nbsp;that&nbsp;determine&nbsp;the&nbsp;sort&nbsp;order&nbsp;for&nbsp;the&nbsp;report&nbsp;data.<br>
+&nbsp;&nbsp;end_date:&nbsp;string,&nbsp;End&nbsp;date&nbsp;for&nbsp;fetching&nbsp;report&nbsp;data.&nbsp;All&nbsp;requests&nbsp;should&nbsp;specify&nbsp;an&nbsp;end&nbsp;date&nbsp;formatted&nbsp;as&nbsp;YYYY-MM-DD.&nbsp;(required)<br>
+&nbsp;&nbsp;dimensions:&nbsp;string,&nbsp;A&nbsp;comma-separated&nbsp;list&nbsp;of&nbsp;Analytics&nbsp;dimensions.&nbsp;E.g.,&nbsp;'ga:browser,ga:city'.<br>
+&nbsp;&nbsp;ids:&nbsp;string,&nbsp;Unique&nbsp;table&nbsp;ID&nbsp;for&nbsp;retrieving&nbsp;report&nbsp;data.&nbsp;Table&nbsp;ID&nbsp;is&nbsp;of&nbsp;the&nbsp;form&nbsp;ga:XXXX,&nbsp;where&nbsp;XXXX&nbsp;is&nbsp;the&nbsp;Analytics&nbsp;profile&nbsp;ID.&nbsp;(required)<br>
+&nbsp;&nbsp;metrics:&nbsp;string,&nbsp;A&nbsp;comma-separated&nbsp;list&nbsp;of&nbsp;Analytics&nbsp;metrics.&nbsp;E.g.,&nbsp;'ga:visits,ga:pageviews'.&nbsp;At&nbsp;least&nbsp;one&nbsp;metric&nbsp;must&nbsp;be&nbsp;specified&nbsp;to&nbsp;retrieve&nbsp;a&nbsp;valid&nbsp;Analytics&nbsp;report.&nbsp;(required)<br>
+&nbsp;&nbsp;max_results:&nbsp;integer,&nbsp;The&nbsp;maximum&nbsp;number&nbsp;of&nbsp;entries&nbsp;to&nbsp;include&nbsp;in&nbsp;this&nbsp;feed.<br>
+&nbsp;&nbsp;filters:&nbsp;string,&nbsp;A&nbsp;comma-separated&nbsp;list&nbsp;of&nbsp;dimension&nbsp;or&nbsp;metric&nbsp;filters&nbsp;to&nbsp;be&nbsp;applied&nbsp;to&nbsp;the&nbsp;report&nbsp;data.<br>
+&nbsp;&nbsp;segment:&nbsp;string,&nbsp;An&nbsp;Analytics&nbsp;advanced&nbsp;segment&nbsp;to&nbsp;be&nbsp;applied&nbsp;to&nbsp;the&nbsp;report&nbsp;data.<br>
+&nbsp;&nbsp;start_date:&nbsp;string,&nbsp;Start&nbsp;date&nbsp;for&nbsp;fetching&nbsp;report&nbsp;data.&nbsp;All&nbsp;requests&nbsp;should&nbsp;specify&nbsp;a&nbsp;start&nbsp;date&nbsp;formatted&nbsp;as&nbsp;YYYY-MM-DD.&nbsp;(required)<br>
+&nbsp;&nbsp;start_index:&nbsp;integer,&nbsp;An&nbsp;index&nbsp;of&nbsp;the&nbsp;first&nbsp;entity&nbsp;to&nbsp;retrieve.&nbsp;Use&nbsp;this&nbsp;parameter&nbsp;as&nbsp;a&nbsp;pagination&nbsp;mechanism&nbsp;along&nbsp;with&nbsp;the&nbsp;max-results&nbsp;parameter.</tt></dd></dl>
+
+<hr>
+Data descriptors defined here:<br>
+<dl><dt><strong>__dict__</strong></dt>
+<dd><tt>dictionary&nbsp;for&nbsp;instance&nbsp;variables&nbsp;(if&nbsp;defined)</tt></dd>
+</dl>
+<dl><dt><strong>__weakref__</strong></dt>
+<dd><tt>list&nbsp;of&nbsp;weak&nbsp;references&nbsp;to&nbsp;the&nbsp;object&nbsp;(if&nbsp;defined)</tt></dd>
+</dl>
+</td></tr></table>
+</body></html>
\ No newline at end of file
diff --git a/docs/dyn/buzz.v1.activities.html b/docs/dyn/buzz.v1.activities.html
deleted file mode 100644
index 60b5753..0000000
--- a/docs/dyn/buzz.v1.activities.html
+++ /dev/null
@@ -1,205 +0,0 @@
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head><title>Python: class Resource</title>
-</head><body bgcolor="#f0f0f8">
-<p>
-<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
-<tr bgcolor="#ffc8d8">
-<td colspan=3 valign=bottom>&nbsp;<br>
-<font color="#000000" face="helvetica, arial"><a name="Resource">class <strong>Resource</strong></a>(<a href="__builtin__.html#object">__builtin__.object</a>)</font></td></tr>
-    
-<tr bgcolor="#ffc8d8"><td rowspan=2><tt>&nbsp;&nbsp;&nbsp;</tt></td>
-<td colspan=2><tt>A&nbsp;class&nbsp;for&nbsp;interacting&nbsp;with&nbsp;a&nbsp;resource.<br>&nbsp;</tt></td></tr>
-<tr><td>&nbsp;</td>
-<td width="100%">Methods defined here:<br>
-<dl><dt><a name="Resource-__init__"><strong>__init__</strong></a>(self)</dt></dl>
-
-<dl><dt><a name="Resource-count"><strong>count</strong></a> = method(self, **kwargs)</dt><dd><tt>Get&nbsp;a&nbsp;count&nbsp;of&nbsp;link&nbsp;shares<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;url:&nbsp;string,&nbsp;URLs&nbsp;for&nbsp;which&nbsp;to&nbsp;get&nbsp;share&nbsp;counts.&nbsp;(repeated)<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.</tt></dd></dl>
-
-<dl><dt><a name="Resource-delete"><strong>delete</strong></a> = method(self, **kwargs)</dt><dd><tt>Delete&nbsp;an&nbsp;activity<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;userId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;user&nbsp;whose&nbsp;post&nbsp;to&nbsp;delete.&nbsp;(required)<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;scope:&nbsp;string,&nbsp;The&nbsp;collection&nbsp;to&nbsp;which&nbsp;the&nbsp;activity&nbsp;belongs.&nbsp;(required)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;@liked&nbsp;-&nbsp;Activities&nbsp;liked&nbsp;by&nbsp;the&nbsp;user.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;@muted&nbsp;-&nbsp;Activities&nbsp;muted&nbsp;by&nbsp;the&nbsp;user.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;@self&nbsp;-&nbsp;Activities&nbsp;posted&nbsp;by&nbsp;the&nbsp;user.<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format<br>
-&nbsp;&nbsp;postId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;activity&nbsp;to&nbsp;delete.&nbsp;(required)</tt></dd></dl>
-
-<dl><dt><a name="Resource-extractPeopleFromSearch"><strong>extractPeopleFromSearch</strong></a> = method(self, **kwargs)</dt><dd><tt>Search&nbsp;for&nbsp;people&nbsp;by&nbsp;topic<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;c:&nbsp;string,&nbsp;A&nbsp;continuation&nbsp;token&nbsp;that&nbsp;allows&nbsp;pagination.<br>
-&nbsp;&nbsp;lat:&nbsp;string,&nbsp;Latitude&nbsp;to&nbsp;use&nbsp;in&nbsp;a&nbsp;geographic&nbsp;location&nbsp;query.<br>
-&nbsp;&nbsp;lon:&nbsp;string,&nbsp;Longitude&nbsp;to&nbsp;use&nbsp;in&nbsp;a&nbsp;geographic&nbsp;location&nbsp;query.<br>
-&nbsp;&nbsp;pid:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;a&nbsp;place&nbsp;to&nbsp;use&nbsp;in&nbsp;a&nbsp;geographic&nbsp;location&nbsp;query.<br>
-&nbsp;&nbsp;q:&nbsp;string,&nbsp;Full-text&nbsp;search&nbsp;query&nbsp;string.<br>
-&nbsp;&nbsp;max_results:&nbsp;integer,&nbsp;Maximum&nbsp;number&nbsp;of&nbsp;results&nbsp;to&nbsp;include.<br>
-&nbsp;&nbsp;radius:&nbsp;string,&nbsp;Radius&nbsp;to&nbsp;use&nbsp;in&nbsp;a&nbsp;geographic&nbsp;location&nbsp;query.<br>
-&nbsp;&nbsp;bbox:&nbsp;string,&nbsp;Bounding&nbsp;box&nbsp;to&nbsp;use&nbsp;in&nbsp;a&nbsp;geographic&nbsp;location&nbsp;query.<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format</tt></dd></dl>
-
-<dl><dt><a name="Resource-get"><strong>get</strong></a> = method(self, **kwargs)</dt><dd><tt>Get&nbsp;an&nbsp;activity<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;postId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;post&nbsp;to&nbsp;get.&nbsp;(required)<br>
-&nbsp;&nbsp;truncateAtom:&nbsp;boolean,&nbsp;Truncate&nbsp;the&nbsp;value&nbsp;of&nbsp;the&nbsp;atom:content&nbsp;element.<br>
-&nbsp;&nbsp;userId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;user&nbsp;whose&nbsp;post&nbsp;to&nbsp;get.&nbsp;(required)<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format<br>
-&nbsp;&nbsp;max_comments:&nbsp;integer,&nbsp;Maximum&nbsp;number&nbsp;of&nbsp;comments&nbsp;to&nbsp;include.<br>
-&nbsp;&nbsp;max_liked:&nbsp;integer,&nbsp;Maximum&nbsp;number&nbsp;of&nbsp;likes&nbsp;to&nbsp;include.</tt></dd></dl>
-
-<dl><dt><a name="Resource-insert"><strong>insert</strong></a> = method(self, **kwargs)</dt><dd><tt>Create&nbsp;a&nbsp;new&nbsp;activity<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;body:&nbsp;object,&nbsp;The&nbsp;request&nbsp;body.<br>
-&nbsp;&nbsp;media_body:&nbsp;string,&nbsp;The&nbsp;filename&nbsp;of&nbsp;the&nbsp;media&nbsp;request&nbsp;body.<br>
-&nbsp;&nbsp;userId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;user&nbsp;being&nbsp;referenced.&nbsp;(required)<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format<br>
-&nbsp;&nbsp;preview:&nbsp;boolean,&nbsp;If&nbsp;true,&nbsp;only&nbsp;preview&nbsp;the&nbsp;action.</tt></dd></dl>
-
-<dl><dt><a name="Resource-list"><strong>list</strong></a> = method(self, **kwargs)</dt><dd><tt>List&nbsp;activities<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;c:&nbsp;string,&nbsp;A&nbsp;continuation&nbsp;token&nbsp;that&nbsp;allows&nbsp;pagination.<br>
-&nbsp;&nbsp;truncateAtom:&nbsp;boolean,&nbsp;Truncate&nbsp;the&nbsp;value&nbsp;of&nbsp;the&nbsp;atom:content&nbsp;element.<br>
-&nbsp;&nbsp;userId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;user&nbsp;being&nbsp;referenced.&nbsp;(required)<br>
-&nbsp;&nbsp;max_results:&nbsp;integer,&nbsp;Maximum&nbsp;number&nbsp;of&nbsp;results&nbsp;to&nbsp;include.<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;scope:&nbsp;string,&nbsp;The&nbsp;collection&nbsp;of&nbsp;activities&nbsp;to&nbsp;list.&nbsp;(required)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;@comments&nbsp;-&nbsp;Limit&nbsp;to&nbsp;activities&nbsp;commented&nbsp;on&nbsp;by&nbsp;the&nbsp;user.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;@consumption&nbsp;-&nbsp;Limit&nbsp;to&nbsp;activities&nbsp;to&nbsp;be&nbsp;consumed&nbsp;by&nbsp;the&nbsp;user.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;@liked&nbsp;-&nbsp;Limit&nbsp;to&nbsp;activities&nbsp;liked&nbsp;by&nbsp;the&nbsp;user.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;@public&nbsp;-&nbsp;Limit&nbsp;to&nbsp;public&nbsp;activities&nbsp;posted&nbsp;by&nbsp;the&nbsp;user.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;@self&nbsp;-&nbsp;Limit&nbsp;to&nbsp;activities&nbsp;posted&nbsp;by&nbsp;the&nbsp;user.<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format<br>
-&nbsp;&nbsp;max_comments:&nbsp;integer,&nbsp;Maximum&nbsp;number&nbsp;of&nbsp;comments&nbsp;to&nbsp;include.<br>
-&nbsp;&nbsp;max_liked:&nbsp;integer,&nbsp;Maximum&nbsp;number&nbsp;of&nbsp;likes&nbsp;to&nbsp;include.</tt></dd></dl>
-
-<dl><dt><a name="Resource-list_next"><strong>list_next</strong></a> = methodNext(self, previous)</dt><dd><tt>Retrieve&nbsp;the&nbsp;next&nbsp;page&nbsp;of&nbsp;results.<br>
-&nbsp;<br>
-Takes&nbsp;a&nbsp;single&nbsp;argument,&nbsp;'body',&nbsp;which&nbsp;is&nbsp;the&nbsp;results<br>
-from&nbsp;the&nbsp;last&nbsp;call,&nbsp;and&nbsp;returns&nbsp;the&nbsp;next&nbsp;set&nbsp;of&nbsp;items<br>
-in&nbsp;the&nbsp;collection.<br>
-&nbsp;<br>
-Returns:<br>
-&nbsp;&nbsp;None&nbsp;if&nbsp;there&nbsp;are&nbsp;no&nbsp;more&nbsp;items&nbsp;in&nbsp;the&nbsp;collection.</tt></dd></dl>
-
-<dl><dt><a name="Resource-patch"><strong>patch</strong></a> = method(self, **kwargs)</dt><dd><tt>Update&nbsp;an&nbsp;activity.&nbsp;This&nbsp;method&nbsp;supports&nbsp;patch&nbsp;semantics.<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;body:&nbsp;object,&nbsp;The&nbsp;request&nbsp;body.&nbsp;(required)<br>
-&nbsp;&nbsp;userId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;user&nbsp;whose&nbsp;post&nbsp;to&nbsp;update.&nbsp;(required)<br>
-&nbsp;&nbsp;abuseType:&nbsp;string,&nbsp;A&nbsp;parameter<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;scope:&nbsp;string,&nbsp;The&nbsp;collection&nbsp;to&nbsp;which&nbsp;the&nbsp;activity&nbsp;belongs.&nbsp;(required)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;@abuse&nbsp;-&nbsp;Activities&nbsp;reported&nbsp;by&nbsp;the&nbsp;user.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;@liked&nbsp;-&nbsp;Activities&nbsp;liked&nbsp;by&nbsp;the&nbsp;user.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;@muted&nbsp;-&nbsp;Activities&nbsp;muted&nbsp;by&nbsp;the&nbsp;user.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;@self&nbsp;-&nbsp;Activities&nbsp;posted&nbsp;by&nbsp;the&nbsp;user.<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format<br>
-&nbsp;&nbsp;postId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;activity&nbsp;to&nbsp;update.&nbsp;(required)</tt></dd></dl>
-
-<dl><dt><a name="Resource-search"><strong>search</strong></a> = method(self, **kwargs)</dt><dd><tt>Search&nbsp;for&nbsp;activities<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;c:&nbsp;string,&nbsp;A&nbsp;continuation&nbsp;token&nbsp;that&nbsp;allows&nbsp;pagination.<br>
-&nbsp;&nbsp;lat:&nbsp;string,&nbsp;Latitude&nbsp;to&nbsp;use&nbsp;in&nbsp;a&nbsp;geographic&nbsp;location&nbsp;query.<br>
-&nbsp;&nbsp;lon:&nbsp;string,&nbsp;Longitude&nbsp;to&nbsp;use&nbsp;in&nbsp;a&nbsp;geographic&nbsp;location&nbsp;query.<br>
-&nbsp;&nbsp;pid:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;a&nbsp;place&nbsp;to&nbsp;use&nbsp;in&nbsp;a&nbsp;geographic&nbsp;location&nbsp;query.<br>
-&nbsp;&nbsp;q:&nbsp;string,&nbsp;Full-text&nbsp;search&nbsp;query&nbsp;string.<br>
-&nbsp;&nbsp;truncateAtom:&nbsp;boolean,&nbsp;Truncate&nbsp;the&nbsp;value&nbsp;of&nbsp;the&nbsp;atom:content&nbsp;element.<br>
-&nbsp;&nbsp;max_results:&nbsp;integer,&nbsp;Maximum&nbsp;number&nbsp;of&nbsp;results&nbsp;to&nbsp;include.<br>
-&nbsp;&nbsp;radius:&nbsp;string,&nbsp;Radius&nbsp;to&nbsp;use&nbsp;in&nbsp;a&nbsp;geographic&nbsp;location&nbsp;query.<br>
-&nbsp;&nbsp;bbox:&nbsp;string,&nbsp;Bounding&nbsp;box&nbsp;to&nbsp;use&nbsp;in&nbsp;a&nbsp;geographic&nbsp;location&nbsp;query.<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format</tt></dd></dl>
-
-<dl><dt><a name="Resource-search_next"><strong>search_next</strong></a> = methodNext(self, previous)</dt><dd><tt>Retrieve&nbsp;the&nbsp;next&nbsp;page&nbsp;of&nbsp;results.<br>
-&nbsp;<br>
-Takes&nbsp;a&nbsp;single&nbsp;argument,&nbsp;'body',&nbsp;which&nbsp;is&nbsp;the&nbsp;results<br>
-from&nbsp;the&nbsp;last&nbsp;call,&nbsp;and&nbsp;returns&nbsp;the&nbsp;next&nbsp;set&nbsp;of&nbsp;items<br>
-in&nbsp;the&nbsp;collection.<br>
-&nbsp;<br>
-Returns:<br>
-&nbsp;&nbsp;None&nbsp;if&nbsp;there&nbsp;are&nbsp;no&nbsp;more&nbsp;items&nbsp;in&nbsp;the&nbsp;collection.</tt></dd></dl>
-
-<dl><dt><a name="Resource-track"><strong>track</strong></a> = method(self, **kwargs)</dt><dd><tt>Get&nbsp;real-time&nbsp;activity&nbsp;tracking&nbsp;information<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;c:&nbsp;string,&nbsp;A&nbsp;continuation&nbsp;token&nbsp;that&nbsp;allows&nbsp;pagination.<br>
-&nbsp;&nbsp;lat:&nbsp;string,&nbsp;Latitude&nbsp;to&nbsp;use&nbsp;in&nbsp;a&nbsp;geographic&nbsp;location&nbsp;query.<br>
-&nbsp;&nbsp;lon:&nbsp;string,&nbsp;Longitude&nbsp;to&nbsp;use&nbsp;in&nbsp;a&nbsp;geographic&nbsp;location&nbsp;query.<br>
-&nbsp;&nbsp;pid:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;a&nbsp;place&nbsp;to&nbsp;use&nbsp;in&nbsp;a&nbsp;geographic&nbsp;location&nbsp;query.<br>
-&nbsp;&nbsp;q:&nbsp;string,&nbsp;Full-text&nbsp;search&nbsp;query&nbsp;string.<br>
-&nbsp;&nbsp;max_results:&nbsp;integer,&nbsp;Maximum&nbsp;number&nbsp;of&nbsp;results&nbsp;to&nbsp;include.<br>
-&nbsp;&nbsp;radius:&nbsp;string,&nbsp;Radius&nbsp;to&nbsp;use&nbsp;in&nbsp;a&nbsp;geographic&nbsp;location&nbsp;query.<br>
-&nbsp;&nbsp;bbox:&nbsp;string,&nbsp;Bounding&nbsp;box&nbsp;to&nbsp;use&nbsp;in&nbsp;a&nbsp;geographic&nbsp;location&nbsp;query.<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format</tt></dd></dl>
-
-<dl><dt><a name="Resource-update"><strong>update</strong></a> = method(self, **kwargs)</dt><dd><tt>Update&nbsp;an&nbsp;activity<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;body:&nbsp;object,&nbsp;The&nbsp;request&nbsp;body.&nbsp;(required)<br>
-&nbsp;&nbsp;userId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;user&nbsp;whose&nbsp;post&nbsp;to&nbsp;update.&nbsp;(required)<br>
-&nbsp;&nbsp;abuseType:&nbsp;string,&nbsp;A&nbsp;parameter<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;scope:&nbsp;string,&nbsp;The&nbsp;collection&nbsp;to&nbsp;which&nbsp;the&nbsp;activity&nbsp;belongs.&nbsp;(required)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;@abuse&nbsp;-&nbsp;Activities&nbsp;reported&nbsp;by&nbsp;the&nbsp;user.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;@liked&nbsp;-&nbsp;Activities&nbsp;liked&nbsp;by&nbsp;the&nbsp;user.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;@muted&nbsp;-&nbsp;Activities&nbsp;muted&nbsp;by&nbsp;the&nbsp;user.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;@self&nbsp;-&nbsp;Activities&nbsp;posted&nbsp;by&nbsp;the&nbsp;user.<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format<br>
-&nbsp;&nbsp;postId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;activity&nbsp;to&nbsp;update.&nbsp;(required)</tt></dd></dl>
-
-<hr>
-Data descriptors defined here:<br>
-<dl><dt><strong>__dict__</strong></dt>
-<dd><tt>dictionary&nbsp;for&nbsp;instance&nbsp;variables&nbsp;(if&nbsp;defined)</tt></dd>
-</dl>
-<dl><dt><strong>__weakref__</strong></dt>
-<dd><tt>list&nbsp;of&nbsp;weak&nbsp;references&nbsp;to&nbsp;the&nbsp;object&nbsp;(if&nbsp;defined)</tt></dd>
-</dl>
-</td></tr></table>
-</body></html>
\ No newline at end of file
diff --git a/docs/dyn/buzz.v1.comments.html b/docs/dyn/buzz.v1.comments.html
deleted file mode 100644
index 12aa3a4..0000000
--- a/docs/dyn/buzz.v1.comments.html
+++ /dev/null
@@ -1,114 +0,0 @@
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head><title>Python: class Resource</title>
-</head><body bgcolor="#f0f0f8">
-<p>
-<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
-<tr bgcolor="#ffc8d8">
-<td colspan=3 valign=bottom>&nbsp;<br>
-<font color="#000000" face="helvetica, arial"><a name="Resource">class <strong>Resource</strong></a>(<a href="__builtin__.html#object">__builtin__.object</a>)</font></td></tr>
-    
-<tr bgcolor="#ffc8d8"><td rowspan=2><tt>&nbsp;&nbsp;&nbsp;</tt></td>
-<td colspan=2><tt>A&nbsp;class&nbsp;for&nbsp;interacting&nbsp;with&nbsp;a&nbsp;resource.<br>&nbsp;</tt></td></tr>
-<tr><td>&nbsp;</td>
-<td width="100%">Methods defined here:<br>
-<dl><dt><a name="Resource-__init__"><strong>__init__</strong></a>(self)</dt></dl>
-
-<dl><dt><a name="Resource-delete"><strong>delete</strong></a> = method(self, **kwargs)</dt><dd><tt>Delete&nbsp;a&nbsp;comment<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;userId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;user&nbsp;being&nbsp;referenced.&nbsp;(required)<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;commentId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;comment&nbsp;being&nbsp;referenced.&nbsp;(required)<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format<br>
-&nbsp;&nbsp;postId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;activity&nbsp;for&nbsp;which&nbsp;to&nbsp;delete&nbsp;the&nbsp;comment.&nbsp;(required)</tt></dd></dl>
-
-<dl><dt><a name="Resource-get"><strong>get</strong></a> = method(self, **kwargs)</dt><dd><tt>Get&nbsp;a&nbsp;comment<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;userId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;user&nbsp;being&nbsp;referenced.&nbsp;(required)<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;commentId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;comment&nbsp;being&nbsp;referenced.&nbsp;(required)<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format<br>
-&nbsp;&nbsp;postId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;activity&nbsp;for&nbsp;which&nbsp;to&nbsp;get&nbsp;comments.&nbsp;(required)</tt></dd></dl>
-
-<dl><dt><a name="Resource-insert"><strong>insert</strong></a> = method(self, **kwargs)</dt><dd><tt>Create&nbsp;a&nbsp;comment<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;body:&nbsp;object,&nbsp;The&nbsp;request&nbsp;body.&nbsp;(required)<br>
-&nbsp;&nbsp;userId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;user&nbsp;on&nbsp;whose&nbsp;behalf&nbsp;to&nbsp;comment.&nbsp;(required)<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format<br>
-&nbsp;&nbsp;postId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;activity&nbsp;on&nbsp;which&nbsp;to&nbsp;comment.&nbsp;(required)</tt></dd></dl>
-
-<dl><dt><a name="Resource-list"><strong>list</strong></a> = method(self, **kwargs)</dt><dd><tt>List&nbsp;comments<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;c:&nbsp;string,&nbsp;A&nbsp;continuation&nbsp;token&nbsp;that&nbsp;allows&nbsp;pagination.<br>
-&nbsp;&nbsp;userId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;user&nbsp;for&nbsp;whose&nbsp;post&nbsp;to&nbsp;get&nbsp;comments.&nbsp;(required)<br>
-&nbsp;&nbsp;max_results:&nbsp;integer,&nbsp;Maximum&nbsp;number&nbsp;of&nbsp;results&nbsp;to&nbsp;include.<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;scope:&nbsp;string,&nbsp;The&nbsp;collection&nbsp;to&nbsp;which&nbsp;the&nbsp;activity&nbsp;belongs.&nbsp;(required)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;@self&nbsp;-&nbsp;Activities&nbsp;posted&nbsp;by&nbsp;the&nbsp;user.<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format<br>
-&nbsp;&nbsp;postId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;activity&nbsp;for&nbsp;which&nbsp;to&nbsp;get&nbsp;comments.&nbsp;(required)</tt></dd></dl>
-
-<dl><dt><a name="Resource-patch"><strong>patch</strong></a> = method(self, **kwargs)</dt><dd><tt>Update&nbsp;a&nbsp;comment.&nbsp;This&nbsp;method&nbsp;supports&nbsp;patch&nbsp;semantics.<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;body:&nbsp;object,&nbsp;The&nbsp;request&nbsp;body.&nbsp;(required)<br>
-&nbsp;&nbsp;userId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;user&nbsp;being&nbsp;referenced.&nbsp;(required)<br>
-&nbsp;&nbsp;abuseType:&nbsp;string,&nbsp;A&nbsp;parameter<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;commentId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;comment&nbsp;being&nbsp;referenced.&nbsp;(required)<br>
-&nbsp;&nbsp;scope:&nbsp;string,&nbsp;The&nbsp;collection&nbsp;to&nbsp;which&nbsp;the&nbsp;activity&nbsp;belongs.&nbsp;(required)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;@abuse&nbsp;-&nbsp;Comments&nbsp;reported&nbsp;by&nbsp;the&nbsp;user.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;@self&nbsp;-&nbsp;Comments&nbsp;posted&nbsp;by&nbsp;the&nbsp;user.<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format<br>
-&nbsp;&nbsp;postId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;activity&nbsp;for&nbsp;which&nbsp;to&nbsp;update&nbsp;the&nbsp;comment.&nbsp;(required)</tt></dd></dl>
-
-<dl><dt><a name="Resource-update"><strong>update</strong></a> = method(self, **kwargs)</dt><dd><tt>Update&nbsp;a&nbsp;comment<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;body:&nbsp;object,&nbsp;The&nbsp;request&nbsp;body.&nbsp;(required)<br>
-&nbsp;&nbsp;userId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;user&nbsp;being&nbsp;referenced.&nbsp;(required)<br>
-&nbsp;&nbsp;abuseType:&nbsp;string,&nbsp;A&nbsp;parameter<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;commentId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;comment&nbsp;being&nbsp;referenced.&nbsp;(required)<br>
-&nbsp;&nbsp;scope:&nbsp;string,&nbsp;The&nbsp;collection&nbsp;to&nbsp;which&nbsp;the&nbsp;activity&nbsp;belongs.&nbsp;(required)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;@abuse&nbsp;-&nbsp;Comments&nbsp;reported&nbsp;by&nbsp;the&nbsp;user.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;@self&nbsp;-&nbsp;Comments&nbsp;posted&nbsp;by&nbsp;the&nbsp;user.<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format<br>
-&nbsp;&nbsp;postId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;activity&nbsp;for&nbsp;which&nbsp;to&nbsp;update&nbsp;the&nbsp;comment.&nbsp;(required)</tt></dd></dl>
-
-<hr>
-Data descriptors defined here:<br>
-<dl><dt><strong>__dict__</strong></dt>
-<dd><tt>dictionary&nbsp;for&nbsp;instance&nbsp;variables&nbsp;(if&nbsp;defined)</tt></dd>
-</dl>
-<dl><dt><strong>__weakref__</strong></dt>
-<dd><tt>list&nbsp;of&nbsp;weak&nbsp;references&nbsp;to&nbsp;the&nbsp;object&nbsp;(if&nbsp;defined)</tt></dd>
-</dl>
-</td></tr></table>
-</body></html>
\ No newline at end of file
diff --git a/docs/dyn/buzz.v1.groups.html b/docs/dyn/buzz.v1.groups.html
deleted file mode 100644
index 0676e33..0000000
--- a/docs/dyn/buzz.v1.groups.html
+++ /dev/null
@@ -1,104 +0,0 @@
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head><title>Python: class Resource</title>
-</head><body bgcolor="#f0f0f8">
-<p>
-<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
-<tr bgcolor="#ffc8d8">
-<td colspan=3 valign=bottom>&nbsp;<br>
-<font color="#000000" face="helvetica, arial"><a name="Resource">class <strong>Resource</strong></a>(<a href="__builtin__.html#object">__builtin__.object</a>)</font></td></tr>
-    
-<tr bgcolor="#ffc8d8"><td rowspan=2><tt>&nbsp;&nbsp;&nbsp;</tt></td>
-<td colspan=2><tt>A&nbsp;class&nbsp;for&nbsp;interacting&nbsp;with&nbsp;a&nbsp;resource.<br>&nbsp;</tt></td></tr>
-<tr><td>&nbsp;</td>
-<td width="100%">Methods defined here:<br>
-<dl><dt><a name="Resource-__init__"><strong>__init__</strong></a>(self)</dt></dl>
-
-<dl><dt><a name="Resource-delete"><strong>delete</strong></a> = method(self, **kwargs)</dt><dd><tt>Delete&nbsp;a&nbsp;group<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;userId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;user&nbsp;being&nbsp;referenced.&nbsp;(required)<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format<br>
-&nbsp;&nbsp;groupId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;group&nbsp;to&nbsp;delete.&nbsp;(required)</tt></dd></dl>
-
-<dl><dt><a name="Resource-get"><strong>get</strong></a> = method(self, **kwargs)</dt><dd><tt>Get&nbsp;a&nbsp;group<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;userId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;user&nbsp;being&nbsp;referenced.&nbsp;(required)<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format<br>
-&nbsp;&nbsp;groupId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;group&nbsp;to&nbsp;get.&nbsp;(required)</tt></dd></dl>
-
-<dl><dt><a name="Resource-insert"><strong>insert</strong></a> = method(self, **kwargs)</dt><dd><tt>Create&nbsp;a&nbsp;group<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;body:&nbsp;object,&nbsp;The&nbsp;request&nbsp;body.&nbsp;(required)<br>
-&nbsp;&nbsp;userId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;user&nbsp;being&nbsp;referenced.&nbsp;(required)<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format</tt></dd></dl>
-
-<dl><dt><a name="Resource-list"><strong>list</strong></a> = method(self, **kwargs)</dt><dd><tt>Get&nbsp;a&nbsp;user's&nbsp;groups<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;c:&nbsp;string,&nbsp;A&nbsp;continuation&nbsp;token&nbsp;that&nbsp;allows&nbsp;pagination.<br>
-&nbsp;&nbsp;userId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;user&nbsp;being&nbsp;referenced.&nbsp;(required)<br>
-&nbsp;&nbsp;max_results:&nbsp;integer,&nbsp;Maximum&nbsp;number&nbsp;of&nbsp;results&nbsp;to&nbsp;include.<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format</tt></dd></dl>
-
-<dl><dt><a name="Resource-list_next"><strong>list_next</strong></a> = methodNext(self, previous)</dt><dd><tt>Retrieve&nbsp;the&nbsp;next&nbsp;page&nbsp;of&nbsp;results.<br>
-&nbsp;<br>
-Takes&nbsp;a&nbsp;single&nbsp;argument,&nbsp;'body',&nbsp;which&nbsp;is&nbsp;the&nbsp;results<br>
-from&nbsp;the&nbsp;last&nbsp;call,&nbsp;and&nbsp;returns&nbsp;the&nbsp;next&nbsp;set&nbsp;of&nbsp;items<br>
-in&nbsp;the&nbsp;collection.<br>
-&nbsp;<br>
-Returns:<br>
-&nbsp;&nbsp;None&nbsp;if&nbsp;there&nbsp;are&nbsp;no&nbsp;more&nbsp;items&nbsp;in&nbsp;the&nbsp;collection.</tt></dd></dl>
-
-<dl><dt><a name="Resource-patch"><strong>patch</strong></a> = method(self, **kwargs)</dt><dd><tt>Update&nbsp;a&nbsp;group.&nbsp;This&nbsp;method&nbsp;supports&nbsp;patch&nbsp;semantics.<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;body:&nbsp;object,&nbsp;The&nbsp;request&nbsp;body.&nbsp;(required)<br>
-&nbsp;&nbsp;userId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;user&nbsp;being&nbsp;referenced.&nbsp;(required)<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format<br>
-&nbsp;&nbsp;groupId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;group&nbsp;to&nbsp;update.&nbsp;(required)</tt></dd></dl>
-
-<dl><dt><a name="Resource-update"><strong>update</strong></a> = method(self, **kwargs)</dt><dd><tt>Update&nbsp;a&nbsp;group<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;body:&nbsp;object,&nbsp;The&nbsp;request&nbsp;body.&nbsp;(required)<br>
-&nbsp;&nbsp;userId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;user&nbsp;being&nbsp;referenced.&nbsp;(required)<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format<br>
-&nbsp;&nbsp;groupId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;group&nbsp;to&nbsp;update.&nbsp;(required)</tt></dd></dl>
-
-<hr>
-Data descriptors defined here:<br>
-<dl><dt><strong>__dict__</strong></dt>
-<dd><tt>dictionary&nbsp;for&nbsp;instance&nbsp;variables&nbsp;(if&nbsp;defined)</tt></dd>
-</dl>
-<dl><dt><strong>__weakref__</strong></dt>
-<dd><tt>list&nbsp;of&nbsp;weak&nbsp;references&nbsp;to&nbsp;the&nbsp;object&nbsp;(if&nbsp;defined)</tt></dd>
-</dl>
-</td></tr></table>
-</body></html>
\ No newline at end of file
diff --git a/docs/dyn/buzz.v1.html b/docs/dyn/buzz.v1.html
deleted file mode 100644
index 334b0e2..0000000
--- a/docs/dyn/buzz.v1.html
+++ /dev/null
@@ -1,40 +0,0 @@
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head><title>Python: class Resource</title>
-</head><body bgcolor="#f0f0f8">
-<p>
-<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
-<tr bgcolor="#ffc8d8">
-<td colspan=3 valign=bottom>&nbsp;<br>
-<font color="#000000" face="helvetica, arial"><a name="Resource">class <strong>Resource</strong></a>(<a href="__builtin__.html#object">__builtin__.object</a>)</font></td></tr>
-    
-<tr bgcolor="#ffc8d8"><td rowspan=2><tt>&nbsp;&nbsp;&nbsp;</tt></td>
-<td colspan=2><tt>A&nbsp;class&nbsp;for&nbsp;interacting&nbsp;with&nbsp;a&nbsp;resource.<br>&nbsp;</tt></td></tr>
-<tr><td>&nbsp;</td>
-<td width="100%">Methods defined here:<br>
-<dl><dt><a name="Resource-__init__"><strong>__init__</strong></a>(self)</dt></dl>
-
-<dl><dt><a name="Resource-activities"><strong><a href="buzz.v1.activities.html">activities</a></strong></a> = methodResource(self)</dt><dd><tt>A&nbsp;collection&nbsp;resource.</tt></dd></dl>
-
-<dl><dt><a name="Resource-comments"><strong><a href="buzz.v1.comments.html">comments</a></strong></a> = methodResource(self)</dt><dd><tt>A&nbsp;collection&nbsp;resource.</tt></dd></dl>
-
-<dl><dt><a name="Resource-groups"><strong><a href="buzz.v1.groups.html">groups</a></strong></a> = methodResource(self)</dt><dd><tt>A&nbsp;collection&nbsp;resource.</tt></dd></dl>
-
-<dl><dt><a name="Resource-people"><strong><a href="buzz.v1.people.html">people</a></strong></a> = methodResource(self)</dt><dd><tt>A&nbsp;collection&nbsp;resource.</tt></dd></dl>
-
-<dl><dt><a name="Resource-photoAlbums"><strong><a href="buzz.v1.photoAlbums.html">photoAlbums</a></strong></a> = methodResource(self)</dt><dd><tt>A&nbsp;collection&nbsp;resource.</tt></dd></dl>
-
-<dl><dt><a name="Resource-photos"><strong><a href="buzz.v1.photos.html">photos</a></strong></a> = methodResource(self)</dt><dd><tt>A&nbsp;collection&nbsp;resource.</tt></dd></dl>
-
-<dl><dt><a name="Resource-related"><strong><a href="buzz.v1.related.html">related</a></strong></a> = methodResource(self)</dt><dd><tt>A&nbsp;collection&nbsp;resource.</tt></dd></dl>
-
-<hr>
-Data descriptors defined here:<br>
-<dl><dt><strong>__dict__</strong></dt>
-<dd><tt>dictionary&nbsp;for&nbsp;instance&nbsp;variables&nbsp;(if&nbsp;defined)</tt></dd>
-</dl>
-<dl><dt><strong>__weakref__</strong></dt>
-<dd><tt>list&nbsp;of&nbsp;weak&nbsp;references&nbsp;to&nbsp;the&nbsp;object&nbsp;(if&nbsp;defined)</tt></dd>
-</dl>
-</td></tr></table>
-</body></html>
\ No newline at end of file
diff --git a/docs/dyn/buzz.v1.people.html b/docs/dyn/buzz.v1.people.html
deleted file mode 100644
index 2aa47da..0000000
--- a/docs/dyn/buzz.v1.people.html
+++ /dev/null
@@ -1,142 +0,0 @@
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head><title>Python: class Resource</title>
-</head><body bgcolor="#f0f0f8">
-<p>
-<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
-<tr bgcolor="#ffc8d8">
-<td colspan=3 valign=bottom>&nbsp;<br>
-<font color="#000000" face="helvetica, arial"><a name="Resource">class <strong>Resource</strong></a>(<a href="__builtin__.html#object">__builtin__.object</a>)</font></td></tr>
-    
-<tr bgcolor="#ffc8d8"><td rowspan=2><tt>&nbsp;&nbsp;&nbsp;</tt></td>
-<td colspan=2><tt>A&nbsp;class&nbsp;for&nbsp;interacting&nbsp;with&nbsp;a&nbsp;resource.<br>&nbsp;</tt></td></tr>
-<tr><td>&nbsp;</td>
-<td width="100%">Methods defined here:<br>
-<dl><dt><a name="Resource-__init__"><strong>__init__</strong></a>(self)</dt></dl>
-
-<dl><dt><a name="Resource-delete"><strong>delete</strong></a> = method(self, **kwargs)</dt><dd><tt>Remove&nbsp;a&nbsp;person&nbsp;from&nbsp;a&nbsp;group<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;personId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;person&nbsp;to&nbsp;remove&nbsp;from&nbsp;the&nbsp;group.&nbsp;(required)<br>
-&nbsp;&nbsp;userId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;owner&nbsp;of&nbsp;the&nbsp;group.&nbsp;(required)<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format<br>
-&nbsp;&nbsp;groupId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;group&nbsp;from&nbsp;which&nbsp;to&nbsp;remove&nbsp;the&nbsp;person.&nbsp;(required)</tt></dd></dl>
-
-<dl><dt><a name="Resource-get"><strong>get</strong></a> = method(self, **kwargs)</dt><dd><tt>Get&nbsp;a&nbsp;user&nbsp;profile<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;userId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;user&nbsp;being&nbsp;referenced.&nbsp;(required)<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format</tt></dd></dl>
-
-<dl><dt><a name="Resource-liked"><strong>liked</strong></a> = method(self, **kwargs)</dt><dd><tt>Get&nbsp;people&nbsp;who&nbsp;liked&nbsp;an&nbsp;activity<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;c:&nbsp;string,&nbsp;A&nbsp;continuation&nbsp;token&nbsp;that&nbsp;allows&nbsp;pagination.<br>
-&nbsp;&nbsp;userId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;user&nbsp;being&nbsp;referenced.&nbsp;(required)<br>
-&nbsp;&nbsp;max_results:&nbsp;integer,&nbsp;Maximum&nbsp;number&nbsp;of&nbsp;results&nbsp;to&nbsp;include.<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;scope:&nbsp;string,&nbsp;A&nbsp;parameter&nbsp;(required)<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format<br>
-&nbsp;&nbsp;postId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;activity&nbsp;that&nbsp;was&nbsp;liked.&nbsp;(required)<br>
-&nbsp;&nbsp;groupId:&nbsp;string,&nbsp;A&nbsp;parameter&nbsp;(required)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;@liked&nbsp;-&nbsp;People&nbsp;who&nbsp;liked&nbsp;this&nbsp;activity.</tt></dd></dl>
-
-<dl><dt><a name="Resource-liked_next"><strong>liked_next</strong></a> = methodNext(self, previous)</dt><dd><tt>Retrieve&nbsp;the&nbsp;next&nbsp;page&nbsp;of&nbsp;results.<br>
-&nbsp;<br>
-Takes&nbsp;a&nbsp;single&nbsp;argument,&nbsp;'body',&nbsp;which&nbsp;is&nbsp;the&nbsp;results<br>
-from&nbsp;the&nbsp;last&nbsp;call,&nbsp;and&nbsp;returns&nbsp;the&nbsp;next&nbsp;set&nbsp;of&nbsp;items<br>
-in&nbsp;the&nbsp;collection.<br>
-&nbsp;<br>
-Returns:<br>
-&nbsp;&nbsp;None&nbsp;if&nbsp;there&nbsp;are&nbsp;no&nbsp;more&nbsp;items&nbsp;in&nbsp;the&nbsp;collection.</tt></dd></dl>
-
-<dl><dt><a name="Resource-list"><strong>list</strong></a> = method(self, **kwargs)</dt><dd><tt>Get&nbsp;people&nbsp;in&nbsp;a&nbsp;group<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;c:&nbsp;string,&nbsp;A&nbsp;continuation&nbsp;token&nbsp;that&nbsp;allows&nbsp;pagination.<br>
-&nbsp;&nbsp;userId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;user&nbsp;being&nbsp;referenced.&nbsp;(required)<br>
-&nbsp;&nbsp;max_results:&nbsp;integer,&nbsp;Maximum&nbsp;number&nbsp;of&nbsp;results&nbsp;to&nbsp;include.<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format<br>
-&nbsp;&nbsp;groupId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;group&nbsp;for&nbsp;which&nbsp;to&nbsp;list&nbsp;users.&nbsp;(required)</tt></dd></dl>
-
-<dl><dt><a name="Resource-patch"><strong>patch</strong></a> = method(self, **kwargs)</dt><dd><tt>Add&nbsp;a&nbsp;person&nbsp;to&nbsp;a&nbsp;group.&nbsp;This&nbsp;method&nbsp;supports&nbsp;patch&nbsp;semantics.<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;body:&nbsp;object,&nbsp;The&nbsp;request&nbsp;body.&nbsp;(required)<br>
-&nbsp;&nbsp;personId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;person&nbsp;to&nbsp;add&nbsp;to&nbsp;the&nbsp;group.&nbsp;(required)<br>
-&nbsp;&nbsp;userId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;owner&nbsp;of&nbsp;the&nbsp;group.&nbsp;(required)<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format<br>
-&nbsp;&nbsp;groupId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;group&nbsp;to&nbsp;which&nbsp;to&nbsp;add&nbsp;the&nbsp;person.&nbsp;(required)</tt></dd></dl>
-
-<dl><dt><a name="Resource-reshared"><strong>reshared</strong></a> = method(self, **kwargs)</dt><dd><tt>Get&nbsp;people&nbsp;who&nbsp;reshared&nbsp;an&nbsp;activity<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;c:&nbsp;string,&nbsp;A&nbsp;continuation&nbsp;token&nbsp;that&nbsp;allows&nbsp;pagination.<br>
-&nbsp;&nbsp;userId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;user&nbsp;being&nbsp;referenced.&nbsp;(required)<br>
-&nbsp;&nbsp;max_results:&nbsp;integer,&nbsp;Maximum&nbsp;number&nbsp;of&nbsp;results&nbsp;to&nbsp;include.<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;scope:&nbsp;string,&nbsp;A&nbsp;parameter&nbsp;(required)<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format<br>
-&nbsp;&nbsp;postId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;activity&nbsp;that&nbsp;was&nbsp;reshared.&nbsp;(required)<br>
-&nbsp;&nbsp;groupId:&nbsp;string,&nbsp;A&nbsp;parameter&nbsp;(required)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;@reshared&nbsp;-&nbsp;People&nbsp;who&nbsp;reshared&nbsp;this&nbsp;activity.</tt></dd></dl>
-
-<dl><dt><a name="Resource-search"><strong>search</strong></a> = method(self, **kwargs)</dt><dd><tt>Search&nbsp;for&nbsp;people<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;c:&nbsp;string,&nbsp;A&nbsp;continuation&nbsp;token&nbsp;that&nbsp;allows&nbsp;pagination.<br>
-&nbsp;&nbsp;q:&nbsp;string,&nbsp;Full-text&nbsp;search&nbsp;query&nbsp;string.<br>
-&nbsp;&nbsp;max_results:&nbsp;integer,&nbsp;Maximum&nbsp;number&nbsp;of&nbsp;results&nbsp;to&nbsp;include.<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format</tt></dd></dl>
-
-<dl><dt><a name="Resource-update"><strong>update</strong></a> = method(self, **kwargs)</dt><dd><tt>Add&nbsp;a&nbsp;person&nbsp;to&nbsp;a&nbsp;group<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;body:&nbsp;object,&nbsp;The&nbsp;request&nbsp;body.&nbsp;(required)<br>
-&nbsp;&nbsp;personId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;person&nbsp;to&nbsp;add&nbsp;to&nbsp;the&nbsp;group.&nbsp;(required)<br>
-&nbsp;&nbsp;userId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;owner&nbsp;of&nbsp;the&nbsp;group.&nbsp;(required)<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format<br>
-&nbsp;&nbsp;groupId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;group&nbsp;to&nbsp;which&nbsp;to&nbsp;add&nbsp;the&nbsp;person.&nbsp;(required)</tt></dd></dl>
-
-<hr>
-Data descriptors defined here:<br>
-<dl><dt><strong>__dict__</strong></dt>
-<dd><tt>dictionary&nbsp;for&nbsp;instance&nbsp;variables&nbsp;(if&nbsp;defined)</tt></dd>
-</dl>
-<dl><dt><strong>__weakref__</strong></dt>
-<dd><tt>list&nbsp;of&nbsp;weak&nbsp;references&nbsp;to&nbsp;the&nbsp;object&nbsp;(if&nbsp;defined)</tt></dd>
-</dl>
-</td></tr></table>
-</body></html>
\ No newline at end of file
diff --git a/docs/dyn/buzz.v1.photoAlbums.html b/docs/dyn/buzz.v1.photoAlbums.html
deleted file mode 100644
index 4ca4ec5..0000000
--- a/docs/dyn/buzz.v1.photoAlbums.html
+++ /dev/null
@@ -1,74 +0,0 @@
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head><title>Python: class Resource</title>
-</head><body bgcolor="#f0f0f8">
-<p>
-<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
-<tr bgcolor="#ffc8d8">
-<td colspan=3 valign=bottom>&nbsp;<br>
-<font color="#000000" face="helvetica, arial"><a name="Resource">class <strong>Resource</strong></a>(<a href="__builtin__.html#object">__builtin__.object</a>)</font></td></tr>
-    
-<tr bgcolor="#ffc8d8"><td rowspan=2><tt>&nbsp;&nbsp;&nbsp;</tt></td>
-<td colspan=2><tt>A&nbsp;class&nbsp;for&nbsp;interacting&nbsp;with&nbsp;a&nbsp;resource.<br>&nbsp;</tt></td></tr>
-<tr><td>&nbsp;</td>
-<td width="100%">Methods defined here:<br>
-<dl><dt><a name="Resource-__init__"><strong>__init__</strong></a>(self)</dt></dl>
-
-<dl><dt><a name="Resource-delete"><strong>delete</strong></a> = method(self, **kwargs)</dt><dd><tt>Delete&nbsp;a&nbsp;photo&nbsp;album<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;albumId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;album&nbsp;to&nbsp;delete.&nbsp;(required)<br>
-&nbsp;&nbsp;userId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;user&nbsp;being&nbsp;referenced.&nbsp;(required)<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format</tt></dd></dl>
-
-<dl><dt><a name="Resource-get"><strong>get</strong></a> = method(self, **kwargs)</dt><dd><tt>Get&nbsp;a&nbsp;photo&nbsp;album<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;albumId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;album&nbsp;to&nbsp;get.&nbsp;(required)<br>
-&nbsp;&nbsp;userId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;user&nbsp;being&nbsp;referenced.&nbsp;(required)<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format</tt></dd></dl>
-
-<dl><dt><a name="Resource-insert"><strong>insert</strong></a> = method(self, **kwargs)</dt><dd><tt>Create&nbsp;a&nbsp;photo&nbsp;album<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;body:&nbsp;object,&nbsp;The&nbsp;request&nbsp;body.&nbsp;(required)<br>
-&nbsp;&nbsp;userId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;user&nbsp;being&nbsp;referenced.&nbsp;(required)<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format</tt></dd></dl>
-
-<dl><dt><a name="Resource-list"><strong>list</strong></a> = method(self, **kwargs)</dt><dd><tt>List&nbsp;a&nbsp;user's&nbsp;photo&nbsp;albums<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;c:&nbsp;string,&nbsp;A&nbsp;continuation&nbsp;token&nbsp;that&nbsp;allows&nbsp;pagination.<br>
-&nbsp;&nbsp;userId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;user&nbsp;being&nbsp;referenced.&nbsp;(required)<br>
-&nbsp;&nbsp;max_results:&nbsp;integer,&nbsp;Maximum&nbsp;number&nbsp;of&nbsp;results&nbsp;to&nbsp;include.<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;scope:&nbsp;string,&nbsp;The&nbsp;collection&nbsp;of&nbsp;albums&nbsp;to&nbsp;list.&nbsp;(required)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;@self&nbsp;-&nbsp;Albums&nbsp;posted&nbsp;by&nbsp;the&nbsp;user.<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format</tt></dd></dl>
-
-<hr>
-Data descriptors defined here:<br>
-<dl><dt><strong>__dict__</strong></dt>
-<dd><tt>dictionary&nbsp;for&nbsp;instance&nbsp;variables&nbsp;(if&nbsp;defined)</tt></dd>
-</dl>
-<dl><dt><strong>__weakref__</strong></dt>
-<dd><tt>list&nbsp;of&nbsp;weak&nbsp;references&nbsp;to&nbsp;the&nbsp;object&nbsp;(if&nbsp;defined)</tt></dd>
-</dl>
-</td></tr></table>
-</body></html>
\ No newline at end of file
diff --git a/docs/dyn/buzz.v1.photos.html b/docs/dyn/buzz.v1.photos.html
deleted file mode 100644
index 847cc6e..0000000
--- a/docs/dyn/buzz.v1.photos.html
+++ /dev/null
@@ -1,104 +0,0 @@
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head><title>Python: class Resource</title>
-</head><body bgcolor="#f0f0f8">
-<p>
-<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
-<tr bgcolor="#ffc8d8">
-<td colspan=3 valign=bottom>&nbsp;<br>
-<font color="#000000" face="helvetica, arial"><a name="Resource">class <strong>Resource</strong></a>(<a href="__builtin__.html#object">__builtin__.object</a>)</font></td></tr>
-    
-<tr bgcolor="#ffc8d8"><td rowspan=2><tt>&nbsp;&nbsp;&nbsp;</tt></td>
-<td colspan=2><tt>A&nbsp;class&nbsp;for&nbsp;interacting&nbsp;with&nbsp;a&nbsp;resource.<br>&nbsp;</tt></td></tr>
-<tr><td>&nbsp;</td>
-<td width="100%">Methods defined here:<br>
-<dl><dt><a name="Resource-__init__"><strong>__init__</strong></a>(self)</dt></dl>
-
-<dl><dt><a name="Resource-delete"><strong>delete</strong></a> = method(self, **kwargs)</dt><dd><tt>Delete&nbsp;a&nbsp;photo<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;photoId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;photo&nbsp;to&nbsp;delete.&nbsp;(required)<br>
-&nbsp;&nbsp;albumId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;album&nbsp;to&nbsp;which&nbsp;to&nbsp;photo&nbsp;belongs.&nbsp;(required)<br>
-&nbsp;&nbsp;userId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;user&nbsp;being&nbsp;referenced.&nbsp;(required)<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format</tt></dd></dl>
-
-<dl><dt><a name="Resource-get"><strong>get</strong></a> = method(self, **kwargs)</dt><dd><tt>Get&nbsp;photo&nbsp;metadata<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;photoId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;photo&nbsp;for&nbsp;which&nbsp;to&nbsp;get&nbsp;metadata.&nbsp;(required)<br>
-&nbsp;&nbsp;albumId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;album&nbsp;containing&nbsp;the&nbsp;photo.&nbsp;(required)<br>
-&nbsp;&nbsp;userId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;user&nbsp;being&nbsp;referenced.&nbsp;(required)<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format</tt></dd></dl>
-
-<dl><dt><a name="Resource-insert"><strong>insert</strong></a> = method(self, **kwargs)</dt><dd><tt>Upload&nbsp;a&nbsp;photo&nbsp;to&nbsp;an&nbsp;album<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;body:&nbsp;object,&nbsp;The&nbsp;request&nbsp;body.<br>
-&nbsp;&nbsp;media_body:&nbsp;string,&nbsp;The&nbsp;filename&nbsp;of&nbsp;the&nbsp;media&nbsp;request&nbsp;body.<br>
-&nbsp;&nbsp;albumId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;album&nbsp;to&nbsp;which&nbsp;to&nbsp;upload.&nbsp;(required)<br>
-&nbsp;&nbsp;userId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;user&nbsp;being&nbsp;referenced.&nbsp;(required)<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format</tt></dd></dl>
-
-<dl><dt><a name="Resource-insert2"><strong>insert2</strong></a> = method(self, **kwargs)</dt><dd><tt>Upload&nbsp;a&nbsp;photo&nbsp;to&nbsp;an&nbsp;album<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;body:&nbsp;object,&nbsp;The&nbsp;request&nbsp;body.<br>
-&nbsp;&nbsp;media_body:&nbsp;string,&nbsp;The&nbsp;filename&nbsp;of&nbsp;the&nbsp;media&nbsp;request&nbsp;body.<br>
-&nbsp;&nbsp;albumId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;album&nbsp;to&nbsp;which&nbsp;to&nbsp;upload.&nbsp;(required)<br>
-&nbsp;&nbsp;userId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;user&nbsp;being&nbsp;referenced.&nbsp;(required)<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format</tt></dd></dl>
-
-<dl><dt><a name="Resource-listByAlbum"><strong>listByAlbum</strong></a> = method(self, **kwargs)</dt><dd><tt>List&nbsp;photos&nbsp;in&nbsp;an&nbsp;album<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;c:&nbsp;string,&nbsp;A&nbsp;continuation&nbsp;token&nbsp;that&nbsp;allows&nbsp;pagination.<br>
-&nbsp;&nbsp;albumId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;album&nbsp;for&nbsp;which&nbsp;to&nbsp;list&nbsp;photos.&nbsp;(required)<br>
-&nbsp;&nbsp;userId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;user&nbsp;being&nbsp;referenced.&nbsp;(required)<br>
-&nbsp;&nbsp;max_results:&nbsp;integer,&nbsp;Maximum&nbsp;number&nbsp;of&nbsp;results&nbsp;to&nbsp;include.<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format</tt></dd></dl>
-
-<dl><dt><a name="Resource-listByScope"><strong>listByScope</strong></a> = method(self, **kwargs)</dt><dd><tt>Get&nbsp;a&nbsp;user's&nbsp;photos<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;c:&nbsp;string,&nbsp;A&nbsp;continuation&nbsp;token&nbsp;that&nbsp;allows&nbsp;pagination.<br>
-&nbsp;&nbsp;userId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;user&nbsp;being&nbsp;referenced.&nbsp;(required)<br>
-&nbsp;&nbsp;max_results:&nbsp;integer,&nbsp;Maximum&nbsp;number&nbsp;of&nbsp;results&nbsp;to&nbsp;include.<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;scope:&nbsp;string,&nbsp;The&nbsp;collection&nbsp;of&nbsp;photos&nbsp;to&nbsp;list.&nbsp;(required)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;@recent&nbsp;-&nbsp;Recent&nbsp;photos&nbsp;uploaded&nbsp;by&nbsp;the&nbsp;user.<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format</tt></dd></dl>
-
-<hr>
-Data descriptors defined here:<br>
-<dl><dt><strong>__dict__</strong></dt>
-<dd><tt>dictionary&nbsp;for&nbsp;instance&nbsp;variables&nbsp;(if&nbsp;defined)</tt></dd>
-</dl>
-<dl><dt><strong>__weakref__</strong></dt>
-<dd><tt>list&nbsp;of&nbsp;weak&nbsp;references&nbsp;to&nbsp;the&nbsp;object&nbsp;(if&nbsp;defined)</tt></dd>
-</dl>
-</td></tr></table>
-</body></html>
\ No newline at end of file
diff --git a/docs/dyn/buzz.v1.related.html b/docs/dyn/buzz.v1.related.html
deleted file mode 100644
index 258682a..0000000
--- a/docs/dyn/buzz.v1.related.html
+++ /dev/null
@@ -1,40 +0,0 @@
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head><title>Python: class Resource</title>
-</head><body bgcolor="#f0f0f8">
-<p>
-<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
-<tr bgcolor="#ffc8d8">
-<td colspan=3 valign=bottom>&nbsp;<br>
-<font color="#000000" face="helvetica, arial"><a name="Resource">class <strong>Resource</strong></a>(<a href="__builtin__.html#object">__builtin__.object</a>)</font></td></tr>
-    
-<tr bgcolor="#ffc8d8"><td rowspan=2><tt>&nbsp;&nbsp;&nbsp;</tt></td>
-<td colspan=2><tt>A&nbsp;class&nbsp;for&nbsp;interacting&nbsp;with&nbsp;a&nbsp;resource.<br>&nbsp;</tt></td></tr>
-<tr><td>&nbsp;</td>
-<td width="100%">Methods defined here:<br>
-<dl><dt><a name="Resource-__init__"><strong>__init__</strong></a>(self)</dt></dl>
-
-<dl><dt><a name="Resource-list"><strong>list</strong></a> = method(self, **kwargs)</dt><dd><tt>Get&nbsp;related&nbsp;links&nbsp;for&nbsp;an&nbsp;activity<br>
-&nbsp;<br>
-Args:<br>
-&nbsp;&nbsp;userId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;user&nbsp;being&nbsp;referenced.&nbsp;(required)<br>
-&nbsp;&nbsp;hl:&nbsp;string,&nbsp;Language&nbsp;code&nbsp;to&nbsp;limit&nbsp;language&nbsp;results.<br>
-&nbsp;&nbsp;scope:&nbsp;string,&nbsp;The&nbsp;collection&nbsp;to&nbsp;which&nbsp;the&nbsp;activity&nbsp;belongs.&nbsp;(required)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;@self&nbsp;-&nbsp;Activities&nbsp;posted&nbsp;by&nbsp;the&nbsp;user.<br>
-&nbsp;&nbsp;alt:&nbsp;string,&nbsp;Specifies&nbsp;an&nbsp;alternative&nbsp;representation&nbsp;type.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;atom&nbsp;-&nbsp;Use&nbsp;Atom&nbsp;XML&nbsp;format<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;json&nbsp;-&nbsp;Use&nbsp;JSON&nbsp;format<br>
-&nbsp;&nbsp;postId:&nbsp;string,&nbsp;ID&nbsp;of&nbsp;the&nbsp;activity&nbsp;to&nbsp;which&nbsp;to&nbsp;get&nbsp;related&nbsp;links.&nbsp;(required)</tt></dd></dl>
-
-<hr>
-Data descriptors defined here:<br>
-<dl><dt><strong>__dict__</strong></dt>
-<dd><tt>dictionary&nbsp;for&nbsp;instance&nbsp;variables&nbsp;(if&nbsp;defined)</tt></dd>
-</dl>
-<dl><dt><strong>__weakref__</strong></dt>
-<dd><tt>list&nbsp;of&nbsp;weak&nbsp;references&nbsp;to&nbsp;the&nbsp;object&nbsp;(if&nbsp;defined)</tt></dd>
-</dl>
-</td></tr></table>
-</body></html>
\ No newline at end of file
diff --git a/docs/dyn/orkut.v2.html b/docs/dyn/orkut.v2.html
index a3a1738..28ef8bc 100644
--- a/docs/dyn/orkut.v2.html
+++ b/docs/dyn/orkut.v2.html
@@ -26,6 +26,8 @@
 
 <dl><dt><a name="Resource-counters"><strong><a href="orkut.v2.counters.html">counters</a></strong></a> = methodResource(self)</dt><dd><tt>A&nbsp;collection&nbsp;resource.</tt></dd></dl>
 
+<dl><dt><a name="Resource-scraps"><strong><a href="orkut.v2.scraps.html">scraps</a></strong></a> = methodResource(self)</dt><dd><tt>A&nbsp;collection&nbsp;resource.</tt></dd></dl>
+
 <hr>
 Data descriptors defined here:<br>
 <dl><dt><strong>__dict__</strong></dt>
diff --git a/docs/dyn/orkut.v2.scraps.html b/docs/dyn/orkut.v2.scraps.html
new file mode 100644
index 0000000..15a00e7
--- /dev/null
+++ b/docs/dyn/orkut.v2.scraps.html
@@ -0,0 +1,31 @@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html><head><title>Python: class Resource</title>
+</head><body bgcolor="#f0f0f8">
+<p>
+<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
+<tr bgcolor="#ffc8d8">
+<td colspan=3 valign=bottom>&nbsp;<br>
+<font color="#000000" face="helvetica, arial"><a name="Resource">class <strong>Resource</strong></a>(<a href="__builtin__.html#object">__builtin__.object</a>)</font></td></tr>
+    
+<tr bgcolor="#ffc8d8"><td rowspan=2><tt>&nbsp;&nbsp;&nbsp;</tt></td>
+<td colspan=2><tt>A&nbsp;class&nbsp;for&nbsp;interacting&nbsp;with&nbsp;a&nbsp;resource.<br>&nbsp;</tt></td></tr>
+<tr><td>&nbsp;</td>
+<td width="100%">Methods defined here:<br>
+<dl><dt><a name="Resource-__init__"><strong>__init__</strong></a>(self)</dt></dl>
+
+<dl><dt><a name="Resource-insert"><strong>insert</strong></a> = method(self, **kwargs)</dt><dd><tt>Creates&nbsp;a&nbsp;new&nbsp;scrap.<br>
+&nbsp;<br>
+Args:<br>
+&nbsp;&nbsp;body:&nbsp;object,&nbsp;The&nbsp;request&nbsp;body.&nbsp;(required)</tt></dd></dl>
+
+<hr>
+Data descriptors defined here:<br>
+<dl><dt><strong>__dict__</strong></dt>
+<dd><tt>dictionary&nbsp;for&nbsp;instance&nbsp;variables&nbsp;(if&nbsp;defined)</tt></dd>
+</dl>
+<dl><dt><strong>__weakref__</strong></dt>
+<dd><tt>list&nbsp;of&nbsp;weak&nbsp;references&nbsp;to&nbsp;the&nbsp;object&nbsp;(if&nbsp;defined)</tt></dd>
+</dl>
+</td></tr></table>
+</body></html>
\ No newline at end of file
diff --git a/docs/dyn/plus.v1.activities.html b/docs/dyn/plus.v1.activities.html
index 8efeda3..8aa998e 100644
--- a/docs/dyn/plus.v1.activities.html
+++ b/docs/dyn/plus.v1.activities.html
@@ -52,9 +52,10 @@
 &nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;best&nbsp;-&nbsp;Sort&nbsp;activities&nbsp;by&nbsp;relevance&nbsp;to&nbsp;the&nbsp;user,&nbsp;most&nbsp;relevant&nbsp;first.<br>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;recent&nbsp;-&nbsp;Sort&nbsp;activities&nbsp;by&nbsp;published&nbsp;date,&nbsp;most&nbsp;recent&nbsp;first.<br>
+&nbsp;&nbsp;language:&nbsp;string,&nbsp;Specify&nbsp;the&nbsp;preferred&nbsp;language&nbsp;to&nbsp;search&nbsp;with.&nbsp;See&nbsp;Language&nbsp;Codes&nbsp;for&nbsp;available&nbsp;values.<br>
 &nbsp;&nbsp;pageToken:&nbsp;string,&nbsp;The&nbsp;continuation&nbsp;token,&nbsp;used&nbsp;to&nbsp;page&nbsp;through&nbsp;large&nbsp;result&nbsp;sets.&nbsp;To&nbsp;get&nbsp;the&nbsp;next&nbsp;page&nbsp;of&nbsp;results,&nbsp;set&nbsp;this&nbsp;parameter&nbsp;to&nbsp;the&nbsp;value&nbsp;of&nbsp;"nextPageToken"&nbsp;from&nbsp;the&nbsp;previous&nbsp;response.&nbsp;This&nbsp;token&nbsp;may&nbsp;be&nbsp;of&nbsp;any&nbsp;length.<br>
 &nbsp;&nbsp;maxResults:&nbsp;integer,&nbsp;The&nbsp;maximum&nbsp;number&nbsp;of&nbsp;activities&nbsp;to&nbsp;include&nbsp;in&nbsp;the&nbsp;response,&nbsp;used&nbsp;for&nbsp;paging.&nbsp;For&nbsp;any&nbsp;response,&nbsp;the&nbsp;actual&nbsp;number&nbsp;returned&nbsp;may&nbsp;be&nbsp;less&nbsp;than&nbsp;the&nbsp;specified&nbsp;maxResults.<br>
-&nbsp;&nbsp;query:&nbsp;string,&nbsp;Full-text&nbsp;search&nbsp;query&nbsp;string.</tt></dd></dl>
+&nbsp;&nbsp;query:&nbsp;string,&nbsp;Full-text&nbsp;search&nbsp;query&nbsp;string.&nbsp;(required)</tt></dd></dl>
 
 <dl><dt><a name="Resource-search_next"><strong>search_next</strong></a> = methodNext(self, previous_request, previous_response)</dt><dd><tt>Retrieves&nbsp;the&nbsp;next&nbsp;page&nbsp;of&nbsp;results.<br>
 &nbsp;<br>
diff --git a/docs/dyn/plus.v1.people.html b/docs/dyn/plus.v1.people.html
index 9627350..1c0d759 100644
--- a/docs/dyn/plus.v1.people.html
+++ b/docs/dyn/plus.v1.people.html
@@ -43,9 +43,10 @@
 <dl><dt><a name="Resource-search"><strong>search</strong></a> = method(self, **kwargs)</dt><dd><tt>Search&nbsp;all&nbsp;public&nbsp;profiles.<br>
 &nbsp;<br>
 Args:<br>
+&nbsp;&nbsp;language:&nbsp;string,&nbsp;Specify&nbsp;the&nbsp;preferred&nbsp;language&nbsp;to&nbsp;search&nbsp;with.&nbsp;See&nbsp;Language&nbsp;Codes&nbsp;for&nbsp;available&nbsp;values.<br>
 &nbsp;&nbsp;pageToken:&nbsp;string,&nbsp;The&nbsp;continuation&nbsp;token,&nbsp;used&nbsp;to&nbsp;page&nbsp;through&nbsp;large&nbsp;result&nbsp;sets.&nbsp;To&nbsp;get&nbsp;the&nbsp;next&nbsp;page&nbsp;of&nbsp;results,&nbsp;set&nbsp;this&nbsp;parameter&nbsp;to&nbsp;the&nbsp;value&nbsp;of&nbsp;"nextPageToken"&nbsp;from&nbsp;the&nbsp;previous&nbsp;response.&nbsp;This&nbsp;token&nbsp;may&nbsp;be&nbsp;of&nbsp;any&nbsp;length.<br>
 &nbsp;&nbsp;maxResults:&nbsp;integer,&nbsp;The&nbsp;maximum&nbsp;number&nbsp;of&nbsp;people&nbsp;to&nbsp;include&nbsp;in&nbsp;the&nbsp;response,&nbsp;used&nbsp;for&nbsp;paging.&nbsp;For&nbsp;any&nbsp;response,&nbsp;the&nbsp;actual&nbsp;number&nbsp;returned&nbsp;may&nbsp;be&nbsp;less&nbsp;than&nbsp;the&nbsp;specified&nbsp;maxResults.<br>
-&nbsp;&nbsp;query:&nbsp;string,&nbsp;Full-text&nbsp;search&nbsp;query&nbsp;string.</tt></dd></dl>
+&nbsp;&nbsp;query:&nbsp;string,&nbsp;Full-text&nbsp;search&nbsp;query&nbsp;string.&nbsp;(required)</tt></dd></dl>
 
 <dl><dt><a name="Resource-search_next"><strong>search_next</strong></a> = methodNext(self, previous_request, previous_response)</dt><dd><tt>Retrieves&nbsp;the&nbsp;next&nbsp;page&nbsp;of&nbsp;results.<br>
 &nbsp;<br>
diff --git a/docs/dyn/shopping.v1.products.html b/docs/dyn/shopping.v1.products.html
index 55d04f7..fd874fb 100644
--- a/docs/dyn/shopping.v1.products.html
+++ b/docs/dyn/shopping.v1.products.html
@@ -47,13 +47,11 @@
 &nbsp;&nbsp;debug_rdcRequest:&nbsp;boolean,&nbsp;Google&nbsp;Internal<br>
 &nbsp;&nbsp;taxonomy:&nbsp;string,&nbsp;Taxonomy&nbsp;name<br>
 &nbsp;&nbsp;promotions_enabled:&nbsp;boolean,&nbsp;Whether&nbsp;to&nbsp;return&nbsp;promotion&nbsp;information<br>
-&nbsp;&nbsp;shelfSpaceAds_enabled:&nbsp;boolean,&nbsp;Whether&nbsp;to&nbsp;return&nbsp;shelf&nbsp;space&nbsp;ads<br>
 &nbsp;&nbsp;debug_rdcResponse:&nbsp;boolean,&nbsp;Google&nbsp;Internal<br>
 &nbsp;&nbsp;productFields:&nbsp;string,&nbsp;Google&nbsp;Internal<br>
 &nbsp;&nbsp;channels:&nbsp;string,&nbsp;Channels&nbsp;specification<br>
 &nbsp;&nbsp;facets_discover:&nbsp;string,&nbsp;Facets&nbsp;to&nbsp;discover<br>
 &nbsp;&nbsp;startIndex:&nbsp;integer,&nbsp;Index&nbsp;(1-based)&nbsp;of&nbsp;first&nbsp;product&nbsp;to&nbsp;return<br>
-&nbsp;&nbsp;attributeFilter:&nbsp;string,&nbsp;Comma&nbsp;separated&nbsp;list&nbsp;of&nbsp;attributes&nbsp;to&nbsp;return<br>
 &nbsp;&nbsp;crowdBy:&nbsp;string,&nbsp;Crowding&nbsp;specification<br>
 &nbsp;&nbsp;spelling_enabled:&nbsp;boolean,&nbsp;Whether&nbsp;to&nbsp;return&nbsp;spelling&nbsp;suggestions<br>
 &nbsp;&nbsp;debug_enabled:&nbsp;boolean,&nbsp;Google&nbsp;Internal<br>
@@ -62,7 +60,7 @@
 &nbsp;&nbsp;useCase:&nbsp;string,&nbsp;One&nbsp;of&nbsp;CommerceSearchUseCase,&nbsp;ShoppingApiUseCase<br>
 &nbsp;&nbsp;debug_geocodeResponse:&nbsp;boolean,&nbsp;Google&nbsp;Internal<br>
 &nbsp;&nbsp;location:&nbsp;string,&nbsp;Location&nbsp;used&nbsp;to&nbsp;determine&nbsp;tax&nbsp;and&nbsp;shipping<br>
-&nbsp;&nbsp;categories_include:&nbsp;string,&nbsp;Category&nbsp;specification<br>
+&nbsp;&nbsp;maxVariants:&nbsp;integer,&nbsp;Maximum&nbsp;number&nbsp;of&nbsp;variant&nbsp;results&nbsp;to&nbsp;return&nbsp;per&nbsp;result<br>
 &nbsp;&nbsp;debug_searchRequest:&nbsp;boolean,&nbsp;Google&nbsp;Internal<br>
 &nbsp;&nbsp;relatedQueries_enabled:&nbsp;boolean,&nbsp;Whether&nbsp;to&nbsp;return&nbsp;related&nbsp;queries<br>
 &nbsp;&nbsp;facets_useGcsConfig:&nbsp;boolean,&nbsp;Whether&nbsp;to&nbsp;return&nbsp;facet&nbsp;information&nbsp;as&nbsp;configured&nbsp;in&nbsp;the&nbsp;GCS&nbsp;account<br>
@@ -71,8 +69,7 @@
 &nbsp;&nbsp;debug_enableLogging:&nbsp;boolean,&nbsp;Google&nbsp;Internal<br>
 &nbsp;&nbsp;maxResults:&nbsp;integer,&nbsp;Maximum&nbsp;number&nbsp;of&nbsp;results&nbsp;to&nbsp;return<br>
 &nbsp;&nbsp;categories_enabled:&nbsp;boolean,&nbsp;Whether&nbsp;to&nbsp;return&nbsp;category&nbsp;information<br>
-&nbsp;&nbsp;shelfSpaceAds_useGcsConfig:&nbsp;boolean,&nbsp;This&nbsp;parameter&nbsp;is&nbsp;currently&nbsp;ignored<br>
-&nbsp;&nbsp;shelfSpaceAds_maxResults:&nbsp;integer,&nbsp;The&nbsp;maximum&nbsp;number&nbsp;of&nbsp;shelf&nbsp;space&nbsp;ads&nbsp;to&nbsp;return<br>
+&nbsp;&nbsp;attributeFilter:&nbsp;string,&nbsp;Comma&nbsp;separated&nbsp;list&nbsp;of&nbsp;attributes&nbsp;to&nbsp;return<br>
 &nbsp;&nbsp;categories_useGcsConfig:&nbsp;boolean,&nbsp;This&nbsp;parameter&nbsp;is&nbsp;currently&nbsp;ignored<br>
 &nbsp;&nbsp;minAvailability:&nbsp;string,&nbsp;A&nbsp;parameter<br>
 &nbsp;&nbsp;&nbsp;&nbsp;Allowed&nbsp;values<br>
@@ -81,7 +78,7 @@
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;outOfStock&nbsp;-&nbsp;Out&nbsp;of&nbsp;stock,&nbsp;limited&nbsp;availability&nbsp;and&nbsp;in&nbsp;stock&nbsp;products&nbsp;will&nbsp;be&nbsp;returned<br>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;unknown&nbsp;-&nbsp;All&nbsp;products&nbsp;will&nbsp;be&nbsp;returned<br>
 &nbsp;&nbsp;facets_include:&nbsp;string,&nbsp;Facets&nbsp;to&nbsp;include&nbsp;(applies&nbsp;when&nbsp;useGcsConfig&nbsp;==&nbsp;false)<br>
-&nbsp;&nbsp;thumbnails:&nbsp;string,&nbsp;Image&nbsp;thumbnails&nbsp;specification<br>
+&nbsp;&nbsp;categories_include:&nbsp;string,&nbsp;Category&nbsp;specification<br>
 &nbsp;&nbsp;language:&nbsp;string,&nbsp;Language&nbsp;restriction&nbsp;(BCP&nbsp;47)<br>
 &nbsp;&nbsp;currency:&nbsp;string,&nbsp;Currency&nbsp;restriction&nbsp;(ISO&nbsp;4217)<br>
 &nbsp;&nbsp;sayt_enabled:&nbsp;boolean,&nbsp;Google&nbsp;Internal<br>
@@ -94,7 +91,8 @@
 &nbsp;&nbsp;country:&nbsp;string,&nbsp;Country&nbsp;restriction&nbsp;(ISO&nbsp;3166)<br>
 &nbsp;&nbsp;relatedQueries_useGcsConfig:&nbsp;boolean,&nbsp;This&nbsp;parameter&nbsp;is&nbsp;currently&nbsp;ignored<br>
 &nbsp;&nbsp;promotions_useGcsConfig:&nbsp;boolean,&nbsp;Whether&nbsp;to&nbsp;return&nbsp;promotion&nbsp;information&nbsp;as&nbsp;configured&nbsp;in&nbsp;the&nbsp;GCS&nbsp;account<br>
-&nbsp;&nbsp;plusOne:&nbsp;string,&nbsp;+1&nbsp;rendering&nbsp;specification.</tt></dd></dl>
+&nbsp;&nbsp;plusOne:&nbsp;string,&nbsp;+1&nbsp;rendering&nbsp;specification.<br>
+&nbsp;&nbsp;thumbnails:&nbsp;string,&nbsp;Image&nbsp;thumbnails&nbsp;specification</tt></dd></dl>
 
 <hr>
 Data descriptors defined here:<br>
diff --git a/docs/fakesettings.py b/docs/fakesettings.py
deleted file mode 100644
index 565d2e5..0000000
--- a/docs/fakesettings.py
+++ /dev/null
@@ -1,83 +0,0 @@
-# Django settings for django_sample project.
-import os
-
-DEBUG = True
-TEMPLATE_DEBUG = DEBUG
-
-ADMINS = (
-    # ('Your Name', 'your_email@domain.com'),
-)
-
-MANAGERS = ADMINS
-
-DATABASE_ENGINE = 'sqlite3'
-DATABASE_NAME = 'database.sqlite3'
-DATABASE_USER = ''
-DATABASE_PASSWORD = ''
-DATABASE_HOST = ''
-DATABASE_PORT = ''
-
-# Local time zone for this installation. Choices can be found here:
-# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
-# although not all choices may be available on all operating systems.
-# If running in a Windows environment this must be set to the same as your
-# system time zone.
-TIME_ZONE = 'America/New_York'
-
-# Language code for this installation. All choices can be found here:
-# http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'en-us'
-
-SITE_ID = 1
-
-# If you set this to False, Django will make some optimizations so as not
-# to load the internationalization machinery.
-USE_I18N = True
-
-# Absolute path to the directory that holds media.
-# Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = ''
-
-# URL that handles the media served from MEDIA_ROOT. Make sure to use a
-# trailing slash if there is a path component (optional in other cases).
-# Examples: "http://media.lawrence.com", "http://example.com/media/"
-MEDIA_URL = ''
-
-# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
-# trailing slash.
-# Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = '/media/'
-
-# Make this unique, and don't share it with anybody.
-SECRET_KEY = '_=9hq-$t_uv1ckf&s!y2$9g$1dm*6p1cl%*!^mg=7gr)!zj32d'
-
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.load_template_source',
-    'django.template.loaders.app_directories.load_template_source',
-#     'django.template.loaders.eggs.load_template_source',
-)
-
-MIDDLEWARE_CLASSES = (
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-)
-
-ROOT_URLCONF = 'django_sample.urls'
-
-TEMPLATE_DIRS = (
-    # Put strings here, like "/home/html/django_templates"
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
-    os.path.join(os.path.dirname(__file__), 'templates')
-)
-
-INSTALLED_APPS = (
-    'django.contrib.admin',
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.sites',
-    'django_sample.buzz'
-)
diff --git a/docs/oauth2client.client.html b/docs/oauth2client.client.html
index e8a5152..5a0f5d6 100644
--- a/docs/oauth2client.client.html
+++ b/docs/oauth2client.client.html
@@ -24,7 +24,7 @@
 <a href="datetime.html">datetime</a><br>
 </td><td width="25%" valign=top><a href="httplib2.html">httplib2</a><br>
 <a href="logging.html">logging</a><br>
-<a href="simplejson.html">simplejson</a><br>
+<a href="django.utils.simplejson.html">django.utils.simplejson</a><br>
 </td><td width="25%" valign=top><a href="sys.html">sys</a><br>
 <a href="urllib.html">urllib</a><br>
 <a href="urlparse.html">urlparse</a><br>
diff --git a/docs/oauth2client.clientsecrets.html b/docs/oauth2client.clientsecrets.html
index cc438e5..c4100ce 100644
--- a/docs/oauth2client.clientsecrets.html
+++ b/docs/oauth2client.clientsecrets.html
@@ -20,7 +20,7 @@
 <font color="#ffffff" face="helvetica, arial"><big><strong>Modules</strong></big></font></td></tr>
     
 <tr><td bgcolor="#aa55cc"><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt></td><td>&nbsp;</td>
-<td width="100%"><table width="100%" summary="list"><tr><td width="25%" valign=top><a href="simplejson.html">simplejson</a><br>
+<td width="100%"><table width="100%" summary="list"><tr><td width="25%" valign=top><a href="django.utils.simplejson.html">django.utils.simplejson</a><br>
 </td><td width="25%" valign=top></td><td width="25%" valign=top></td><td width="25%" valign=top></td></tr></table></td></tr></table><p>
 <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
 <tr bgcolor="#ee77aa">
diff --git a/docs/oauth2client.django_orm.html b/docs/oauth2client.django_orm.html
index 19fb474..ba85510 100644
--- a/docs/oauth2client.django_orm.html
+++ b/docs/oauth2client.django_orm.html
@@ -8,7 +8,7 @@
 <td valign=bottom>&nbsp;<br>
 <font color="#ffffff" face="helvetica, arial">&nbsp;<br><big><big><strong><a href="oauth2client.html"><font color="#ffffff">oauth2client</font></a>.django_orm</strong></big></big></font></td
 ><td align=right valign=bottom
-><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/usr/local/google/home/jcgregorio/projects/apiclient/oauth2client/django_orm.py">/usr/local/google/home/jcgregorio/projects/apiclient/oauth2client/django_orm.py</a></font></td></tr></table>
+><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/usr/local/google/home/jcgregorio/projects/apiclient-release/oauth2client/django_orm.py">/usr/local/google/home/jcgregorio/projects/apiclient-release/oauth2client/django_orm.py</a></font></td></tr></table>
     <p><tt>OAuth&nbsp;2.0&nbsp;utilities&nbsp;for&nbsp;Django.<br>
 &nbsp;<br>
 Utilities&nbsp;for&nbsp;using&nbsp;OAuth&nbsp;2.0&nbsp;in&nbsp;conjunction&nbsp;with<br>
@@ -62,9 +62,15 @@
 Methods defined here:<br>
 <dl><dt><a name="CredentialsField-contribute_to_class"><strong>contribute_to_class</strong></a>(self, cls, name)</dt></dl>
 
-<dl><dt><a name="CredentialsField-db_type"><strong>db_type</strong></a>(self, connection<font color="#909090">=None</font>)</dt></dl>
+<dl><dt><a name="CredentialsField-db_type"><strong>db_type</strong></a> = inner(*args, **kwargs)</dt></dl>
 
-<dl><dt><a name="CredentialsField-get_db_prep_value"><strong>get_db_prep_value</strong></a>(self, value)</dt></dl>
+<dl><dt><a name="CredentialsField-get_db_prep_lookup"><strong>get_db_prep_lookup</strong></a> = inner(*args, **kwargs)</dt></dl>
+
+<dl><dt><a name="CredentialsField-get_db_prep_save"><strong>get_db_prep_save</strong></a> = inner(*args, **kwargs)</dt></dl>
+
+<dl><dt><a name="CredentialsField-get_db_prep_value"><strong>get_db_prep_value</strong></a> = inner(*args, **kwargs)</dt></dl>
+
+<dl><dt><a name="CredentialsField-get_internal_type"><strong>get_internal_type</strong></a>(self)</dt></dl>
 
 <dl><dt><a name="CredentialsField-to_python"><strong>to_python</strong></a>(self, value)</dt></dl>
 
@@ -79,10 +85,14 @@
 
 <dl><dt><a name="CredentialsField-__deepcopy__"><strong>__deepcopy__</strong></a>(self, memodict)</dt></dl>
 
-<dl><dt><a name="CredentialsField-__init__"><strong>__init__</strong></a>(self, verbose_name<font color="#909090">=None</font>, name<font color="#909090">=None</font>, primary_key<font color="#909090">=False</font>, max_length<font color="#909090">=None</font>, unique<font color="#909090">=False</font>, blank<font color="#909090">=False</font>, null<font color="#909090">=False</font>, db_index<font color="#909090">=False</font>, rel<font color="#909090">=None</font>, default<font color="#909090">=&lt;class django.db.models.fields.NOT_PROVIDED&gt;</font>, editable<font color="#909090">=True</font>, serialize<font color="#909090">=True</font>, unique_for_date<font color="#909090">=None</font>, unique_for_month<font color="#909090">=None</font>, unique_for_year<font color="#909090">=None</font>, choices<font color="#909090">=None</font>, help_text<font color="#909090">=''</font>, db_column<font color="#909090">=None</font>, db_tablespace<font color="#909090">=None</font>, auto_created<font color="#909090">=False</font>)</dt></dl>
+<dl><dt><a name="CredentialsField-__init__"><strong>__init__</strong></a>(self, verbose_name<font color="#909090">=None</font>, name<font color="#909090">=None</font>, primary_key<font color="#909090">=False</font>, max_length<font color="#909090">=None</font>, unique<font color="#909090">=False</font>, blank<font color="#909090">=False</font>, null<font color="#909090">=False</font>, db_index<font color="#909090">=False</font>, rel<font color="#909090">=None</font>, default<font color="#909090">=&lt;class django.db.models.fields.NOT_PROVIDED&gt;</font>, editable<font color="#909090">=True</font>, serialize<font color="#909090">=True</font>, unique_for_date<font color="#909090">=None</font>, unique_for_month<font color="#909090">=None</font>, unique_for_year<font color="#909090">=None</font>, choices<font color="#909090">=None</font>, help_text<font color="#909090">=''</font>, db_column<font color="#909090">=None</font>, db_tablespace<font color="#909090">=None</font>, auto_created<font color="#909090">=False</font>, validators<font color="#909090">=[]</font>, error_messages<font color="#909090">=None</font>)</dt></dl>
 
 <dl><dt><a name="CredentialsField-bind"><strong>bind</strong></a>(self, fieldmapping, original, bound_field_class)</dt></dl>
 
+<dl><dt><a name="CredentialsField-clean"><strong>clean</strong></a>(self, value, model_instance)</dt><dd><tt>Convert&nbsp;the&nbsp;value's&nbsp;type&nbsp;and&nbsp;run&nbsp;validation.&nbsp;Validation&nbsp;errors&nbsp;from&nbsp;to_python<br>
+and&nbsp;validate&nbsp;are&nbsp;propagated.&nbsp;The&nbsp;correct&nbsp;value&nbsp;is&nbsp;returned&nbsp;if&nbsp;no&nbsp;error&nbsp;is<br>
+raised.</tt></dd></dl>
+
 <dl><dt><a name="CredentialsField-formfield"><strong>formfield</strong></a>(self, form_class<font color="#909090">=&lt;class 'django.forms.fields.CharField'&gt;</font>, **kwargs)</dt><dd><tt>Returns&nbsp;a&nbsp;django.forms.<a href="django.db.models.fields.html#Field">Field</a>&nbsp;instance&nbsp;for&nbsp;this&nbsp;database&nbsp;<a href="django.db.models.fields.html#Field">Field</a>.</tt></dd></dl>
 
 <dl><dt><a name="CredentialsField-get_attname"><strong>get_attname</strong></a>(self)</dt></dl>
@@ -96,15 +106,13 @@
 
 <dl><dt><a name="CredentialsField-get_choices_default"><strong>get_choices_default</strong></a>(self)</dt></dl>
 
-<dl><dt><a name="CredentialsField-get_db_prep_lookup"><strong>get_db_prep_lookup</strong></a>(self, lookup_type, value)</dt><dd><tt>Returns&nbsp;field's&nbsp;value&nbsp;prepared&nbsp;for&nbsp;database&nbsp;lookup.</tt></dd></dl>
-
-<dl><dt><a name="CredentialsField-get_db_prep_save"><strong>get_db_prep_save</strong></a>(self, value)</dt><dd><tt>Returns&nbsp;field's&nbsp;value&nbsp;prepared&nbsp;for&nbsp;saving&nbsp;into&nbsp;a&nbsp;database.</tt></dd></dl>
-
 <dl><dt><a name="CredentialsField-get_default"><strong>get_default</strong></a>(self)</dt><dd><tt>Returns&nbsp;the&nbsp;default&nbsp;value&nbsp;for&nbsp;this&nbsp;field.</tt></dd></dl>
 
 <dl><dt><a name="CredentialsField-get_flatchoices"><strong>get_flatchoices</strong></a>(self, include_blank<font color="#909090">=True</font>, blank_choice<font color="#909090">=[('', '---------')]</font>)</dt><dd><tt>Returns&nbsp;flattened&nbsp;choices&nbsp;with&nbsp;a&nbsp;default&nbsp;blank&nbsp;choice&nbsp;included.</tt></dd></dl>
 
-<dl><dt><a name="CredentialsField-get_internal_type"><strong>get_internal_type</strong></a>(self)</dt></dl>
+<dl><dt><a name="CredentialsField-get_prep_lookup"><strong>get_prep_lookup</strong></a>(self, lookup_type, value)</dt><dd><tt>Perform&nbsp;preliminary&nbsp;non-db&nbsp;specific&nbsp;lookup&nbsp;checks&nbsp;and&nbsp;conversions</tt></dd></dl>
+
+<dl><dt><a name="CredentialsField-get_prep_value"><strong>get_prep_value</strong></a>(self, value)</dt><dd><tt>Perform&nbsp;preliminary&nbsp;non-db&nbsp;specific&nbsp;value&nbsp;checks&nbsp;and&nbsp;conversions.</tt></dd></dl>
 
 <dl><dt><a name="CredentialsField-get_validator_unique_lookup_type"><strong>get_validator_unique_lookup_type</strong></a>(self)</dt></dl>
 
@@ -112,10 +120,15 @@
 
 <dl><dt><a name="CredentialsField-pre_save"><strong>pre_save</strong></a>(self, model_instance, add)</dt><dd><tt>Returns&nbsp;field's&nbsp;value&nbsp;just&nbsp;before&nbsp;saving.</tt></dd></dl>
 
+<dl><dt><a name="CredentialsField-run_validators"><strong>run_validators</strong></a>(self, value)</dt></dl>
+
 <dl><dt><a name="CredentialsField-save_form_data"><strong>save_form_data</strong></a>(self, instance, data)</dt></dl>
 
 <dl><dt><a name="CredentialsField-set_attributes_from_name"><strong>set_attributes_from_name</strong></a>(self, name)</dt></dl>
 
+<dl><dt><a name="CredentialsField-validate"><strong>validate</strong></a>(self, value, model_instance)</dt><dd><tt>Validates&nbsp;value&nbsp;and&nbsp;throws&nbsp;ValidationError.&nbsp;Subclasses&nbsp;should&nbsp;override<br>
+this&nbsp;to&nbsp;provide&nbsp;validation&nbsp;logic.</tt></dd></dl>
+
 <dl><dt><a name="CredentialsField-value_from_object"><strong>value_from_object</strong></a>(self, obj)</dt><dd><tt>Returns&nbsp;the&nbsp;value&nbsp;of&nbsp;this&nbsp;field&nbsp;in&nbsp;the&nbsp;given&nbsp;model&nbsp;instance.</tt></dd></dl>
 
 <dl><dt><a name="CredentialsField-value_to_string"><strong>value_to_string</strong></a>(self, obj)</dt><dd><tt>Returns&nbsp;a&nbsp;string&nbsp;value&nbsp;of&nbsp;this&nbsp;field&nbsp;from&nbsp;the&nbsp;passed&nbsp;obj.<br>
@@ -131,6 +144,8 @@
 </dl>
 <dl><dt><strong>choices</strong></dt>
 </dl>
+<dl><dt><strong>description</strong></dt>
+</dl>
 <dl><dt><strong>flatchoices</strong></dt>
 <dd><tt>Flattened&nbsp;version&nbsp;of&nbsp;choices&nbsp;tuple.</tt></dd>
 </dl>
@@ -142,6 +157,10 @@
 
 <dl><dt><strong>creation_counter</strong> = 0</dl>
 
+<dl><dt><strong>default_error_messages</strong> = {'blank': &lt;django.utils.functional.__proxy__ object&gt;, 'invalid_choice': &lt;django.utils.functional.__proxy__ object&gt;, 'null': &lt;django.utils.functional.__proxy__ object&gt;}</dl>
+
+<dl><dt><strong>default_validators</strong> = []</dl>
+
 <dl><dt><strong>empty_strings_allowed</strong> = True</dl>
 
 </td></tr></table> <p>
@@ -160,9 +179,15 @@
 Methods defined here:<br>
 <dl><dt><a name="FlowField-contribute_to_class"><strong>contribute_to_class</strong></a>(self, cls, name)</dt></dl>
 
-<dl><dt><a name="FlowField-db_type"><strong>db_type</strong></a>(self, connection<font color="#909090">=None</font>)</dt></dl>
+<dl><dt><a name="FlowField-db_type"><strong>db_type</strong></a> = inner(*args, **kwargs)</dt></dl>
 
-<dl><dt><a name="FlowField-get_db_prep_value"><strong>get_db_prep_value</strong></a>(self, value)</dt></dl>
+<dl><dt><a name="FlowField-get_db_prep_lookup"><strong>get_db_prep_lookup</strong></a> = inner(*args, **kwargs)</dt></dl>
+
+<dl><dt><a name="FlowField-get_db_prep_save"><strong>get_db_prep_save</strong></a> = inner(*args, **kwargs)</dt></dl>
+
+<dl><dt><a name="FlowField-get_db_prep_value"><strong>get_db_prep_value</strong></a> = inner(*args, **kwargs)</dt></dl>
+
+<dl><dt><a name="FlowField-get_internal_type"><strong>get_internal_type</strong></a>(self)</dt></dl>
 
 <dl><dt><a name="FlowField-to_python"><strong>to_python</strong></a>(self, value)</dt></dl>
 
@@ -177,10 +202,14 @@
 
 <dl><dt><a name="FlowField-__deepcopy__"><strong>__deepcopy__</strong></a>(self, memodict)</dt></dl>
 
-<dl><dt><a name="FlowField-__init__"><strong>__init__</strong></a>(self, verbose_name<font color="#909090">=None</font>, name<font color="#909090">=None</font>, primary_key<font color="#909090">=False</font>, max_length<font color="#909090">=None</font>, unique<font color="#909090">=False</font>, blank<font color="#909090">=False</font>, null<font color="#909090">=False</font>, db_index<font color="#909090">=False</font>, rel<font color="#909090">=None</font>, default<font color="#909090">=&lt;class django.db.models.fields.NOT_PROVIDED&gt;</font>, editable<font color="#909090">=True</font>, serialize<font color="#909090">=True</font>, unique_for_date<font color="#909090">=None</font>, unique_for_month<font color="#909090">=None</font>, unique_for_year<font color="#909090">=None</font>, choices<font color="#909090">=None</font>, help_text<font color="#909090">=''</font>, db_column<font color="#909090">=None</font>, db_tablespace<font color="#909090">=None</font>, auto_created<font color="#909090">=False</font>)</dt></dl>
+<dl><dt><a name="FlowField-__init__"><strong>__init__</strong></a>(self, verbose_name<font color="#909090">=None</font>, name<font color="#909090">=None</font>, primary_key<font color="#909090">=False</font>, max_length<font color="#909090">=None</font>, unique<font color="#909090">=False</font>, blank<font color="#909090">=False</font>, null<font color="#909090">=False</font>, db_index<font color="#909090">=False</font>, rel<font color="#909090">=None</font>, default<font color="#909090">=&lt;class django.db.models.fields.NOT_PROVIDED&gt;</font>, editable<font color="#909090">=True</font>, serialize<font color="#909090">=True</font>, unique_for_date<font color="#909090">=None</font>, unique_for_month<font color="#909090">=None</font>, unique_for_year<font color="#909090">=None</font>, choices<font color="#909090">=None</font>, help_text<font color="#909090">=''</font>, db_column<font color="#909090">=None</font>, db_tablespace<font color="#909090">=None</font>, auto_created<font color="#909090">=False</font>, validators<font color="#909090">=[]</font>, error_messages<font color="#909090">=None</font>)</dt></dl>
 
 <dl><dt><a name="FlowField-bind"><strong>bind</strong></a>(self, fieldmapping, original, bound_field_class)</dt></dl>
 
+<dl><dt><a name="FlowField-clean"><strong>clean</strong></a>(self, value, model_instance)</dt><dd><tt>Convert&nbsp;the&nbsp;value's&nbsp;type&nbsp;and&nbsp;run&nbsp;validation.&nbsp;Validation&nbsp;errors&nbsp;from&nbsp;to_python<br>
+and&nbsp;validate&nbsp;are&nbsp;propagated.&nbsp;The&nbsp;correct&nbsp;value&nbsp;is&nbsp;returned&nbsp;if&nbsp;no&nbsp;error&nbsp;is<br>
+raised.</tt></dd></dl>
+
 <dl><dt><a name="FlowField-formfield"><strong>formfield</strong></a>(self, form_class<font color="#909090">=&lt;class 'django.forms.fields.CharField'&gt;</font>, **kwargs)</dt><dd><tt>Returns&nbsp;a&nbsp;django.forms.<a href="django.db.models.fields.html#Field">Field</a>&nbsp;instance&nbsp;for&nbsp;this&nbsp;database&nbsp;<a href="django.db.models.fields.html#Field">Field</a>.</tt></dd></dl>
 
 <dl><dt><a name="FlowField-get_attname"><strong>get_attname</strong></a>(self)</dt></dl>
@@ -194,15 +223,13 @@
 
 <dl><dt><a name="FlowField-get_choices_default"><strong>get_choices_default</strong></a>(self)</dt></dl>
 
-<dl><dt><a name="FlowField-get_db_prep_lookup"><strong>get_db_prep_lookup</strong></a>(self, lookup_type, value)</dt><dd><tt>Returns&nbsp;field's&nbsp;value&nbsp;prepared&nbsp;for&nbsp;database&nbsp;lookup.</tt></dd></dl>
-
-<dl><dt><a name="FlowField-get_db_prep_save"><strong>get_db_prep_save</strong></a>(self, value)</dt><dd><tt>Returns&nbsp;field's&nbsp;value&nbsp;prepared&nbsp;for&nbsp;saving&nbsp;into&nbsp;a&nbsp;database.</tt></dd></dl>
-
 <dl><dt><a name="FlowField-get_default"><strong>get_default</strong></a>(self)</dt><dd><tt>Returns&nbsp;the&nbsp;default&nbsp;value&nbsp;for&nbsp;this&nbsp;field.</tt></dd></dl>
 
 <dl><dt><a name="FlowField-get_flatchoices"><strong>get_flatchoices</strong></a>(self, include_blank<font color="#909090">=True</font>, blank_choice<font color="#909090">=[('', '---------')]</font>)</dt><dd><tt>Returns&nbsp;flattened&nbsp;choices&nbsp;with&nbsp;a&nbsp;default&nbsp;blank&nbsp;choice&nbsp;included.</tt></dd></dl>
 
-<dl><dt><a name="FlowField-get_internal_type"><strong>get_internal_type</strong></a>(self)</dt></dl>
+<dl><dt><a name="FlowField-get_prep_lookup"><strong>get_prep_lookup</strong></a>(self, lookup_type, value)</dt><dd><tt>Perform&nbsp;preliminary&nbsp;non-db&nbsp;specific&nbsp;lookup&nbsp;checks&nbsp;and&nbsp;conversions</tt></dd></dl>
+
+<dl><dt><a name="FlowField-get_prep_value"><strong>get_prep_value</strong></a>(self, value)</dt><dd><tt>Perform&nbsp;preliminary&nbsp;non-db&nbsp;specific&nbsp;value&nbsp;checks&nbsp;and&nbsp;conversions.</tt></dd></dl>
 
 <dl><dt><a name="FlowField-get_validator_unique_lookup_type"><strong>get_validator_unique_lookup_type</strong></a>(self)</dt></dl>
 
@@ -210,10 +237,15 @@
 
 <dl><dt><a name="FlowField-pre_save"><strong>pre_save</strong></a>(self, model_instance, add)</dt><dd><tt>Returns&nbsp;field's&nbsp;value&nbsp;just&nbsp;before&nbsp;saving.</tt></dd></dl>
 
+<dl><dt><a name="FlowField-run_validators"><strong>run_validators</strong></a>(self, value)</dt></dl>
+
 <dl><dt><a name="FlowField-save_form_data"><strong>save_form_data</strong></a>(self, instance, data)</dt></dl>
 
 <dl><dt><a name="FlowField-set_attributes_from_name"><strong>set_attributes_from_name</strong></a>(self, name)</dt></dl>
 
+<dl><dt><a name="FlowField-validate"><strong>validate</strong></a>(self, value, model_instance)</dt><dd><tt>Validates&nbsp;value&nbsp;and&nbsp;throws&nbsp;ValidationError.&nbsp;Subclasses&nbsp;should&nbsp;override<br>
+this&nbsp;to&nbsp;provide&nbsp;validation&nbsp;logic.</tt></dd></dl>
+
 <dl><dt><a name="FlowField-value_from_object"><strong>value_from_object</strong></a>(self, obj)</dt><dd><tt>Returns&nbsp;the&nbsp;value&nbsp;of&nbsp;this&nbsp;field&nbsp;in&nbsp;the&nbsp;given&nbsp;model&nbsp;instance.</tt></dd></dl>
 
 <dl><dt><a name="FlowField-value_to_string"><strong>value_to_string</strong></a>(self, obj)</dt><dd><tt>Returns&nbsp;a&nbsp;string&nbsp;value&nbsp;of&nbsp;this&nbsp;field&nbsp;from&nbsp;the&nbsp;passed&nbsp;obj.<br>
@@ -229,6 +261,8 @@
 </dl>
 <dl><dt><strong>choices</strong></dt>
 </dl>
+<dl><dt><strong>description</strong></dt>
+</dl>
 <dl><dt><strong>flatchoices</strong></dt>
 <dd><tt>Flattened&nbsp;version&nbsp;of&nbsp;choices&nbsp;tuple.</tt></dd>
 </dl>
@@ -240,6 +274,10 @@
 
 <dl><dt><strong>creation_counter</strong> = 0</dl>
 
+<dl><dt><strong>default_error_messages</strong> = {'blank': &lt;django.utils.functional.__proxy__ object&gt;, 'invalid_choice': &lt;django.utils.functional.__proxy__ object&gt;, 'null': &lt;django.utils.functional.__proxy__ object&gt;}</dl>
+
+<dl><dt><strong>default_validators</strong> = []</dl>
+
 <dl><dt><strong>empty_strings_allowed</strong> = True</dl>
 
 </td></tr></table> <p>
@@ -271,12 +309,12 @@
 &nbsp;&nbsp;key_value:&nbsp;string,&nbsp;key&nbsp;value&nbsp;for&nbsp;the&nbsp;entity&nbsp;that&nbsp;has&nbsp;the&nbsp;credentials<br>
 &nbsp;&nbsp;property_name:&nbsp;string,&nbsp;name&nbsp;of&nbsp;the&nbsp;property&nbsp;that&nbsp;is&nbsp;an&nbsp;CredentialsProperty</tt></dd></dl>
 
-<dl><dt><a name="Storage-get"><strong>get</strong></a>(self)</dt><dd><tt>Retrieve&nbsp;Credential&nbsp;from&nbsp;datastore.<br>
+<dl><dt><a name="Storage-locked_get"><strong>locked_get</strong></a>(self)</dt><dd><tt>Retrieve&nbsp;Credential&nbsp;from&nbsp;datastore.<br>
 &nbsp;<br>
 Returns:<br>
 &nbsp;&nbsp;oauth2client.Credentials</tt></dd></dl>
 
-<dl><dt><a name="Storage-put"><strong>put</strong></a>(self, credentials)</dt><dd><tt>Write&nbsp;a&nbsp;Credentials&nbsp;to&nbsp;the&nbsp;datastore.<br>
+<dl><dt><a name="Storage-locked_put"><strong>locked_put</strong></a>(self, credentials)</dt><dd><tt>Write&nbsp;a&nbsp;Credentials&nbsp;to&nbsp;the&nbsp;datastore.<br>
 &nbsp;<br>
 Args:<br>
 &nbsp;&nbsp;credentials:&nbsp;Credentials,&nbsp;the&nbsp;credentials&nbsp;to&nbsp;store.</tt></dd></dl>
@@ -287,14 +325,14 @@
 &nbsp;<br>
 This&nbsp;lock&nbsp;is&nbsp;not&nbsp;reentrant.</tt></dd></dl>
 
-<dl><dt><a name="Storage-locked_get"><strong>locked_get</strong></a>(self)</dt><dd><tt>Retrieve&nbsp;credential.<br>
+<dl><dt><a name="Storage-get"><strong>get</strong></a>(self)</dt><dd><tt>Retrieve&nbsp;credential.<br>
 &nbsp;<br>
-The&nbsp;<a href="#Storage">Storage</a>&nbsp;lock&nbsp;must&nbsp;be&nbsp;held&nbsp;when&nbsp;this&nbsp;is&nbsp;called.<br>
+The&nbsp;<a href="#Storage">Storage</a>&nbsp;lock&nbsp;must&nbsp;*not*&nbsp;be&nbsp;held&nbsp;when&nbsp;this&nbsp;is&nbsp;called.<br>
 &nbsp;<br>
 Returns:<br>
 &nbsp;&nbsp;oauth2client.client.Credentials</tt></dd></dl>
 
-<dl><dt><a name="Storage-locked_put"><strong>locked_put</strong></a>(self, credentials)</dt><dd><tt>Write&nbsp;a&nbsp;credential.<br>
+<dl><dt><a name="Storage-put"><strong>put</strong></a>(self, credentials)</dt><dd><tt>Write&nbsp;a&nbsp;credential.<br>
 &nbsp;<br>
 The&nbsp;<a href="#Storage">Storage</a>&nbsp;lock&nbsp;must&nbsp;be&nbsp;held&nbsp;when&nbsp;this&nbsp;is&nbsp;called.<br>
 &nbsp;<br>
diff --git a/docs/oauth2client.file.html b/docs/oauth2client.file.html
index 4a5bd55..6ca5460 100644
--- a/docs/oauth2client.file.html
+++ b/docs/oauth2client.file.html
@@ -20,7 +20,7 @@
 <font color="#ffffff" face="helvetica, arial"><big><strong>Modules</strong></big></font></td></tr>
     
 <tr><td bgcolor="#aa55cc"><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt></td><td>&nbsp;</td>
-<td width="100%"><table width="100%" summary="list"><tr><td width="25%" valign=top><a href="simplejson.html">simplejson</a><br>
+<td width="100%"><table width="100%" summary="list"><tr><td width="25%" valign=top><a href="django.utils.simplejson.html">django.utils.simplejson</a><br>
 </td><td width="25%" valign=top><a href="threading.html">threading</a><br>
 </td><td width="25%" valign=top></td><td width="25%" valign=top></td></tr></table></td></tr></table><p>
 <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
diff --git a/docs/oauth2client.multistore_file.html b/docs/oauth2client.multistore_file.html
index 4cfcf47..468d904 100644
--- a/docs/oauth2client.multistore_file.html
+++ b/docs/oauth2client.multistore_file.html
@@ -47,7 +47,7 @@
 <a href="fcntl.html">fcntl</a><br>
 </td><td width="25%" valign=top><a href="logging.html">logging</a><br>
 <a href="os.html">os</a><br>
-</td><td width="25%" valign=top><a href="simplejson.html">simplejson</a><br>
+</td><td width="25%" valign=top><a href="django.utils.simplejson.html">django.utils.simplejson</a><br>
 <a href="threading.html">threading</a><br>
 </td><td width="25%" valign=top></td></tr></table></td></tr></table><p>
 <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
diff --git a/oauth2client/appengine.py b/oauth2client/appengine.py
index 1bc2aaa..db7817a 100644
--- a/oauth2client/appengine.py
+++ b/oauth2client/appengine.py
@@ -289,7 +289,7 @@
     decorator = OAuth2Decorator(
         client_id='837...ent.com',
         client_secret='Qh...wwI',
-        scope='https://www.googleapis.com/auth/buzz')
+        scope='https://www.googleapis.com/auth/plus')
 
 
     class MainHandler(webapp.RequestHandler):
@@ -446,7 +446,7 @@
 
     decorator = OAuth2DecoratorFromClientSecrets(
       os.path.join(os.path.dirname(__file__), 'client_secrets.json')
-      scope='https://www.googleapis.com/auth/buzz')
+      scope='https://www.googleapis.com/auth/plus')
 
 
     class MainHandler(webapp.RequestHandler):
diff --git a/samples/appengine/apiclient b/samples/appengine/apiclient
deleted file mode 120000
index 22e4c9c..0000000
--- a/samples/appengine/apiclient
+++ /dev/null
@@ -1 +0,0 @@
-../../apiclient/
\ No newline at end of file
diff --git a/samples/appengine/gflags.py b/samples/appengine/gflags.py
deleted file mode 120000
index 5a2ff94..0000000
--- a/samples/appengine/gflags.py
+++ /dev/null
@@ -1 +0,0 @@
-../../gflags.py
\ No newline at end of file
diff --git a/samples/appengine/gflags_validators.py b/samples/appengine/gflags_validators.py
deleted file mode 120000
index 25d8ce8..0000000
--- a/samples/appengine/gflags_validators.py
+++ /dev/null
@@ -1 +0,0 @@
-../../gflags_validators.py
\ No newline at end of file
diff --git a/samples/appengine/httplib2 b/samples/appengine/httplib2
deleted file mode 120000
index 488ae9f..0000000
--- a/samples/appengine/httplib2
+++ /dev/null
@@ -1 +0,0 @@
-../../httplib2/
\ No newline at end of file
diff --git a/samples/appengine/oauth2 b/samples/appengine/oauth2
deleted file mode 120000
index af104cc..0000000
--- a/samples/appengine/oauth2
+++ /dev/null
@@ -1 +0,0 @@
-../../oauth2
\ No newline at end of file
diff --git a/samples/appengine/oauth2client b/samples/appengine/oauth2client
deleted file mode 120000
index 9013119..0000000
--- a/samples/appengine/oauth2client
+++ /dev/null
@@ -1 +0,0 @@
-../../oauth2client/
\ No newline at end of file
diff --git a/samples/appengine/uritemplate b/samples/appengine/uritemplate
deleted file mode 120000
index ce92dcb..0000000
--- a/samples/appengine/uritemplate
+++ /dev/null
@@ -1 +0,0 @@
-../../uritemplate/
\ No newline at end of file
diff --git a/samples/appengine_with_robots/apiclient b/samples/appengine_with_robots/apiclient
deleted file mode 120000
index 24fe0bc..0000000
--- a/samples/appengine_with_robots/apiclient
+++ /dev/null
@@ -1 +0,0 @@
-../appengine/apiclient
\ No newline at end of file
diff --git a/samples/appengine_with_robots/gflags.py b/samples/appengine_with_robots/gflags.py
deleted file mode 120000
index 5a2ff94..0000000
--- a/samples/appengine_with_robots/gflags.py
+++ /dev/null
@@ -1 +0,0 @@
-../../gflags.py
\ No newline at end of file
diff --git a/samples/appengine_with_robots/gflags_validators.py b/samples/appengine_with_robots/gflags_validators.py
deleted file mode 120000
index 25d8ce8..0000000
--- a/samples/appengine_with_robots/gflags_validators.py
+++ /dev/null
@@ -1 +0,0 @@
-../../gflags_validators.py
\ No newline at end of file
diff --git a/samples/appengine_with_robots/httplib2 b/samples/appengine_with_robots/httplib2
deleted file mode 120000
index 4cd2774..0000000
--- a/samples/appengine_with_robots/httplib2
+++ /dev/null
@@ -1 +0,0 @@
-../appengine/httplib2
\ No newline at end of file
diff --git a/samples/appengine_with_robots/oauth2 b/samples/appengine_with_robots/oauth2
deleted file mode 120000
index ee61c25..0000000
--- a/samples/appengine_with_robots/oauth2
+++ /dev/null
@@ -1 +0,0 @@
-../appengine/oauth2
\ No newline at end of file
diff --git a/samples/appengine_with_robots/oauth2client b/samples/appengine_with_robots/oauth2client
deleted file mode 120000
index 9013119..0000000
--- a/samples/appengine_with_robots/oauth2client
+++ /dev/null
@@ -1 +0,0 @@
-../../oauth2client/
\ No newline at end of file
diff --git a/samples/appengine_with_robots/uritemplate b/samples/appengine_with_robots/uritemplate
deleted file mode 120000
index 1c98e41..0000000
--- a/samples/appengine_with_robots/uritemplate
+++ /dev/null
@@ -1 +0,0 @@
-../appengine/uritemplate
\ No newline at end of file
diff --git a/samples/django_sample/buzz/__init__.py b/samples/django_sample/plus/__init__.py
similarity index 100%
rename from samples/django_sample/buzz/__init__.py
rename to samples/django_sample/plus/__init__.py
diff --git a/samples/django_sample/buzz/models.py b/samples/django_sample/plus/models.py
similarity index 100%
rename from samples/django_sample/buzz/models.py
rename to samples/django_sample/plus/models.py
diff --git a/samples/django_sample/buzz/tests.py b/samples/django_sample/plus/tests.py
similarity index 100%
rename from samples/django_sample/buzz/tests.py
rename to samples/django_sample/plus/tests.py
diff --git a/samples/django_sample/buzz/views.py b/samples/django_sample/plus/views.py
similarity index 70%
rename from samples/django_sample/buzz/views.py
rename to samples/django_sample/plus/views.py
index c942aaf..8cc5838 100644
--- a/samples/django_sample/buzz/views.py
+++ b/samples/django_sample/plus/views.py
@@ -8,14 +8,14 @@
 
 from oauth2client.django_orm import Storage
 from oauth2client.client import OAuth2WebServerFlow
-from django_sample.buzz.models import CredentialsModel
-from django_sample.buzz.models import FlowModel
+from django_sample.plus.models import CredentialsModel
+from django_sample.plus.models import FlowModel
 from apiclient.discovery import build
 
 from django.http import HttpResponseRedirect
 from django.shortcuts import render_to_response
 
-STEP2_URI = 'http://localhost:8000/auth_return'
+STEP2_URI = 'http://localhost:8000/oauth2callback'
 
 
 @login_required
@@ -24,10 +24,10 @@
   credential = storage.get()
   if credential is None or credential.invalid == True:
     flow = OAuth2WebServerFlow(
-        client_id='837647042410.apps.googleusercontent.com',
-        client_secret='+SWwMCL9d8gWtzPRa1lXw5R8',
-        scope='https://www.googleapis.com/auth/buzz',
-        user_agent='buzz-django-sample/1.0',
+        client_id='[[Insert Client ID here.]]',
+        client_secret='[[Insert Client Secret here.]]',
+        scope='https://www.googleapis.com/auth/plus.me',
+        user_agent='plus-django-sample/1.0',
         )
 
     authorize_url = flow.step1_get_authorize_url(STEP2_URI)
@@ -37,13 +37,13 @@
   else:
     http = httplib2.Http()
     http = credential.authorize(http)
-    service = build("buzz", "v1", http=http)
+    service = build("plus", "v1", http=http)
     activities = service.activities()
-    activitylist = activities.list(scope='@consumption',
-                                   userId='@me').execute()
+    activitylist = activities.list(collection='public',
+                                   userId='me').execute()
     logging.info(activitylist)
 
-    return render_to_response('buzz/welcome.html', {
+    return render_to_response('plus/welcome.html', {
                 'activitylist': activitylist,
                 })
 
diff --git a/samples/django_sample/settings.py b/samples/django_sample/settings.py
index d0d7c7e..df10f0a 100644
--- a/samples/django_sample/settings.py
+++ b/samples/django_sample/settings.py
@@ -80,5 +80,5 @@
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.sites',
-    'django_sample.buzz'
+    'django_sample.plus'
 )
diff --git a/samples/django_sample/templates/buzz/welcome.html b/samples/django_sample/templates/buzz/welcome.html
deleted file mode 100644
index 07e8027..0000000
--- a/samples/django_sample/templates/buzz/welcome.html
+++ /dev/null
@@ -1,33 +0,0 @@
-
-<html>
-  <head>
-    <title>Buzz Stuff</title>
-    <style type=text/css>
-      td  { vertical-align: top; padding: 0.5em }
-      img { border:0 }
-    </style>
-  </head>
-  <body>
-      <table border=0>
-      {% for item in activitylist.items %}
-      <tr valign=top>
-        <td>
-          {% if item.actor.thumbnailUrl %}
-            <a href="{{ item.actor.profileUrl }}">
-              <img src="{{ item.actor.thumbnailUrl }}">
-            </a>
-          {% endif %}
-          <br>
-          <a href="{{ item.actor.profileUrl }}">{{ item.actor.name }}</a></td>
-      <td>
-        {{ item.object.content|safe }}
-        </td>
-        <td>
-          <a href="{{ item.object.links.alternate.0.href }}"><img
-            src="/static/go.png"></a>
-        </td>
-      </tr>
-      {% endfor %}
-      </table>
-  </body>
-</html>
diff --git a/samples/django_sample/templates/buzz/login.html b/samples/django_sample/templates/plus/login.html
similarity index 100%
rename from samples/django_sample/templates/buzz/login.html
rename to samples/django_sample/templates/plus/login.html
diff --git a/samples/django_sample/templates/plus/welcome.html b/samples/django_sample/templates/plus/welcome.html
new file mode 100644
index 0000000..d43698b
--- /dev/null
+++ b/samples/django_sample/templates/plus/welcome.html
@@ -0,0 +1,17 @@
+
+<html>
+  <head>
+    <title>Your Google+ Activity</title>
+    <style type=text/css>
+      td  { vertical-align: top; padding: 0.5em }
+      img { border:0 }
+    </style>
+  </head>
+  <body>
+    <table border=1>
+      {% for item in activitylist.items %}
+      <tr><td>{{ item.object.content|safe }}</td></tr>
+      {% endfor %}
+    </table>
+  </body>
+</html>
diff --git a/samples/django_sample/urls.py b/samples/django_sample/urls.py
index aeba620..4c67ff2 100644
--- a/samples/django_sample/urls.py
+++ b/samples/django_sample/urls.py
@@ -7,8 +7,8 @@
 
 urlpatterns = patterns('',
     # Example:
-    (r'^$', 'django_sample.buzz.views.index'),
-    (r'^auth_return', 'django_sample.buzz.views.auth_return'),
+    (r'^$', 'django_sample.plus.views.index'),
+    (r'^oauth2callback', 'django_sample.plus.views.auth_return'),
 
     # Uncomment the admin/doc line below and add 'django.contrib.admindocs'
     # to INSTALLED_APPS to enable admin documentation:
@@ -17,7 +17,7 @@
     # Uncomment the next line to enable the admin:
     (r'^admin/', include(admin.site.urls)),
     (r'^accounts/login/$', 'django.contrib.auth.views.login',
-                        {'template_name': 'buzz/login.html'}),
+                        {'template_name': 'plus/login.html'}),
 
     (r'^static/(?P<path>.*)$', 'django.views.static.serve',
         {'document_root': os.path.join(os.path.dirname(__file__), 'static')
diff --git a/samples/src/buzz.py b/samples/src/buzz.py
deleted file mode 100644
index 10451e2..0000000
--- a/samples/src/buzz.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# version: v1
-# scope: https://www.googleapis.com/auth/buzz
-# title: Simple command-line sample for Buzz.
-# description: Command-line application that retrieves the users latest content and then adds a new entry.
-
-  activities = service.activities()
-
-  # Retrieve the first two activities
-  activitylist = activities.list(
-      max_results='2', scope='@self', userId='@me').execute()
-  print "Retrieved the first two activities"
-
-  # Retrieve the next two activities
-  if activitylist:
-    activitylist = activities.list_next(activitylist).execute()
-    print "Retrieved the next two activities"
-
-  # Add a new activity
-  new_activity_body = {
-      'title': 'Testing insert',
-      'object': {
-        'content':
-        u'Just a short note to show that insert is working. ☄',
-        'type': 'note'}
-      }
-  activity = activities.insert(userId='@me', body=new_activity_body).execute()
-  print "Added a new activity"
-
-  activitylist = activities.list(
-      max_results='2', scope='@self', userId='@me').execute()
-
-  # Add a comment to that activity
-  comment_body = {
-      "content": "This is a comment"
-      }
-  item = activitylist['items'][0]
-  comment = service.comments().insert(
-      userId=item['actor']['id'], postId=item['id'], body=comment_body
-      ).execute()
-  print 'Added a comment to the new activity'
-  pprint.pprint(comment)
diff --git a/samples/tasks_appengine/apiclient b/samples/tasks_appengine/apiclient
deleted file mode 120000
index 22e4c9c..0000000
--- a/samples/tasks_appengine/apiclient
+++ /dev/null
@@ -1 +0,0 @@
-../../apiclient/
\ No newline at end of file
diff --git a/samples/tasks_appengine/gflags.py b/samples/tasks_appengine/gflags.py
deleted file mode 120000
index 5a2ff94..0000000
--- a/samples/tasks_appengine/gflags.py
+++ /dev/null
@@ -1 +0,0 @@
-../../gflags.py
\ No newline at end of file
diff --git a/samples/tasks_appengine/gflags_validators.py b/samples/tasks_appengine/gflags_validators.py
deleted file mode 120000
index 25d8ce8..0000000
--- a/samples/tasks_appengine/gflags_validators.py
+++ /dev/null
@@ -1 +0,0 @@
-../../gflags_validators.py
\ No newline at end of file
diff --git a/samples/tasks_appengine/httplib2 b/samples/tasks_appengine/httplib2
deleted file mode 120000
index 488ae9f..0000000
--- a/samples/tasks_appengine/httplib2
+++ /dev/null
@@ -1 +0,0 @@
-../../httplib2/
\ No newline at end of file
diff --git a/samples/tasks_appengine/oauth2client b/samples/tasks_appengine/oauth2client
deleted file mode 120000
index 9013119..0000000
--- a/samples/tasks_appengine/oauth2client
+++ /dev/null
@@ -1 +0,0 @@
-../../oauth2client/
\ No newline at end of file
diff --git a/samples/tasks_appengine/uritemplate b/samples/tasks_appengine/uritemplate
deleted file mode 120000
index ce92dcb..0000000
--- a/samples/tasks_appengine/uritemplate
+++ /dev/null
@@ -1 +0,0 @@
-../../uritemplate/
\ No newline at end of file
diff --git a/samples/threadqueue/main.py b/samples/threadqueue/main.py
index 6ccea7c..817de59 100644
--- a/samples/threadqueue/main.py
+++ b/samples/threadqueue/main.py
@@ -35,7 +35,6 @@
 
 # A list of URLs to shorten.
 BULK = [
-    "https://code.google.com/apis/buzz/",
     "https://code.google.com/apis/moderator/",
     "https://code.google.com/apis/latitude/",
     "https://code.google.com/apis/urlshortener/",
diff --git a/setup.py b/setup.py
index 219f673..33130e9 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,6 @@
   'oauth2client',
   'apiclient.ext',
   'apiclient.contrib',
-  'apiclient.contrib.buzz',
   'apiclient.contrib.latitude',
   'apiclient.contrib.moderator',
   'uritemplate',
@@ -46,7 +45,7 @@
   install_requires.append('simplejson')
 
 long_desc = """The Google API Client for Python is a client library for
-accessing the Buzz, Moderator, and Latitude APIs."""
+accessing the Plus, Moderator, and many other Google APIs."""
 
 setup(name="google-api-python-client",
       version="1.0beta6",