diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..bd233269
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,34 @@
+# Compiled Object files, Static and Dynamic libs (Shared Objects)
+*.o
+*.a
+*.so
+
+# Folders
+_obj
+_test
+
+# Architecture specific extensions/prefixes
+*.[568vq]
+[568vq].out
+
+*.cgo1.go
+*.cgo2.c
+_cgo_defun.c
+_cgo_gotypes.go
+_cgo_export.*
+
+_testmain.go
+
+*.exe
+*.test
+*.prof
+
+bin/
+coverage/
+deploy/
+Godeps/_workspace/src/github.com/coreos/dex
+static/fixtures/env.txt
+static/fixtures/connectors.json
+static/fixtures/users.json
+static/fixtures/emailer.json
+gopath/
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 00000000..6662073a
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,71 @@
+# How to Contribute
+
+CoreOS projects are [Apache 2.0 licensed](LICENSE) and accept contributions via
+GitHub pull requests.  This document outlines some of the conventions on
+development workflow, commit message formatting, contact points and other
+resources to make it easier to get your contribution accepted.
+
+# Certificate of Origin
+
+By contributing to this project you agree to the Developer Certificate of
+Origin (DCO). This document was created by the Linux Kernel community and is a
+simple statement that you, as a contributor, have the legal right to make the
+contribution. See the [DCO](DCO) file for details.
+
+# Email and Chat
+
+The project currently uses the general CoreOS email list and IRC channel:
+- Email: [coreos-dev](https://groups.google.com/forum/#!forum/coreos-dev)
+- IRC: #[coreos](irc://irc.freenode.org:6667/#coreos) IRC channel on freenode.org
+
+Please avoid emailing maintainers found in the MAINTAINERS file directly. They
+are very busy and read the mailing lists.
+
+## Getting Started
+
+- Fork the repository on GitHub
+- Read the [README](README.md) for build and test instructions
+- Play with the project, submit bugs, submit patches!
+
+## Contribution Flow
+
+This is a rough outline of what a contributor's workflow looks like:
+
+- Create a topic branch from where you want to base your work (usually master).
+- Make commits of logical units.
+- Make sure your commit messages are in the proper format (see below).
+- Push your changes to a topic branch in your fork of the repository.
+- Make sure the tests pass, and add any new tests as appropriate.
+- Submit a pull request to the original repository.
+
+Thanks for your contributions!
+
+### Format of the Commit Message
+
+We follow a rough convention for commit messages that is designed to answer two
+questions: what changed and why. The subject line should feature the what and
+the body of the commit should describe the why.
+
+```
+scripts: add the test-cluster command
+
+this uses tmux to setup a test cluster that you can easily kill and
+start for debugging.
+
+Fixes #38
+```
+
+The format can be described more formally as follows:
+
+```
+<subsystem>: <what changed>
+<BLANK LINE>
+<why this change was made>
+<BLANK LINE>
+<footer>
+```
+
+The first line is the subject and should be no longer than 70 characters, the
+second line is always blank, and other lines should be wrapped at 80 characters.
+This allows the message to be easier to read on GitHub as well as in various
+git tools.
diff --git a/DCO b/DCO
new file mode 100644
index 00000000..716561d5
--- /dev/null
+++ b/DCO
@@ -0,0 +1,36 @@
+Developer Certificate of Origin
+Version 1.1
+
+Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
+660 York Street, Suite 102,
+San Francisco, CA 94110 USA
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+
+Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+    have the right to submit it under the open source license
+    indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the best
+    of my knowledge, is covered under an appropriate open source
+    license and I have the right under that license to submit that
+    work with modifications, whether created in whole or in part
+    by me, under the same open source license (unless I am
+    permitted to submit under a different license), as indicated
+    in the file; or
+
+(c) The contribution was provided directly to me by some other
+    person who certified (a), (b) or (c) and I have not modified
+    it.
+
+(d) I understand and agree that this project and the contribution
+    are public and that a record of the contribution (including all
+    personal information I submit with it, including my sign-off) is
+    maintained indefinitely and may be redistributed consistent with
+    this project or the open source license(s) involved.
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..8d43b8da
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,12 @@
+FROM quay.io/brianredbeard/corebox
+
+ADD bin/dex-worker /opt/dex/bin/dex-worker
+ADD bin/dex-overlord /opt/dex/bin/dex-overlord
+ADD bin/dexctl /opt/dex/bin/dexctl
+
+ENV DEX_WORKER_HTML_ASSETS /opt/dex/html/
+ADD static/html/* $DEX_WORKER_HTML_ASSETS
+
+ENV DEX_WORKER_EMAIL_ASSETS /opt/dex/email/
+ADD static/email/* $DEX_WORKER_EMAIL_ASSETS
+ADD static/fixtures/emailer.json.sample $DEX_WORKER_EMAIL_ASSETS/emailer.json
diff --git a/Documentation/authorization.md b/Documentation/authorization.md
new file mode 100644
index 00000000..c8e11b6d
--- /dev/null
+++ b/Documentation/authorization.md
@@ -0,0 +1,198 @@
+Authorization (Auth-Z) Proposal
+===============================
+
+## Components
+
+Core-Auth consisists of various components:
+
+1. A web app for users to authenticate with.
+2. A web app for users to manage auth-z policies.
+3. An API to serve auth-z queries.
+4. A common golang library to: validate auth-n tokens, assert identities from auth-n tokens, and fetch auth-z policies for users.
+
+## Design Strategy
+
+- Users authenticate and are provided a JWT
+- API keys are the same format JWT
+- Apps use the common library to access core-auth API to fetch auth-z policies etc
+- Auth-z policy requests supply an etag, policies are cached with a ttl
+
+## Basic Flow
+
+1. users log in via OAuth and are redirected to app with token (alternatively entities can use pregenerated api tokens)
+1. app uses common lib to assert identity from token
+1. app uses common lib to fetch auth-z policies (if not cached, or ttl expired) from configured auth-z server
+1. app uses common lib to assert permissions to requested resource(s)  
+   input: policies, resource CRN(s)  
+   output: yes/no, or filtered list of CRNs
+1. app responds with: denial, full-results, or filter-results
+
+
+## Permissions Specification
+
+### Core Resource Namespaces (CRN)
+
+Format: `crn:provider:product:instance:resource-type:resource`
+
+- `provider`: a unique FQDN of the organization that created/maintains the application
+- `product`: a product id/name unique to the provider
+- `instance`: an individual deployed instance of the product (FQDN, or UUID?)
+- `resource-type`: app specific resource type unqiue to the product
+- `resource`: the uniqe id of the resource in question (can use `/` for nested resources)
+
+### Resource Namespace Examples
+
+CoreUpdate Examples: 
+
+```
+// CoreOS App
+crn:coreos.com:coreupdate:public.update.core-os.net:app:e96281a6-d1af-4bde-9a0a-97b76e56dc57
+// CoreOS App's "stable" Group
+crn:coreos.com:coreupdate:public.update.core-os.net:group:e96281a6-d1af-4bde-9a0a-97b76e56dc57/stable
+```
+
+Quay Example:
+
+```
+crn:quay.io:enterprise-registry:my-registry.my-company.com:repo:hello-world
+```
+
+### Actions
+
+Similar to CRN but defined and registered by individual apps.
+Action describes the type of access that should be allowed or denied (for example, read, write, list, delete, startService, and so on)
+
+```
+provider:product:name
+```
+
+- `provider`: a unique FQDN of the organization that created/maintains the application (same as CRN)
+- `product`: a product id/name unique to the provider (same as CRN)
+- `name`: the acutal name of the aciton in the product
+
+#### Action Examples
+
+CoreUpdate (general):
+
+```
+coreos.com:coreupdate:read
+coreos.com:coreupdate:write
+coreos.com:coreupdate:delete
+```
+
+CoreUpdate (finer grained control):
+
+```
+coreos.com:coreupdate:publish
+coreos.com:coreupdate:pause
+coreos.com:coreupdate:modifyBehavior
+coreos.com:coreupdate:modifyChannel
+coreos.com:coreupdate:modifyVersion
+```
+
+### Policies
+
+```json
+{
+  "apiVersion": "v1",
+  "id": "7CFCE45E-610A-407C-84DB-86A24658B217",
+  "label": "my policy",
+  "statements": [
+    {
+      "effect": "allow",
+      "resource": ["crn:..."],
+      "action": ["crn:..."],
+    },
+  ]
+}
+```
+
+Policy:  
+
+- `apiVersion`: the policy API version
+- `id`: unique id of the policy
+- `label`: human readable label for the policy
+- `statements`: the main element for a policy. it is a list of multiple statements defining access.
+
+Statement:  
+
+- `effect`: "allow" or "deny"
+- `resource`: the CRN of the resource
+- `action`: described in action section
+
+#### Policiy Examples
+
+CoreUpdate Example:
+
+```json
+{
+  "apiVersion": "v1",
+  "id": "rando-uuid",
+  "label": "admin",
+  "description": "allows full admin access to everything",
+  "statements": [
+    {
+      "effect": "allow",
+      "resource": ["crn:coreos.com:coreupdate:public.update.core-os.net:*:*"],
+      "action": ["coreos.com:coreupdate:*"],
+    },
+  ]
+}
+
+{
+  "apiVersion": "v1",
+  "id": "rando-uuid",
+  "label": "full-read-only",
+  "description": "allows read only access to everything",
+  "statements": [
+    {
+      "effect": "allow",
+      "resource": ["crn:coreos.com:coreupdate:public.update.core-os.net:*:*"],
+      "action": ["coreos.com:coreupdate:read"],
+    },
+  ]
+}
+
+{
+  "apiVersion": "v1",
+  "id": "rando-uuid",
+  "label": "full-internal-only",
+  "description": "allows read access to everything, denys write access to the main CoreOS app",
+  "statements": [
+    {
+      "effect": "allow",
+      "resource": ["crn:coreos.com:coreupdate:public.update.core-os.net:*:*"],
+      "action": ["coreos.com:coreupdate:read"],
+    },
+    {
+      "effect": "deny",
+      "resource": ["crn:coreos.com:coreupdate:public.update.core-os.net:app:e96281a6-d1af-4bde-9a0a-97b76e56dc57"],
+      "action": ["coreos.com:coreupdate:write"],
+    },
+  ]
+}
+```
+
+### Policy Associations
+
+Policies can be attached to Organizations, Groups, or Users.
+
+### Core Auth API
+
+Should support the following operations:
+
+- create/delete actions
+- create/delete resources
+- get policies for entity
+- TBD
+- TBD
+
+# Open Questions
+
+- Do we support resource-based permissions?
+- Do we need to include the org in the CRNs?
+- Do we version the policies (different than apiVersion) for easy undo/history?
+- Should we have an `enabled` flag on policies?
+- How to handle public anonymous access?
+- Include the AWS equivalent of `NotResource` and `NotAction`?
+- Do we need to support conditions in policies? Perhaps we don't need these for v1.
diff --git a/Documentation/oauth2.md b/Documentation/oauth2.md
new file mode 100644
index 00000000..ab986fbc
--- /dev/null
+++ b/Documentation/oauth2.md
@@ -0,0 +1,42 @@
+# dex OAuth 2.0 Implementation
+
+OAuth 2.0 is defined in [RFC 6749][rfc6749]. The RFC defines the bare minimum necessary to implement OAuth 2.0, while it also describes a set of optional behaviors. This document aims to describe what decisions have been made in dex with respect to those optional behaviors.
+
+[rfc6749]: https://tools.ietf.org/html/rfc6749
+
+While the goal of dex is to accurately implement the required aspects of the OAuth 2.0 specification, dex is still under active development and certain disrepancies exist. Any such discrepancies are documented below.
+
+## TLS
+
+It is a requirement of OAuth 2.0 (RFC 6749 Section 2.3.1) that any authorization server utilize TLS to protect sensitive information (e.g. client passwords) transmitted between remote parties during the OAuth workflow.
+From a practical standpoint, TLS can be a tedious requirement for development environments.
+It also may be desirable to deploy dex behind an SSL-terminating load balancer.
+dex does not require the use of TLS, but it should be considered necessary when deploying dex on any public networks.
+
+## Client Authentication
+
+Unregistered clients are not supported (RFC 6749 Section 2.4).
+
+## Authorization Endpoint
+
+User-agent MUST make a valid authorization request to the authorization endpoint (RFC 6749 Section 3.1) using the "authorization code" grant type; no other grant types are supported.
+Additionally, GET w/ query parameters must be used - POST w/ a form in the request body body is not supported.
+
+
+The OAuth 2.0 spec leaves the implementation details of the authorization step up to the implementer as long as the request and response formats are respected.
+dex relies on remote identity providers to fulfill the actual authorization of user-agents.
+This federated approach typically requires one or more additional HTTP redirects and a manual login step past what is encountered with a typical OAuth 2.0 server.
+Given this detail, it is necessary that user-agents follow all HTTP redirects during an authorization attempt.
+Additionally, the HTTP response from the initial authorization request will likely not redirect the user-agent to the redirection endpoint provided in that initial request.
+User-agent MUST not reject redirections to unrecognized endpoints.
+
+## Token endpoint
+
+Clients MUST identify themselves using the Basic HTTP authentication scheme (RFC 6749 Section 2.3.1).
+Given this requirement, the client_id and client_secret fields of the request are ignored.
+
+Refresh tokens are never generated and returned.
+
+Given that the authorization endpoint only supports authorization codes and refresh tokens are never generated, the only supported values of grant_type are "authorization_code" and "client_credentials".
+
+
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
new file mode 100644
index 00000000..291d4927
--- /dev/null
+++ b/Godeps/Godeps.json
@@ -0,0 +1,120 @@
+{
+	"ImportPath": "github.com/coreos-inc/auth",
+	"GoVersion": "go1.4.2",
+	"Packages": [
+		"./..."
+	],
+	"Deps": [
+		{
+			"ImportPath": "code.google.com/p/go-uuid/uuid",
+			"Comment": "null-15",
+			"Rev": "35bc42037350f0078e3c974c6ea690f1926603ab"
+		},
+		{
+			"ImportPath": "github.com/PuerkitoBio/goquery",
+			"Comment": "v0.3.2-79-gb444041",
+			"Rev": "b4440419d81240f8451a505b2f806c853bc2befc"
+		},
+		{
+			"ImportPath": "github.com/andybalholm/cascadia",
+			"Rev": "6122e68c2642b7b75c538a63b15168c6c80fb757"
+		},
+		{
+			"ImportPath": "github.com/coopernurse/gorp",
+			"Comment": "v1.7",
+			"Rev": "5d19ebd22fdcf3b9fb1c8cbfcf1d4e78e102f1e0"
+		},
+		{
+			"ImportPath": "github.com/coreos/go-oidc/http",
+			"Rev": "ee7cb1fb480df22f7d8c4c90199e438e454ca3b6"
+		},
+		{
+			"ImportPath": "github.com/coreos/go-oidc/jose",
+			"Rev": "ee7cb1fb480df22f7d8c4c90199e438e454ca3b6"
+		},
+		{
+			"ImportPath": "github.com/coreos/go-oidc/key",
+			"Rev": "ee7cb1fb480df22f7d8c4c90199e438e454ca3b6"
+		},
+		{
+			"ImportPath": "github.com/coreos/go-oidc/oauth2",
+			"Rev": "ee7cb1fb480df22f7d8c4c90199e438e454ca3b6"
+		},
+		{
+			"ImportPath": "github.com/coreos/go-oidc/oidc",
+			"Rev": "ee7cb1fb480df22f7d8c4c90199e438e454ca3b6"
+		},
+		{
+			"ImportPath": "github.com/coreos/pkg/capnslog",
+			"Rev": "fa94270d4bac0d8ae5dc6b71894e251aada93f74"
+		},
+		{
+			"ImportPath": "github.com/coreos/pkg/flagutil",
+			"Rev": "fa94270d4bac0d8ae5dc6b71894e251aada93f74"
+		},
+		{
+			"ImportPath": "github.com/coreos/pkg/health",
+			"Rev": "fa94270d4bac0d8ae5dc6b71894e251aada93f74"
+		},
+		{
+			"ImportPath": "github.com/coreos/pkg/httputil",
+			"Rev": "fa94270d4bac0d8ae5dc6b71894e251aada93f74"
+		},
+		{
+			"ImportPath": "github.com/coreos/pkg/timeutil",
+			"Rev": "fa94270d4bac0d8ae5dc6b71894e251aada93f74"
+		},
+		{
+			"ImportPath": "github.com/gorilla/handlers",
+			"Rev": "60c7bfde3e33c201519a200a4507a158cc03a17b"
+		},
+		{
+			"ImportPath": "github.com/jonboulle/clockwork",
+			"Rev": "3f831b65b61282ba6bece21b91beea2edc4c887a"
+		},
+		{
+			"ImportPath": "github.com/julienschmidt/httprouter",
+			"Rev": "8c199fb6259ffc1af525cc3ad52ee60ba8359669"
+		},
+		{
+			"ImportPath": "github.com/kylelemons/godebug/diff",
+			"Rev": "808ac284003ce2b08ef590da08f95379e8a06936"
+		},
+		{
+			"ImportPath": "github.com/kylelemons/godebug/pretty",
+			"Rev": "808ac284003ce2b08ef590da08f95379e8a06936"
+		},
+		{
+			"ImportPath": "github.com/lib/pq",
+			"Rev": "7175accbed18058468c07811f76440d6e8d7cf19"
+		},
+		{
+			"ImportPath": "github.com/mailgun/mailgun-go",
+			"Rev": "9578dc67692294bb7e2a6f4b15dd18c97af19440"
+		},
+		{
+			"ImportPath": "github.com/mbanzon/simplehttp",
+			"Rev": "04c542e7ac706a25820090f274ea6a4f39a63326"
+		},
+		{
+			"ImportPath": "golang.org/x/crypto/bcrypt",
+			"Rev": "1fbbd62cfec66bd39d91e97749579579d4d3037e"
+		},
+		{
+			"ImportPath": "golang.org/x/crypto/blowfish",
+			"Rev": "1fbbd62cfec66bd39d91e97749579579d4d3037e"
+		},
+		{
+			"ImportPath": "golang.org/x/net/html",
+			"Rev": "dfe268fd2bb5c793f4c083803609fce9806c6f80"
+		},
+		{
+			"ImportPath": "google.golang.org/api/google-api-go-generator",
+			"Rev": "d3edb0282bde692467788c50070a9211afe75cf3"
+		},
+		{
+			"ImportPath": "google.golang.org/api/googleapi",
+			"Rev": "d3edb0282bde692467788c50070a9211afe75cf3"
+		}
+	]
+}
diff --git a/Godeps/Readme b/Godeps/Readme
new file mode 100644
index 00000000..4cdaa53d
--- /dev/null
+++ b/Godeps/Readme
@@ -0,0 +1,5 @@
+This directory tree is generated automatically by godep.
+
+Please do not edit.
+
+See https://github.com/tools/godep for more information.
diff --git a/Godeps/_workspace/.gitignore b/Godeps/_workspace/.gitignore
new file mode 100644
index 00000000..f037d684
--- /dev/null
+++ b/Godeps/_workspace/.gitignore
@@ -0,0 +1,2 @@
+/pkg
+/bin
diff --git a/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/LICENSE b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/LICENSE
new file mode 100644
index 00000000..5dc68268
--- /dev/null
+++ b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2009,2014 Google Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/dce.go b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/dce.go
new file mode 100644
index 00000000..50a0f2d0
--- /dev/null
+++ b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/dce.go
@@ -0,0 +1,84 @@
+// Copyright 2011 Google Inc.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package uuid
+
+import (
+	"encoding/binary"
+	"fmt"
+	"os"
+)
+
+// A Domain represents a Version 2 domain
+type Domain byte
+
+// Domain constants for DCE Security (Version 2) UUIDs.
+const (
+	Person = Domain(0)
+	Group  = Domain(1)
+	Org    = Domain(2)
+)
+
+// NewDCESecurity returns a DCE Security (Version 2) UUID.
+//
+// The domain should be one of Person, Group or Org.
+// On a POSIX system the id should be the users UID for the Person
+// domain and the users GID for the Group.  The meaning of id for
+// the domain Org or on non-POSIX systems is site defined.
+//
+// For a given domain/id pair the same token may be returned for up to
+// 7 minutes and 10 seconds.
+func NewDCESecurity(domain Domain, id uint32) UUID {
+	uuid := NewUUID()
+	if uuid != nil {
+		uuid[6] = (uuid[6] & 0x0f) | 0x20 // Version 2
+		uuid[9] = byte(domain)
+		binary.BigEndian.PutUint32(uuid[0:], id)
+	}
+	return uuid
+}
+
+// NewDCEPerson returns a DCE Security (Version 2) UUID in the person
+// domain with the id returned by os.Getuid.
+//
+//  NewDCEPerson(Person, uint32(os.Getuid()))
+func NewDCEPerson() UUID {
+	return NewDCESecurity(Person, uint32(os.Getuid()))
+}
+
+// NewDCEGroup returns a DCE Security (Version 2) UUID in the group
+// domain with the id returned by os.Getgid.
+//
+//  NewDCEGroup(Group, uint32(os.Getgid()))
+func NewDCEGroup() UUID {
+	return NewDCESecurity(Group, uint32(os.Getgid()))
+}
+
+// Domain returns the domain for a Version 2 UUID or false.
+func (uuid UUID) Domain() (Domain, bool) {
+	if v, _ := uuid.Version(); v != 2 {
+		return 0, false
+	}
+	return Domain(uuid[9]), true
+}
+
+// Id returns the id for a Version 2 UUID or false.
+func (uuid UUID) Id() (uint32, bool) {
+	if v, _ := uuid.Version(); v != 2 {
+		return 0, false
+	}
+	return binary.BigEndian.Uint32(uuid[0:4]), true
+}
+
+func (d Domain) String() string {
+	switch d {
+	case Person:
+		return "Person"
+	case Group:
+		return "Group"
+	case Org:
+		return "Org"
+	}
+	return fmt.Sprintf("Domain%d", int(d))
+}
diff --git a/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/doc.go b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/doc.go
new file mode 100644
index 00000000..d8bd013e
--- /dev/null
+++ b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/doc.go
@@ -0,0 +1,8 @@
+// Copyright 2011 Google Inc.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// The uuid package generates and inspects UUIDs.
+//
+// UUIDs are based on RFC 4122 and DCE 1.1: Authentication and Security Services.
+package uuid
diff --git a/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/hash.go b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/hash.go
new file mode 100644
index 00000000..cdd4192f
--- /dev/null
+++ b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/hash.go
@@ -0,0 +1,53 @@
+// Copyright 2011 Google Inc.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package uuid
+
+import (
+	"crypto/md5"
+	"crypto/sha1"
+	"hash"
+)
+
+// Well known Name Space IDs and UUIDs
+var (
+	NameSpace_DNS  = Parse("6ba7b810-9dad-11d1-80b4-00c04fd430c8")
+	NameSpace_URL  = Parse("6ba7b811-9dad-11d1-80b4-00c04fd430c8")
+	NameSpace_OID  = Parse("6ba7b812-9dad-11d1-80b4-00c04fd430c8")
+	NameSpace_X500 = Parse("6ba7b814-9dad-11d1-80b4-00c04fd430c8")
+	NIL            = Parse("00000000-0000-0000-0000-000000000000")
+)
+
+// NewHash returns a new UUID dervied from the hash of space concatenated with
+// data generated by h.  The hash should be at least 16 byte in length.  The
+// first 16 bytes of the hash are used to form the UUID.  The version of the
+// UUID will be the lower 4 bits of version.  NewHash is used to implement
+// NewMD5 and NewSHA1.
+func NewHash(h hash.Hash, space UUID, data []byte, version int) UUID {
+	h.Reset()
+	h.Write(space)
+	h.Write([]byte(data))
+	s := h.Sum(nil)
+	uuid := make([]byte, 16)
+	copy(uuid, s)
+	uuid[6] = (uuid[6] & 0x0f) | uint8((version&0xf)<<4)
+	uuid[8] = (uuid[8] & 0x3f) | 0x80 // RFC 4122 variant
+	return uuid
+}
+
+// NewMD5 returns a new MD5 (Version 3) UUID based on the
+// supplied name space and data.
+//
+//  NewHash(md5.New(), space, data, 3)
+func NewMD5(space UUID, data []byte) UUID {
+	return NewHash(md5.New(), space, data, 3)
+}
+
+// NewSHA1 returns a new SHA1 (Version 5) UUID based on the
+// supplied name space and data.
+//
+//  NewHash(sha1.New(), space, data, 5)
+func NewSHA1(space UUID, data []byte) UUID {
+	return NewHash(sha1.New(), space, data, 5)
+}
diff --git a/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/json.go b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/json.go
new file mode 100644
index 00000000..760580a5
--- /dev/null
+++ b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/json.go
@@ -0,0 +1,30 @@
+// Copyright 2014 Google Inc.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package uuid
+
+import "errors"
+
+func (u UUID) MarshalJSON() ([]byte, error) {
+	if len(u) == 0 {
+		return []byte(`""`), nil
+	}
+	return []byte(`"` + u.String() + `"`), nil
+}
+
+func (u *UUID) UnmarshalJSON(data []byte) error {
+	if len(data) == 0 || string(data) == `""` {
+		return nil
+	}
+	if len(data) < 2 || data[0] != '"' || data[len(data)-1] != '"' {
+		return errors.New("invalid UUID format")
+	}
+	data = data[1 : len(data)-1]
+	uu := Parse(string(data))
+	if uu == nil {
+		return errors.New("invalid UUID format")
+	}
+	*u = uu
+	return nil
+}
diff --git a/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/json_test.go b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/json_test.go
new file mode 100644
index 00000000..b5eae092
--- /dev/null
+++ b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/json_test.go
@@ -0,0 +1,32 @@
+// Copyright 2014 Google Inc.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package uuid
+
+import (
+	"encoding/json"
+	"reflect"
+	"testing"
+)
+
+var testUUID = Parse("f47ac10b-58cc-0372-8567-0e02b2c3d479")
+
+func TestJSON(t *testing.T) {
+	type S struct {
+		ID1 UUID
+		ID2 UUID
+	}
+	s1 := S{ID1: testUUID}
+	data, err := json.Marshal(&s1)
+	if err != nil {
+		t.Fatal(err)
+	}
+	var s2 S
+	if err := json.Unmarshal(data, &s2); err != nil {
+		t.Fatal(err)
+	}
+	if !reflect.DeepEqual(&s1, &s2) {
+		t.Errorf("got %#v, want %#v", s2, s1)
+	}
+}
diff --git a/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/node.go b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/node.go
new file mode 100644
index 00000000..dd0a8ac1
--- /dev/null
+++ b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/node.go
@@ -0,0 +1,101 @@
+// Copyright 2011 Google Inc.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package uuid
+
+import "net"
+
+var (
+	interfaces []net.Interface // cached list of interfaces
+	ifname     string          // name of interface being used
+	nodeID     []byte          // hardware for version 1 UUIDs
+)
+
+// NodeInterface returns the name of the interface from which the NodeID was
+// derived.  The interface "user" is returned if the NodeID was set by
+// SetNodeID.
+func NodeInterface() string {
+	return ifname
+}
+
+// SetNodeInterface selects the hardware address to be used for Version 1 UUIDs.
+// If name is "" then the first usable interface found will be used or a random
+// Node ID will be generated.  If a named interface cannot be found then false
+// is returned.
+//
+// SetNodeInterface never fails when name is "".
+func SetNodeInterface(name string) bool {
+	if interfaces == nil {
+		var err error
+		interfaces, err = net.Interfaces()
+		if err != nil && name != "" {
+			return false
+		}
+	}
+
+	for _, ifs := range interfaces {
+		if len(ifs.HardwareAddr) >= 6 && (name == "" || name == ifs.Name) {
+			if setNodeID(ifs.HardwareAddr) {
+				ifname = ifs.Name
+				return true
+			}
+		}
+	}
+
+	// We found no interfaces with a valid hardware address.  If name
+	// does not specify a specific interface generate a random Node ID
+	// (section 4.1.6)
+	if name == "" {
+		if nodeID == nil {
+			nodeID = make([]byte, 6)
+		}
+		randomBits(nodeID)
+		return true
+	}
+	return false
+}
+
+// NodeID returns a slice of a copy of the current Node ID, setting the Node ID
+// if not already set.
+func NodeID() []byte {
+	if nodeID == nil {
+		SetNodeInterface("")
+	}
+	nid := make([]byte, 6)
+	copy(nid, nodeID)
+	return nid
+}
+
+// SetNodeID sets the Node ID to be used for Version 1 UUIDs.  The first 6 bytes
+// of id are used.  If id is less than 6 bytes then false is returned and the
+// Node ID is not set.
+func SetNodeID(id []byte) bool {
+	if setNodeID(id) {
+		ifname = "user"
+		return true
+	}
+	return false
+}
+
+func setNodeID(id []byte) bool {
+	if len(id) < 6 {
+		return false
+	}
+	if nodeID == nil {
+		nodeID = make([]byte, 6)
+	}
+	copy(nodeID, id)
+	return true
+}
+
+// NodeID returns the 6 byte node id encoded in uuid.  It returns nil if uuid is
+// not valid.  The NodeID is only well defined for version 1 and 2 UUIDs.
+func (uuid UUID) NodeID() []byte {
+	if len(uuid) != 16 {
+		return nil
+	}
+	node := make([]byte, 6)
+	copy(node, uuid[10:])
+	return node
+}
diff --git a/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/seq_test.go b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/seq_test.go
new file mode 100644
index 00000000..3b3d1430
--- /dev/null
+++ b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/seq_test.go
@@ -0,0 +1,66 @@
+// Copyright 2014 Google Inc.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package uuid
+
+import (
+	"flag"
+	"runtime"
+	"testing"
+	"time"
+)
+
+// This test is only run when --regressions is passed on the go test line.
+var regressions = flag.Bool("regressions", false, "run uuid regression tests")
+
+// TestClockSeqRace tests for a particular race condition of returning two
+// identical Version1 UUIDs.  The duration of 1 minute was chosen as the race
+// condition, before being fixed, nearly always occured in under 30 seconds.
+func TestClockSeqRace(t *testing.T) {
+	if !*regressions {
+		t.Skip("skipping regression tests")
+	}
+	duration := time.Minute
+
+	done := make(chan struct{})
+	defer close(done)
+
+	ch := make(chan UUID, 10000)
+	ncpu := runtime.NumCPU()
+	switch ncpu {
+	case 0, 1:
+		// We can't run the test effectively.
+		t.Skip("skipping race test, only one CPU detected")
+		return
+	default:
+		runtime.GOMAXPROCS(ncpu)
+	}
+	for i := 0; i < ncpu; i++ {
+		go func() {
+			for {
+				select {
+				case <-done:
+					return
+				case ch <- NewUUID():
+				}
+			}
+		}()
+	}
+
+	uuids := make(map[string]bool)
+	cnt := 0
+	start := time.Now()
+	for u := range ch {
+		s := u.String()
+		if uuids[s] {
+			t.Errorf("duplicate uuid after %d in %v: %s", cnt, time.Since(start), s)
+			return
+		}
+		uuids[s] = true
+		if time.Since(start) > duration {
+			return
+		}
+		cnt++
+	}
+}
diff --git a/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/time.go b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/time.go
new file mode 100644
index 00000000..7ebc9bef
--- /dev/null
+++ b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/time.go
@@ -0,0 +1,132 @@
+// Copyright 2014 Google Inc.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package uuid
+
+import (
+	"encoding/binary"
+	"sync"
+	"time"
+)
+
+// A Time represents a time as the number of 100's of nanoseconds since 15 Oct
+// 1582.
+type Time int64
+
+const (
+	lillian    = 2299160          // Julian day of 15 Oct 1582
+	unix       = 2440587          // Julian day of 1 Jan 1970
+	epoch      = unix - lillian   // Days between epochs
+	g1582      = epoch * 86400    // seconds between epochs
+	g1582ns100 = g1582 * 10000000 // 100s of a nanoseconds between epochs
+)
+
+var (
+	mu        sync.Mutex
+	lasttime  uint64 // last time we returned
+	clock_seq uint16 // clock sequence for this run
+
+	timeNow = time.Now // for testing
+)
+
+// UnixTime converts t the number of seconds and nanoseconds using the Unix
+// epoch of 1 Jan 1970.
+func (t Time) UnixTime() (sec, nsec int64) {
+	sec = int64(t - g1582ns100)
+	nsec = (sec % 10000000) * 100
+	sec /= 10000000
+	return sec, nsec
+}
+
+// GetTime returns the current Time (100s of nanoseconds since 15 Oct 1582) and
+// clock sequence as well as adjusting the clock sequence as needed.  An error
+// is returned if the current time cannot be determined.
+func GetTime() (Time, uint16, error) {
+	defer mu.Unlock()
+	mu.Lock()
+	return getTime()
+}
+
+func getTime() (Time, uint16, error) {
+	t := timeNow()
+
+	// If we don't have a clock sequence already, set one.
+	if clock_seq == 0 {
+		setClockSequence(-1)
+	}
+	now := uint64(t.UnixNano()/100) + g1582ns100
+
+	// If time has gone backwards with this clock sequence then we
+	// increment the clock sequence
+	if now <= lasttime {
+		clock_seq = ((clock_seq + 1) & 0x3fff) | 0x8000
+	}
+	lasttime = now
+	return Time(now), clock_seq, nil
+}
+
+// ClockSequence returns the current clock sequence, generating one if not
+// already set.  The clock sequence is only used for Version 1 UUIDs.
+//
+// The uuid package does not use global static storage for the clock sequence or
+// the last time a UUID was generated.  Unless SetClockSequence a new random
+// clock sequence is generated the first time a clock sequence is requested by
+// ClockSequence, GetTime, or NewUUID.  (section 4.2.1.1) sequence is generated
+// for
+func ClockSequence() int {
+	defer mu.Unlock()
+	mu.Lock()
+	return clockSequence()
+}
+
+func clockSequence() int {
+	if clock_seq == 0 {
+		setClockSequence(-1)
+	}
+	return int(clock_seq & 0x3fff)
+}
+
+// SetClockSeq sets the clock sequence to the lower 14 bits of seq.  Setting to
+// -1 causes a new sequence to be generated.
+func SetClockSequence(seq int) {
+	defer mu.Unlock()
+	mu.Lock()
+	setClockSequence(seq)
+}
+
+func setClockSequence(seq int) {
+	if seq == -1 {
+		var b [2]byte
+		randomBits(b[:]) // clock sequence
+		seq = int(b[0])<<8 | int(b[1])
+	}
+	old_seq := clock_seq
+	clock_seq = uint16(seq&0x3fff) | 0x8000 // Set our variant
+	if old_seq != clock_seq {
+		lasttime = 0
+	}
+}
+
+// Time returns the time in 100s of nanoseconds since 15 Oct 1582 encoded in
+// uuid.  It returns false if uuid is not valid.  The time is only well defined
+// for version 1 and 2 UUIDs.
+func (uuid UUID) Time() (Time, bool) {
+	if len(uuid) != 16 {
+		return 0, false
+	}
+	time := int64(binary.BigEndian.Uint32(uuid[0:4]))
+	time |= int64(binary.BigEndian.Uint16(uuid[4:6])) << 32
+	time |= int64(binary.BigEndian.Uint16(uuid[6:8])&0xfff) << 48
+	return Time(time), true
+}
+
+// ClockSequence returns the clock sequence encoded in uuid.  It returns false
+// if uuid is not valid.  The clock sequence is only well defined for version 1
+// and 2 UUIDs.
+func (uuid UUID) ClockSequence() (int, bool) {
+	if len(uuid) != 16 {
+		return 0, false
+	}
+	return int(binary.BigEndian.Uint16(uuid[8:10])) & 0x3fff, true
+}
diff --git a/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/util.go b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/util.go
new file mode 100644
index 00000000..de40b102
--- /dev/null
+++ b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/util.go
@@ -0,0 +1,43 @@
+// Copyright 2011 Google Inc.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package uuid
+
+import (
+	"io"
+)
+
+// randomBits completely fills slice b with random data.
+func randomBits(b []byte) {
+	if _, err := io.ReadFull(rander, b); err != nil {
+		panic(err.Error()) // rand should never fail
+	}
+}
+
+// xvalues returns the value of a byte as a hexadecimal digit or 255.
+var xvalues = []byte{
+	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+	0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 255, 255, 255, 255, 255, 255,
+	255, 10, 11, 12, 13, 14, 15, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+	255, 10, 11, 12, 13, 14, 15, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+	255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+}
+
+// xtob converts the the first two hex bytes of x into a byte.
+func xtob(x string) (byte, bool) {
+	b1 := xvalues[x[0]]
+	b2 := xvalues[x[1]]
+	return (b1 << 4) | b2, b1 != 255 && b2 != 255
+}
diff --git a/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/uuid.go b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/uuid.go
new file mode 100644
index 00000000..2920fae6
--- /dev/null
+++ b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/uuid.go
@@ -0,0 +1,163 @@
+// Copyright 2011 Google Inc.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package uuid
+
+import (
+	"bytes"
+	"crypto/rand"
+	"fmt"
+	"io"
+	"strings"
+)
+
+// A UUID is a 128 bit (16 byte) Universal Unique IDentifier as defined in RFC
+// 4122.
+type UUID []byte
+
+// A Version represents a UUIDs version.
+type Version byte
+
+// A Variant represents a UUIDs variant.
+type Variant byte
+
+// Constants returned by Variant.
+const (
+	Invalid   = Variant(iota) // Invalid UUID
+	RFC4122                   // The variant specified in RFC4122
+	Reserved                  // Reserved, NCS backward compatibility.
+	Microsoft                 // Reserved, Microsoft Corporation backward compatibility.
+	Future                    // Reserved for future definition.
+)
+
+var rander = rand.Reader // random function
+
+// New returns a new random (version 4) UUID as a string.  It is a convenience
+// function for NewRandom().String().
+func New() string {
+	return NewRandom().String()
+}
+
+// Parse decodes s into a UUID or returns nil.  Both the UUID form of
+// xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx and
+// urn:uuid:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx are decoded.
+func Parse(s string) UUID {
+	if len(s) == 36+9 {
+		if strings.ToLower(s[:9]) != "urn:uuid:" {
+			return nil
+		}
+		s = s[9:]
+	} else if len(s) != 36 {
+		return nil
+	}
+	if s[8] != '-' || s[13] != '-' || s[18] != '-' || s[23] != '-' {
+		return nil
+	}
+	uuid := make([]byte, 16)
+	for i, x := range []int{
+		0, 2, 4, 6,
+		9, 11,
+		14, 16,
+		19, 21,
+		24, 26, 28, 30, 32, 34} {
+		if v, ok := xtob(s[x:]); !ok {
+			return nil
+		} else {
+			uuid[i] = v
+		}
+	}
+	return uuid
+}
+
+// Equal returns true if uuid1 and uuid2 are equal.
+func Equal(uuid1, uuid2 UUID) bool {
+	return bytes.Equal(uuid1, uuid2)
+}
+
+// String returns the string form of uuid, xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+// , or "" if uuid is invalid.
+func (uuid UUID) String() string {
+	if uuid == nil || len(uuid) != 16 {
+		return ""
+	}
+	b := []byte(uuid)
+	return fmt.Sprintf("%08x-%04x-%04x-%04x-%012x",
+		b[:4], b[4:6], b[6:8], b[8:10], b[10:])
+}
+
+// URN returns the RFC 2141 URN form of uuid,
+// urn:uuid:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx,  or "" if uuid is invalid.
+func (uuid UUID) URN() string {
+	if uuid == nil || len(uuid) != 16 {
+		return ""
+	}
+	b := []byte(uuid)
+	return fmt.Sprintf("urn:uuid:%08x-%04x-%04x-%04x-%012x",
+		b[:4], b[4:6], b[6:8], b[8:10], b[10:])
+}
+
+// Variant returns the variant encoded in uuid.  It returns Invalid if
+// uuid is invalid.
+func (uuid UUID) Variant() Variant {
+	if len(uuid) != 16 {
+		return Invalid
+	}
+	switch {
+	case (uuid[8] & 0xc0) == 0x80:
+		return RFC4122
+	case (uuid[8] & 0xe0) == 0xc0:
+		return Microsoft
+	case (uuid[8] & 0xe0) == 0xe0:
+		return Future
+	default:
+		return Reserved
+	}
+	panic("unreachable")
+}
+
+// Version returns the verison of uuid.  It returns false if uuid is not
+// valid.
+func (uuid UUID) Version() (Version, bool) {
+	if len(uuid) != 16 {
+		return 0, false
+	}
+	return Version(uuid[6] >> 4), true
+}
+
+func (v Version) String() string {
+	if v > 15 {
+		return fmt.Sprintf("BAD_VERSION_%d", v)
+	}
+	return fmt.Sprintf("VERSION_%d", v)
+}
+
+func (v Variant) String() string {
+	switch v {
+	case RFC4122:
+		return "RFC4122"
+	case Reserved:
+		return "Reserved"
+	case Microsoft:
+		return "Microsoft"
+	case Future:
+		return "Future"
+	case Invalid:
+		return "Invalid"
+	}
+	return fmt.Sprintf("BadVariant%d", int(v))
+}
+
+// SetRand sets the random number generator to r, which implents io.Reader.
+// If r.Read returns an error when the package requests random data then
+// a panic will be issued.
+//
+// Calling SetRand with nil sets the random number generator to the default
+// generator.
+func SetRand(r io.Reader) {
+	if r == nil {
+		rander = rand.Reader
+		return
+	}
+	rander = r
+}
diff --git a/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/uuid_test.go b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/uuid_test.go
new file mode 100644
index 00000000..417ebeb2
--- /dev/null
+++ b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/uuid_test.go
@@ -0,0 +1,390 @@
+// Copyright 2011 Google Inc.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package uuid
+
+import (
+	"bytes"
+	"fmt"
+	"os"
+	"strings"
+	"testing"
+	"time"
+)
+
+type test struct {
+	in      string
+	version Version
+	variant Variant
+	isuuid  bool
+}
+
+var tests = []test{
+	{"f47ac10b-58cc-0372-8567-0e02b2c3d479", 0, RFC4122, true},
+	{"f47ac10b-58cc-1372-8567-0e02b2c3d479", 1, RFC4122, true},
+	{"f47ac10b-58cc-2372-8567-0e02b2c3d479", 2, RFC4122, true},
+	{"f47ac10b-58cc-3372-8567-0e02b2c3d479", 3, RFC4122, true},
+	{"f47ac10b-58cc-4372-8567-0e02b2c3d479", 4, RFC4122, true},
+	{"f47ac10b-58cc-5372-8567-0e02b2c3d479", 5, RFC4122, true},
+	{"f47ac10b-58cc-6372-8567-0e02b2c3d479", 6, RFC4122, true},
+	{"f47ac10b-58cc-7372-8567-0e02b2c3d479", 7, RFC4122, true},
+	{"f47ac10b-58cc-8372-8567-0e02b2c3d479", 8, RFC4122, true},
+	{"f47ac10b-58cc-9372-8567-0e02b2c3d479", 9, RFC4122, true},
+	{"f47ac10b-58cc-a372-8567-0e02b2c3d479", 10, RFC4122, true},
+	{"f47ac10b-58cc-b372-8567-0e02b2c3d479", 11, RFC4122, true},
+	{"f47ac10b-58cc-c372-8567-0e02b2c3d479", 12, RFC4122, true},
+	{"f47ac10b-58cc-d372-8567-0e02b2c3d479", 13, RFC4122, true},
+	{"f47ac10b-58cc-e372-8567-0e02b2c3d479", 14, RFC4122, true},
+	{"f47ac10b-58cc-f372-8567-0e02b2c3d479", 15, RFC4122, true},
+
+	{"urn:uuid:f47ac10b-58cc-4372-0567-0e02b2c3d479", 4, Reserved, true},
+	{"URN:UUID:f47ac10b-58cc-4372-0567-0e02b2c3d479", 4, Reserved, true},
+	{"f47ac10b-58cc-4372-0567-0e02b2c3d479", 4, Reserved, true},
+	{"f47ac10b-58cc-4372-1567-0e02b2c3d479", 4, Reserved, true},
+	{"f47ac10b-58cc-4372-2567-0e02b2c3d479", 4, Reserved, true},
+	{"f47ac10b-58cc-4372-3567-0e02b2c3d479", 4, Reserved, true},
+	{"f47ac10b-58cc-4372-4567-0e02b2c3d479", 4, Reserved, true},
+	{"f47ac10b-58cc-4372-5567-0e02b2c3d479", 4, Reserved, true},
+	{"f47ac10b-58cc-4372-6567-0e02b2c3d479", 4, Reserved, true},
+	{"f47ac10b-58cc-4372-7567-0e02b2c3d479", 4, Reserved, true},
+	{"f47ac10b-58cc-4372-8567-0e02b2c3d479", 4, RFC4122, true},
+	{"f47ac10b-58cc-4372-9567-0e02b2c3d479", 4, RFC4122, true},
+	{"f47ac10b-58cc-4372-a567-0e02b2c3d479", 4, RFC4122, true},
+	{"f47ac10b-58cc-4372-b567-0e02b2c3d479", 4, RFC4122, true},
+	{"f47ac10b-58cc-4372-c567-0e02b2c3d479", 4, Microsoft, true},
+	{"f47ac10b-58cc-4372-d567-0e02b2c3d479", 4, Microsoft, true},
+	{"f47ac10b-58cc-4372-e567-0e02b2c3d479", 4, Future, true},
+	{"f47ac10b-58cc-4372-f567-0e02b2c3d479", 4, Future, true},
+
+	{"f47ac10b158cc-5372-a567-0e02b2c3d479", 0, Invalid, false},
+	{"f47ac10b-58cc25372-a567-0e02b2c3d479", 0, Invalid, false},
+	{"f47ac10b-58cc-53723a567-0e02b2c3d479", 0, Invalid, false},
+	{"f47ac10b-58cc-5372-a56740e02b2c3d479", 0, Invalid, false},
+	{"f47ac10b-58cc-5372-a567-0e02-2c3d479", 0, Invalid, false},
+	{"g47ac10b-58cc-4372-a567-0e02b2c3d479", 0, Invalid, false},
+}
+
+var constants = []struct {
+	c    interface{}
+	name string
+}{
+	{Person, "Person"},
+	{Group, "Group"},
+	{Org, "Org"},
+	{Invalid, "Invalid"},
+	{RFC4122, "RFC4122"},
+	{Reserved, "Reserved"},
+	{Microsoft, "Microsoft"},
+	{Future, "Future"},
+	{Domain(17), "Domain17"},
+	{Variant(42), "BadVariant42"},
+}
+
+func testTest(t *testing.T, in string, tt test) {
+	uuid := Parse(in)
+	if ok := (uuid != nil); ok != tt.isuuid {
+		t.Errorf("Parse(%s) got %v expected %v\b", in, ok, tt.isuuid)
+	}
+	if uuid == nil {
+		return
+	}
+
+	if v := uuid.Variant(); v != tt.variant {
+		t.Errorf("Variant(%s) got %d expected %d\b", in, v, tt.variant)
+	}
+	if v, _ := uuid.Version(); v != tt.version {
+		t.Errorf("Version(%s) got %d expected %d\b", in, v, tt.version)
+	}
+}
+
+func TestUUID(t *testing.T) {
+	for _, tt := range tests {
+		testTest(t, tt.in, tt)
+		testTest(t, strings.ToUpper(tt.in), tt)
+	}
+}
+
+func TestConstants(t *testing.T) {
+	for x, tt := range constants {
+		v, ok := tt.c.(fmt.Stringer)
+		if !ok {
+			t.Errorf("%x: %v: not a stringer", x, v)
+		} else if s := v.String(); s != tt.name {
+			v, _ := tt.c.(int)
+			t.Errorf("%x: Constant %T:%d gives %q, expected %q\n", x, tt.c, v, s, tt.name)
+		}
+	}
+}
+
+func TestRandomUUID(t *testing.T) {
+	m := make(map[string]bool)
+	for x := 1; x < 32; x++ {
+		uuid := NewRandom()
+		s := uuid.String()
+		if m[s] {
+			t.Errorf("NewRandom returned duplicated UUID %s\n", s)
+		}
+		m[s] = true
+		if v, _ := uuid.Version(); v != 4 {
+			t.Errorf("Random UUID of version %s\n", v)
+		}
+		if uuid.Variant() != RFC4122 {
+			t.Errorf("Random UUID is variant %d\n", uuid.Variant())
+		}
+	}
+}
+
+func TestNew(t *testing.T) {
+	m := make(map[string]bool)
+	for x := 1; x < 32; x++ {
+		s := New()
+		if m[s] {
+			t.Errorf("New returned duplicated UUID %s\n", s)
+		}
+		m[s] = true
+		uuid := Parse(s)
+		if uuid == nil {
+			t.Errorf("New returned %q which does not decode\n", s)
+			continue
+		}
+		if v, _ := uuid.Version(); v != 4 {
+			t.Errorf("Random UUID of version %s\n", v)
+		}
+		if uuid.Variant() != RFC4122 {
+			t.Errorf("Random UUID is variant %d\n", uuid.Variant())
+		}
+	}
+}
+
+func clockSeq(t *testing.T, uuid UUID) int {
+	seq, ok := uuid.ClockSequence()
+	if !ok {
+		t.Fatalf("%s: invalid clock sequence\n", uuid)
+	}
+	return seq
+}
+
+func TestClockSeq(t *testing.T) {
+	// Fake time.Now for this test to return a monotonically advancing time; restore it at end.
+	defer func(orig func() time.Time) { timeNow = orig }(timeNow)
+	monTime := time.Now()
+	timeNow = func() time.Time {
+		monTime = monTime.Add(1 * time.Second)
+		return monTime
+	}
+
+	SetClockSequence(-1)
+	uuid1 := NewUUID()
+	uuid2 := NewUUID()
+
+	if clockSeq(t, uuid1) != clockSeq(t, uuid2) {
+		t.Errorf("clock sequence %d != %d\n", clockSeq(t, uuid1), clockSeq(t, uuid2))
+	}
+
+	SetClockSequence(-1)
+	uuid2 = NewUUID()
+
+	// Just on the very off chance we generated the same sequence
+	// two times we try again.
+	if clockSeq(t, uuid1) == clockSeq(t, uuid2) {
+		SetClockSequence(-1)
+		uuid2 = NewUUID()
+	}
+	if clockSeq(t, uuid1) == clockSeq(t, uuid2) {
+		t.Errorf("Duplicate clock sequence %d\n", clockSeq(t, uuid1))
+	}
+
+	SetClockSequence(0x1234)
+	uuid1 = NewUUID()
+	if seq := clockSeq(t, uuid1); seq != 0x1234 {
+		t.Errorf("%s: expected seq 0x1234 got 0x%04x\n", uuid1, seq)
+	}
+}
+
+func TestCoding(t *testing.T) {
+	text := "7d444840-9dc0-11d1-b245-5ffdce74fad2"
+	urn := "urn:uuid:7d444840-9dc0-11d1-b245-5ffdce74fad2"
+	data := UUID{
+		0x7d, 0x44, 0x48, 0x40,
+		0x9d, 0xc0,
+		0x11, 0xd1,
+		0xb2, 0x45,
+		0x5f, 0xfd, 0xce, 0x74, 0xfa, 0xd2,
+	}
+	if v := data.String(); v != text {
+		t.Errorf("%x: encoded to %s, expected %s\n", data, v, text)
+	}
+	if v := data.URN(); v != urn {
+		t.Errorf("%x: urn is %s, expected %s\n", data, v, urn)
+	}
+
+	uuid := Parse(text)
+	if !Equal(uuid, data) {
+		t.Errorf("%s: decoded to %s, expected %s\n", text, uuid, data)
+	}
+}
+
+func TestVersion1(t *testing.T) {
+	uuid1 := NewUUID()
+	uuid2 := NewUUID()
+
+	if Equal(uuid1, uuid2) {
+		t.Errorf("%s:duplicate uuid\n", uuid1)
+	}
+	if v, _ := uuid1.Version(); v != 1 {
+		t.Errorf("%s: version %s expected 1\n", uuid1, v)
+	}
+	if v, _ := uuid2.Version(); v != 1 {
+		t.Errorf("%s: version %s expected 1\n", uuid2, v)
+	}
+	n1 := uuid1.NodeID()
+	n2 := uuid2.NodeID()
+	if !bytes.Equal(n1, n2) {
+		t.Errorf("Different nodes %x != %x\n", n1, n2)
+	}
+	t1, ok := uuid1.Time()
+	if !ok {
+		t.Errorf("%s: invalid time\n", uuid1)
+	}
+	t2, ok := uuid2.Time()
+	if !ok {
+		t.Errorf("%s: invalid time\n", uuid2)
+	}
+	q1, ok := uuid1.ClockSequence()
+	if !ok {
+		t.Errorf("%s: invalid clock sequence\n", uuid1)
+	}
+	q2, ok := uuid2.ClockSequence()
+	if !ok {
+		t.Errorf("%s: invalid clock sequence", uuid2)
+	}
+
+	switch {
+	case t1 == t2 && q1 == q2:
+		t.Errorf("time stopped\n")
+	case t1 > t2 && q1 == q2:
+		t.Errorf("time reversed\n")
+	case t1 < t2 && q1 != q2:
+		t.Errorf("clock sequence chaned unexpectedly\n")
+	}
+}
+
+func TestNodeAndTime(t *testing.T) {
+	// Time is February 5, 1998 12:30:23.136364800 AM GMT
+
+	uuid := Parse("7d444840-9dc0-11d1-b245-5ffdce74fad2")
+	node := []byte{0x5f, 0xfd, 0xce, 0x74, 0xfa, 0xd2}
+
+	ts, ok := uuid.Time()
+	if ok {
+		c := time.Unix(ts.UnixTime())
+		want := time.Date(1998, 2, 5, 0, 30, 23, 136364800, time.UTC)
+		if !c.Equal(want) {
+			t.Errorf("Got time %v, want %v", c, want)
+		}
+	} else {
+		t.Errorf("%s: bad time\n", uuid)
+	}
+	if !bytes.Equal(node, uuid.NodeID()) {
+		t.Errorf("Expected node %v got %v\n", node, uuid.NodeID())
+	}
+}
+
+func TestMD5(t *testing.T) {
+	uuid := NewMD5(NameSpace_DNS, []byte("python.org")).String()
+	want := "6fa459ea-ee8a-3ca4-894e-db77e160355e"
+	if uuid != want {
+		t.Errorf("MD5: got %q expected %q\n", uuid, want)
+	}
+}
+
+func TestSHA1(t *testing.T) {
+	uuid := NewSHA1(NameSpace_DNS, []byte("python.org")).String()
+	want := "886313e1-3b8a-5372-9b90-0c9aee199e5d"
+	if uuid != want {
+		t.Errorf("SHA1: got %q expected %q\n", uuid, want)
+	}
+}
+
+func TestNodeID(t *testing.T) {
+	nid := []byte{1, 2, 3, 4, 5, 6}
+	SetNodeInterface("")
+	s := NodeInterface()
+	if s == "" || s == "user" {
+		t.Errorf("NodeInterface %q after SetInteface\n", s)
+	}
+	node1 := NodeID()
+	if node1 == nil {
+		t.Errorf("NodeID nil after SetNodeInterface\n", s)
+	}
+	SetNodeID(nid)
+	s = NodeInterface()
+	if s != "user" {
+		t.Errorf("Expected NodeInterface %q got %q\n", "user", s)
+	}
+	node2 := NodeID()
+	if node2 == nil {
+		t.Errorf("NodeID nil after SetNodeID\n", s)
+	}
+	if bytes.Equal(node1, node2) {
+		t.Errorf("NodeID not changed after SetNodeID\n", s)
+	} else if !bytes.Equal(nid, node2) {
+		t.Errorf("NodeID is %x, expected %x\n", node2, nid)
+	}
+}
+
+func testDCE(t *testing.T, name string, uuid UUID, domain Domain, id uint32) {
+	if uuid == nil {
+		t.Errorf("%s failed\n", name)
+		return
+	}
+	if v, _ := uuid.Version(); v != 2 {
+		t.Errorf("%s: %s: expected version 2, got %s\n", name, uuid, v)
+		return
+	}
+	if v, ok := uuid.Domain(); !ok || v != domain {
+		if !ok {
+			t.Errorf("%s: %d: Domain failed\n", name, uuid)
+		} else {
+			t.Errorf("%s: %s: expected domain %d, got %d\n", name, uuid, domain, v)
+		}
+	}
+	if v, ok := uuid.Id(); !ok || v != id {
+		if !ok {
+			t.Errorf("%s: %d: Id failed\n", name, uuid)
+		} else {
+			t.Errorf("%s: %s: expected id %d, got %d\n", name, uuid, id, v)
+		}
+	}
+}
+
+func TestDCE(t *testing.T) {
+	testDCE(t, "NewDCESecurity", NewDCESecurity(42, 12345678), 42, 12345678)
+	testDCE(t, "NewDCEPerson", NewDCEPerson(), Person, uint32(os.Getuid()))
+	testDCE(t, "NewDCEGroup", NewDCEGroup(), Group, uint32(os.Getgid()))
+}
+
+type badRand struct{}
+
+func (r badRand) Read(buf []byte) (int, error) {
+	for i, _ := range buf {
+		buf[i] = byte(i)
+	}
+	return len(buf), nil
+}
+
+func TestBadRand(t *testing.T) {
+	SetRand(badRand{})
+	uuid1 := New()
+	uuid2 := New()
+	if uuid1 != uuid2 {
+		t.Errorf("execpted duplicates, got %q and %q\n", uuid1, uuid2)
+	}
+	SetRand(nil)
+	uuid1 = New()
+	uuid2 = New()
+	if uuid1 == uuid2 {
+		t.Errorf("unexecpted duplicates, got %q\n", uuid1)
+	}
+}
diff --git a/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/version1.go b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/version1.go
new file mode 100644
index 00000000..0127eacf
--- /dev/null
+++ b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/version1.go
@@ -0,0 +1,41 @@
+// Copyright 2011 Google Inc.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package uuid
+
+import (
+	"encoding/binary"
+)
+
+// NewUUID returns a Version 1 UUID based on the current NodeID and clock
+// sequence, and the current time.  If the NodeID has not been set by SetNodeID
+// or SetNodeInterface then it will be set automatically.  If the NodeID cannot
+// be set NewUUID returns nil.  If clock sequence has not been set by
+// SetClockSequence then it will be set automatically.  If GetTime fails to
+// return the current NewUUID returns nil.
+func NewUUID() UUID {
+	if nodeID == nil {
+		SetNodeInterface("")
+	}
+
+	now, seq, err := GetTime()
+	if err != nil {
+		return nil
+	}
+
+	uuid := make([]byte, 16)
+
+	time_low := uint32(now & 0xffffffff)
+	time_mid := uint16((now >> 32) & 0xffff)
+	time_hi := uint16((now >> 48) & 0x0fff)
+	time_hi |= 0x1000 // Version 1
+
+	binary.BigEndian.PutUint32(uuid[0:], time_low)
+	binary.BigEndian.PutUint16(uuid[4:], time_mid)
+	binary.BigEndian.PutUint16(uuid[6:], time_hi)
+	binary.BigEndian.PutUint16(uuid[8:], seq)
+	copy(uuid[10:], nodeID)
+
+	return uuid
+}
diff --git a/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/version4.go b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/version4.go
new file mode 100644
index 00000000..b3d4a368
--- /dev/null
+++ b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/version4.go
@@ -0,0 +1,25 @@
+// Copyright 2011 Google Inc.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package uuid
+
+// Random returns a Random (Version 4) UUID or panics.
+//
+// The strength of the UUIDs is based on the strength of the crypto/rand
+// package.
+//
+// A note about uniqueness derived from from the UUID Wikipedia entry:
+//
+//  Randomly generated UUIDs have 122 random bits.  One's annual risk of being
+//  hit by a meteorite is estimated to be one chance in 17 billion, that
+//  means the probability is about 0.00000000006 (6 × 10−11),
+//  equivalent to the odds of creating a few tens of trillions of UUIDs in a
+//  year and having one duplicate.
+func NewRandom() UUID {
+	uuid := make([]byte, 16)
+	randomBits([]byte(uuid))
+	uuid[6] = (uuid[6] & 0x0f) | 0x40 // Version 4
+	uuid[8] = (uuid[8] & 0x3f) | 0x80 // Variant is 10
+	return uuid
+}
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/.gitignore b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/.gitignore
new file mode 100644
index 00000000..bf2ff737
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/.gitignore
@@ -0,0 +1,7 @@
+*.sublime-*
+.DS_Store
+*.swp
+#*.*#
+tags
+goquery.test
+
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/.travis.yml b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/.travis.yml
new file mode 100644
index 00000000..cb8f4d68
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/.travis.yml
@@ -0,0 +1,7 @@
+language: go
+
+go:
+    - 1.1
+    - 1.2
+    - 1.3
+    - tip
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/LICENSE b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/LICENSE
new file mode 100644
index 00000000..6455cec6
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/LICENSE
@@ -0,0 +1,12 @@
+Copyright (c) 2012-2014, Martin Angers & Contributors
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+* Neither the name of the author nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/README.md b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/README.md
new file mode 100644
index 00000000..085db981
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/README.md
@@ -0,0 +1,113 @@
+# goquery - a little like that j-thing, only in Go
+
+[![build status](https://secure.travis-ci.org/PuerkitoBio/goquery.png)](http://travis-ci.org/PuerkitoBio/goquery)
+
+[![GoDoc](https://godoc.org/github.com/PuerkitoBio/goquery?status.png)](http://godoc.org/github.com/PuerkitoBio/goquery)
+
+goquery brings a syntax and a set of features similar to [jQuery][] to the [Go language][go]. It is based on Go's [net/html package][html] and the CSS Selector library [cascadia][]. Since the net/html parser returns nodes, and not a full-featured DOM tree, jQuery's stateful manipulation functions (like height(), css(), detach()) have been left off.
+
+Also, because the net/html parser requires UTF-8 encoding, so does goquery: it is the caller's responsibility to ensure that the source document provides UTF-8 encoded HTML. See the [wiki][] for various options to do this.
+
+Syntax-wise, it is as close as possible to jQuery, with the same function names when possible, and that warm and fuzzy chainable interface. jQuery being the ultra-popular library that it is, I felt that writing a similar HTML-manipulating library was better to follow its API than to start anew (in the same spirit as Go's `fmt` package), even though some of its methods are less than intuitive (looking at you, [index()][index]...).
+
+## Installation
+
+Please note that because of the net/html dependency, goquery requires Go1.1+.
+
+    $ go get github.com/PuerkitoBio/goquery
+
+(optional) To run unit tests:
+    
+    $ cd $GOPATH/src/github.com/PuerkitoBio/goquery
+    $ go test
+
+(optional) To run benchmarks (warning: it runs for a few minutes):
+
+    $ cd $GOPATH/src/github.com/PuerkitoBio/goquery
+    $ go test -bench=".*"
+
+## Changelog
+
+**Note that goquery's API is now stable, and will not break.**
+
+*    **2015-04-20** : Add `AttrOr` helper method to return the attribute's value or a default value if absent. Thanks to [piotrkowalczuk][piotr].
+*    **2015-02-04** : Add more manipulation functions - Prepend* - thanks again to [Andrew Stone][thatguystone].
+*    **2014-11-28** : Add more manipulation functions - ReplaceWith*, Wrap* and Unwrap - thanks again to [Andrew Stone][thatguystone].
+*    **2014-11-07** : Add manipulation functions (thanks to [Andrew Stone][thatguystone]) and `*Matcher` functions, that receive compiled cascadia selectors instead of selector strings, thus avoiding potential panics thrown by goquery via `cascadia.MustCompile` calls. This results in better performance (selectors can be compiled once and reused) and more idiomatic error handling (you can handle cascadia's compilation errors, instead of recovering from panics, which had been bugging me for a long time). Note that the actual type expected is a `Matcher` interface, that `cascadia.Selector` implements. Other matcher implementations could be used.
+*    **2014-11-06** : Change import paths of net/html to golang.org/x/net/html (see https://groups.google.com/forum/#!topic/golang-nuts/eD8dh3T9yyA). Make sure to update your code to use the new import path too when you call goquery with `html.Node`s.
+*    **v0.3.2** : Add `NewDocumentFromReader()` (thanks jweir) which allows creating a goquery document from an io.Reader.
+*    **v0.3.1** : Add `NewDocumentFromResponse()` (thanks assassingj) which allows creating a goquery document from an http response.
+*    **v0.3.0** : Add `EachWithBreak()` which allows to break out of an `Each()` loop by returning false. This function was added instead of changing the existing `Each()` to avoid breaking compatibility.
+*    **v0.2.1** : Make go-getable, now that [go.net/html is Go1.0-compatible][gonet] (thanks to @matrixik for pointing this out).
+*    **v0.2.0** : Add support for negative indices in Slice(). **BREAKING CHANGE** `Document.Root` is removed, `Document` is now a `Selection` itself (a selection of one, the root element, just like `Document.Root` was before). Add jQuery's Closest() method.
+*    **v0.1.1** : Add benchmarks to use as baseline for refactorings, refactor Next...() and Prev...() methods to use the new html package's linked list features (Next/PrevSibling, FirstChild). Good performance boost (40+% in some cases).
+*    **v0.1.0** : Initial release.
+
+## API
+
+goquery exposes two structs, `Document` and `Selection`, and the `Matcher` interface. Unlike jQuery, which is loaded as part of a DOM document, and thus acts on its containing document, goquery doesn't know which HTML document to act upon. So it needs to be told, and that's what the `Document` type is for. It holds the root document node as the initial Selection value to manipulate.
+
+jQuery often has many variants for the same function (no argument, a selector string argument, a jQuery object argument, a DOM element argument, ...). Instead of exposing the same features in goquery as a single method with variadic empty interface arguments, statically-typed signatures are used following this naming convention:
+
+*    When the jQuery equivalent can be called with no argument, it has the same name as jQuery for the no argument signature (e.g.: `Prev()`), and the version with a selector string argument is called `XxxFiltered()` (e.g.: `PrevFiltered()`)
+*    When the jQuery equivalent **requires** one argument, the same name as jQuery is used for the selector string version (e.g.: `Is()`)
+*    The signatures accepting a jQuery object as argument are defined in goquery as `XxxSelection()` and take a `*Selection` object as argument (e.g.: `FilterSelection()`)
+*    The signatures accepting a DOM element as argument in jQuery are defined in goquery as `XxxNodes()` and take a variadic argument of type `*html.Node` (e.g.: `FilterNodes()`)
+*    The signatures accepting a function as argument in jQuery are defined in goquery as `XxxFunction()` and take a function as argument (e.g.: `FilterFunction()`)
+*    The goquery methods that can be called with a selector string have a corresponding version that take a `Matcher` interface and are defined as `XxxMatcher()` (e.g.: `IsMatcher()`)
+
+The complete [godoc reference documentation can be found here][doc].
+
+Please note that Cascadia's selectors do not necessarily match all supported selectors of jQuery (Sizzle). See the [cascadia project][cascadia] for details.
+
+## Examples
+
+See some tips and tricks in the [wiki][].
+
+Taken (and adapted as if executed from outside the goquery package) from example_test.go:
+
+```Go
+package main
+
+import (
+  "fmt"
+  "log"
+
+  "github.com/PuerkitoBio/goquery"
+)
+
+func ExampleScrape() {
+  doc, err := goquery.NewDocument("http://metalsucks.net") 
+  if err != nil {
+    log.Fatal(err)
+  }
+
+  doc.Find(".reviews-wrap article .review-rhs").Each(func(i int, s *goquery.Selection) {
+    band := s.Find("h3").Text()
+    title := s.Find("i").Text()
+    fmt.Printf("Review %d: %s - %s\n", i, band, title)
+  })
+}
+
+func main() {
+  ExampleScrape()
+}
+```
+
+## License
+
+The [BSD 3-Clause license][bsd], the same as the [Go language][golic]. Cascadia's license is [here][caslic].
+
+[jquery]: http://jquery.com/
+[go]: http://golang.org/
+[cascadia]: https://github.com/andybalholm/cascadia
+[bsd]: http://opensource.org/licenses/BSD-3-Clause
+[golic]: http://golang.org/LICENSE
+[caslic]: https://github.com/andybalholm/cascadia/blob/master/LICENSE
+[doc]: http://godoc.org/github.com/PuerkitoBio/goquery
+[index]: http://api.jquery.com/index/
+[gonet]: https://github.com/golang/net/
+[html]: http://godoc.org/golang.org/x/net/html
+[wiki]: https://github.com/PuerkitoBio/goquery/wiki/Tips-and-tricks
+[thatguystone]: https://github.com/thatguystone
+[piotr]: https://github.com/piotrkowalczuk
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/array.go b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/array.go
new file mode 100644
index 00000000..d7af5eee
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/array.go
@@ -0,0 +1,103 @@
+package goquery
+
+import (
+	"golang.org/x/net/html"
+)
+
+// First reduces the set of matched elements to the first in the set.
+// It returns a new Selection object, and an empty Selection object if the
+// the selection is empty.
+func (s *Selection) First() *Selection {
+	return s.Eq(0)
+}
+
+// Last reduces the set of matched elements to the last in the set.
+// It returns a new Selection object, and an empty Selection object if
+// the selection is empty.
+func (s *Selection) Last() *Selection {
+	return s.Eq(-1)
+}
+
+// Eq reduces the set of matched elements to the one at the specified index.
+// If a negative index is given, it counts backwards starting at the end of the
+// set. It returns a new Selection object, and an empty Selection object if the
+// index is invalid.
+func (s *Selection) Eq(index int) *Selection {
+	if index < 0 {
+		index += len(s.Nodes)
+	}
+
+	if index >= len(s.Nodes) || index < 0 {
+		return newEmptySelection(s.document)
+	}
+
+	return s.Slice(index, index+1)
+}
+
+// Slice reduces the set of matched elements to a subset specified by a range
+// of indices.
+func (s *Selection) Slice(start, end int) *Selection {
+	if start < 0 {
+		start += len(s.Nodes)
+	}
+	if end < 0 {
+		end += len(s.Nodes)
+	}
+	return pushStack(s, s.Nodes[start:end])
+}
+
+// Get retrieves the underlying node at the specified index.
+// Get without parameter is not implemented, since the node array is available
+// on the Selection object.
+func (s *Selection) Get(index int) *html.Node {
+	if index < 0 {
+		index += len(s.Nodes) // Negative index gets from the end
+	}
+	return s.Nodes[index]
+}
+
+// Index returns the position of the first element within the Selection object
+// relative to its sibling elements.
+func (s *Selection) Index() int {
+	if len(s.Nodes) > 0 {
+		return newSingleSelection(s.Nodes[0], s.document).PrevAll().Length()
+	}
+	return -1
+}
+
+// IndexSelector returns the position of the first element within the
+// Selection object relative to the elements matched by the selector, or -1 if
+// not found.
+func (s *Selection) IndexSelector(selector string) int {
+	if len(s.Nodes) > 0 {
+		sel := s.document.Find(selector)
+		return indexInSlice(sel.Nodes, s.Nodes[0])
+	}
+	return -1
+}
+
+// IndexMatcher returns the position of the first element within the
+// Selection object relative to the elements matched by the matcher, or -1 if
+// not found.
+func (s *Selection) IndexMatcher(m Matcher) int {
+	if len(s.Nodes) > 0 {
+		sel := s.document.FindMatcher(m)
+		return indexInSlice(sel.Nodes, s.Nodes[0])
+	}
+	return -1
+}
+
+// IndexOfNode returns the position of the specified node within the Selection
+// object, or -1 if not found.
+func (s *Selection) IndexOfNode(node *html.Node) int {
+	return indexInSlice(s.Nodes, node)
+}
+
+// IndexOfSelection returns the position of the first node in the specified
+// Selection object within this Selection object, or -1 if not found.
+func (s *Selection) IndexOfSelection(sel *Selection) int {
+	if sel != nil && len(sel.Nodes) > 0 {
+		return indexInSlice(s.Nodes, sel.Nodes[0])
+	}
+	return -1
+}
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/array_test.go b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/array_test.go
new file mode 100644
index 00000000..1dda5256
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/array_test.go
@@ -0,0 +1,180 @@
+package goquery
+
+import (
+	"testing"
+)
+
+func TestFirst(t *testing.T) {
+	sel := Doc().Find(".pvk-content").First()
+	assertLength(t, sel.Nodes, 1)
+}
+
+func TestFirstEmpty(t *testing.T) {
+	sel := Doc().Find(".pvk-zzcontentzz").First()
+	assertLength(t, sel.Nodes, 0)
+}
+
+func TestFirstRollback(t *testing.T) {
+	sel := Doc().Find(".pvk-content")
+	sel2 := sel.First().End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestLast(t *testing.T) {
+	sel := Doc().Find(".pvk-content").Last()
+	assertLength(t, sel.Nodes, 1)
+
+	// Should contain Footer
+	foot := Doc().Find(".footer")
+	if !sel.Contains(foot.Nodes[0]) {
+		t.Error("Last .pvk-content should contain .footer.")
+	}
+}
+
+func TestLastEmpty(t *testing.T) {
+	sel := Doc().Find(".pvk-zzcontentzz").Last()
+	assertLength(t, sel.Nodes, 0)
+}
+
+func TestLastRollback(t *testing.T) {
+	sel := Doc().Find(".pvk-content")
+	sel2 := sel.Last().End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestEq(t *testing.T) {
+	sel := Doc().Find(".pvk-content").Eq(1)
+	assertLength(t, sel.Nodes, 1)
+}
+
+func TestEqNegative(t *testing.T) {
+	sel := Doc().Find(".pvk-content").Eq(-1)
+	assertLength(t, sel.Nodes, 1)
+
+	// Should contain Footer
+	foot := Doc().Find(".footer")
+	if !sel.Contains(foot.Nodes[0]) {
+		t.Error("Index -1 of .pvk-content should contain .footer.")
+	}
+}
+
+func TestEqEmpty(t *testing.T) {
+	sel := Doc().Find("something_random_that_does_not_exists").Eq(0)
+	assertLength(t, sel.Nodes, 0)
+}
+
+func TestEqInvalidPositive(t *testing.T) {
+	sel := Doc().Find(".pvk-content").Eq(3)
+	assertLength(t, sel.Nodes, 0)
+}
+
+func TestEqInvalidNegative(t *testing.T) {
+	sel := Doc().Find(".pvk-content").Eq(-4)
+	assertLength(t, sel.Nodes, 0)
+}
+
+func TestEqRollback(t *testing.T) {
+	sel := Doc().Find(".pvk-content")
+	sel2 := sel.Eq(1).End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestSlice(t *testing.T) {
+	sel := Doc().Find(".pvk-content").Slice(0, 2)
+
+	assertLength(t, sel.Nodes, 2)
+}
+
+func TestSliceOutOfBounds(t *testing.T) {
+	defer assertPanic(t)
+	Doc().Find(".pvk-content").Slice(2, 12)
+}
+
+func TestNegativeSliceStart(t *testing.T) {
+	sel := Doc().Find(".container-fluid").Slice(-2, 3)
+	assertLength(t, sel.Nodes, 1)
+	assertSelectionIs(t, sel.Eq(0), "#cf3")
+}
+
+func TestNegativeSliceEnd(t *testing.T) {
+	sel := Doc().Find(".container-fluid").Slice(1, -1)
+	assertLength(t, sel.Nodes, 2)
+	assertSelectionIs(t, sel.Eq(0), "#cf2")
+	assertSelectionIs(t, sel.Eq(1), "#cf3")
+}
+
+func TestNegativeSliceBoth(t *testing.T) {
+	sel := Doc().Find(".container-fluid").Slice(-3, -1)
+	assertLength(t, sel.Nodes, 2)
+	assertSelectionIs(t, sel.Eq(0), "#cf2")
+	assertSelectionIs(t, sel.Eq(1), "#cf3")
+}
+
+func TestNegativeSliceOutOfBounds(t *testing.T) {
+	defer assertPanic(t)
+	Doc().Find(".container-fluid").Slice(-12, -7)
+}
+
+func TestSliceRollback(t *testing.T) {
+	sel := Doc().Find(".pvk-content")
+	sel2 := sel.Slice(0, 2).End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestGet(t *testing.T) {
+	sel := Doc().Find(".pvk-content")
+	node := sel.Get(1)
+	if sel.Nodes[1] != node {
+		t.Errorf("Expected node %v to be %v.", node, sel.Nodes[1])
+	}
+}
+
+func TestGetNegative(t *testing.T) {
+	sel := Doc().Find(".pvk-content")
+	node := sel.Get(-3)
+	if sel.Nodes[0] != node {
+		t.Errorf("Expected node %v to be %v.", node, sel.Nodes[0])
+	}
+}
+
+func TestGetInvalid(t *testing.T) {
+	defer assertPanic(t)
+	sel := Doc().Find(".pvk-content")
+	sel.Get(129)
+}
+
+func TestIndex(t *testing.T) {
+	sel := Doc().Find(".pvk-content")
+	if i := sel.Index(); i != 1 {
+		t.Errorf("Expected index of 1, got %v.", i)
+	}
+}
+
+func TestIndexSelector(t *testing.T) {
+	sel := Doc().Find(".hero-unit")
+	if i := sel.IndexSelector("div"); i != 4 {
+		t.Errorf("Expected index of 4, got %v.", i)
+	}
+}
+
+func TestIndexOfNode(t *testing.T) {
+	sel := Doc().Find("div.pvk-gutter")
+	if i := sel.IndexOfNode(sel.Nodes[1]); i != 1 {
+		t.Errorf("Expected index of 1, got %v.", i)
+	}
+}
+
+func TestIndexOfNilNode(t *testing.T) {
+	sel := Doc().Find("div.pvk-gutter")
+	if i := sel.IndexOfNode(nil); i != -1 {
+		t.Errorf("Expected index of -1, got %v.", i)
+	}
+}
+
+func TestIndexOfSelection(t *testing.T) {
+	sel := Doc().Find("div")
+	sel2 := Doc().Find(".hero-unit")
+	if i := sel.IndexOfSelection(sel2); i != 4 {
+		t.Errorf("Expected index of 4, got %v.", i)
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench/v0.1.0 b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench/v0.1.0
new file mode 100644
index 00000000..eb584783
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench/v0.1.0
@@ -0,0 +1,436 @@
+PASS
+BenchmarkFirst	20000000	        92.9 ns/op
+BenchmarkLast	20000000	        91.6 ns/op
+BenchmarkEq	20000000	        90.6 ns/op
+BenchmarkSlice	20000000	        86.7 ns/op
+BenchmarkGet	1000000000	         2.14 ns/op
+BenchmarkIndex	  500000	      5308 ns/op
+--- BENCH: BenchmarkIndex
+	bench_array_test.go:73: Index=3
+	bench_array_test.go:73: Index=3
+	bench_array_test.go:73: Index=3
+	bench_array_test.go:73: Index=3
+BenchmarkIndexSelector	   50000	     54962 ns/op
+--- BENCH: BenchmarkIndexSelector
+	bench_array_test.go:85: IndexSelector=4
+	bench_array_test.go:85: IndexSelector=4
+	bench_array_test.go:85: IndexSelector=4
+	bench_array_test.go:85: IndexSelector=4
+BenchmarkIndexOfNode	100000000	        11.4 ns/op
+--- BENCH: BenchmarkIndexOfNode
+	bench_array_test.go:99: IndexOfNode=2
+	bench_array_test.go:99: IndexOfNode=2
+	bench_array_test.go:99: IndexOfNode=2
+	bench_array_test.go:99: IndexOfNode=2
+	bench_array_test.go:99: IndexOfNode=2
+BenchmarkIndexOfSelection	100000000	        12.1 ns/op
+--- BENCH: BenchmarkIndexOfSelection
+	bench_array_test.go:111: IndexOfSelection=2
+	bench_array_test.go:111: IndexOfSelection=2
+	bench_array_test.go:111: IndexOfSelection=2
+	bench_array_test.go:111: IndexOfSelection=2
+	bench_array_test.go:111: IndexOfSelection=2
+BenchmarkMetalReviewExample	    5000	    327144 ns/op
+--- BENCH: BenchmarkMetalReviewExample
+	bench_example_test.go:40: Review 0: Midnight - Complete and Total Hell (8.5).
+		Review 1: Over Your Threshold - Facticity (6.0).
+		Review 2: Nuclear Death Terror - Chaos Reigns (7.5).
+		Review 3: Evoken - Atra Mors (9.5).
+		
+	bench_example_test.go:41: MetalReviewExample=10
+	bench_example_test.go:40: Review 0: Midnight - Complete and Total Hell (8.5).
+		Review 1: Over Your Threshold - Facticity (6.0).
+		Review 2: Nuclear Death Terror - Chaos Reigns (7.5).
+		Review 3: Evoken - Atra Mors (9.5).
+	... [output truncated]
+BenchmarkAdd	   50000	     52945 ns/op
+--- BENCH: BenchmarkAdd
+	bench_expand_test.go:20: Add=43
+	bench_expand_test.go:20: Add=43
+	bench_expand_test.go:20: Add=43
+	bench_expand_test.go:20: Add=43
+BenchmarkAddSelection	10000000	       205 ns/op
+--- BENCH: BenchmarkAddSelection
+	bench_expand_test.go:37: AddSelection=43
+	bench_expand_test.go:37: AddSelection=43
+	bench_expand_test.go:37: AddSelection=43
+	bench_expand_test.go:37: AddSelection=43
+	bench_expand_test.go:37: AddSelection=43
+BenchmarkAddNodes	10000000	       203 ns/op
+--- BENCH: BenchmarkAddNodes
+	bench_expand_test.go:55: AddNodes=43
+	bench_expand_test.go:55: AddNodes=43
+	bench_expand_test.go:55: AddNodes=43
+	bench_expand_test.go:55: AddNodes=43
+	bench_expand_test.go:55: AddNodes=43
+BenchmarkAndSelf	 1000000	      2639 ns/op
+--- BENCH: BenchmarkAndSelf
+	bench_expand_test.go:71: AndSelf=44
+	bench_expand_test.go:71: AndSelf=44
+	bench_expand_test.go:71: AndSelf=44
+	bench_expand_test.go:71: AndSelf=44
+BenchmarkFilter	   50000	     30182 ns/op
+--- BENCH: BenchmarkFilter
+	bench_filter_test.go:20: Filter=13
+	bench_filter_test.go:20: Filter=13
+	bench_filter_test.go:20: Filter=13
+	bench_filter_test.go:20: Filter=13
+BenchmarkNot	   50000	     34855 ns/op
+--- BENCH: BenchmarkNot
+	bench_filter_test.go:36: Not=371
+	bench_filter_test.go:36: Not=371
+	bench_filter_test.go:36: Not=371
+	bench_filter_test.go:36: Not=371
+BenchmarkFilterFunction	   50000	     66052 ns/op
+--- BENCH: BenchmarkFilterFunction
+	bench_filter_test.go:55: FilterFunction=112
+	bench_filter_test.go:55: FilterFunction=112
+	bench_filter_test.go:55: FilterFunction=112
+	bench_filter_test.go:55: FilterFunction=112
+BenchmarkNotFunction	   50000	     69721 ns/op
+--- BENCH: BenchmarkNotFunction
+	bench_filter_test.go:74: NotFunction=261
+	bench_filter_test.go:74: NotFunction=261
+	bench_filter_test.go:74: NotFunction=261
+	bench_filter_test.go:74: NotFunction=261
+BenchmarkFilterNodes	   50000	     66077 ns/op
+--- BENCH: BenchmarkFilterNodes
+	bench_filter_test.go:92: FilterNodes=2
+	bench_filter_test.go:92: FilterNodes=2
+	bench_filter_test.go:92: FilterNodes=2
+	bench_filter_test.go:92: FilterNodes=2
+BenchmarkNotNodes	   20000	     80021 ns/op
+--- BENCH: BenchmarkNotNodes
+	bench_filter_test.go:110: NotNodes=360
+	bench_filter_test.go:110: NotNodes=360
+	bench_filter_test.go:110: NotNodes=360
+	bench_filter_test.go:110: NotNodes=360
+BenchmarkFilterSelection	   50000	     66256 ns/op
+--- BENCH: BenchmarkFilterSelection
+	bench_filter_test.go:127: FilterSelection=2
+	bench_filter_test.go:127: FilterSelection=2
+	bench_filter_test.go:127: FilterSelection=2
+	bench_filter_test.go:127: FilterSelection=2
+BenchmarkNotSelection	   20000	     79568 ns/op
+--- BENCH: BenchmarkNotSelection
+	bench_filter_test.go:144: NotSelection=360
+	bench_filter_test.go:144: NotSelection=360
+	bench_filter_test.go:144: NotSelection=360
+	bench_filter_test.go:144: NotSelection=360
+BenchmarkHas	    5000	    569441 ns/op
+--- BENCH: BenchmarkHas
+	bench_filter_test.go:160: Has=13
+	bench_filter_test.go:160: Has=13
+	bench_filter_test.go:160: Has=13
+BenchmarkHasNodes	   10000	    230585 ns/op
+--- BENCH: BenchmarkHasNodes
+	bench_filter_test.go:178: HasNodes=15
+	bench_filter_test.go:178: HasNodes=15
+	bench_filter_test.go:178: HasNodes=15
+BenchmarkHasSelection	   10000	    231470 ns/op
+--- BENCH: BenchmarkHasSelection
+	bench_filter_test.go:195: HasSelection=15
+	bench_filter_test.go:195: HasSelection=15
+	bench_filter_test.go:195: HasSelection=15
+BenchmarkEnd	500000000	         4.65 ns/op
+--- BENCH: BenchmarkEnd
+	bench_filter_test.go:211: End=373
+	bench_filter_test.go:211: End=373
+	bench_filter_test.go:211: End=373
+	bench_filter_test.go:211: End=373
+	bench_filter_test.go:211: End=373
+	bench_filter_test.go:211: End=373
+BenchmarkEach	  200000	      9558 ns/op
+--- BENCH: BenchmarkEach
+	bench_iteration_test.go:22: Each=59
+	bench_iteration_test.go:22: Each=59
+	bench_iteration_test.go:22: Each=59
+	bench_iteration_test.go:22: Each=59
+BenchmarkMap	  100000	     16809 ns/op
+--- BENCH: BenchmarkMap
+	bench_iteration_test.go:41: Map=59
+	bench_iteration_test.go:41: Map=59
+	bench_iteration_test.go:41: Map=59
+	bench_iteration_test.go:41: Map=59
+BenchmarkAttr	50000000	        37.5 ns/op
+--- BENCH: BenchmarkAttr
+	bench_property_test.go:16: Attr=firstHeading
+	bench_property_test.go:16: Attr=firstHeading
+	bench_property_test.go:16: Attr=firstHeading
+	bench_property_test.go:16: Attr=firstHeading
+	bench_property_test.go:16: Attr=firstHeading
+BenchmarkText	  100000	     18583 ns/op
+BenchmarkLength	2000000000	         0.80 ns/op
+--- BENCH: BenchmarkLength
+	bench_property_test.go:37: Length=14
+	bench_property_test.go:37: Length=14
+	bench_property_test.go:37: Length=14
+	bench_property_test.go:37: Length=14
+	bench_property_test.go:37: Length=14
+	bench_property_test.go:37: Length=14
+BenchmarkHtml	 5000000	       666 ns/op
+BenchmarkIs	   50000	     34328 ns/op
+--- BENCH: BenchmarkIs
+	bench_query_test.go:16: Is=true
+	bench_query_test.go:16: Is=true
+	bench_query_test.go:16: Is=true
+	bench_query_test.go:16: Is=true
+BenchmarkIsPositional	   50000	     32423 ns/op
+--- BENCH: BenchmarkIsPositional
+	bench_query_test.go:28: IsPositional=true
+	bench_query_test.go:28: IsPositional=true
+	bench_query_test.go:28: IsPositional=true
+	bench_query_test.go:28: IsPositional=true
+BenchmarkIsFunction	 1000000	      2707 ns/op
+--- BENCH: BenchmarkIsFunction
+	bench_query_test.go:43: IsFunction=true
+	bench_query_test.go:43: IsFunction=true
+	bench_query_test.go:43: IsFunction=true
+	bench_query_test.go:43: IsFunction=true
+BenchmarkIsSelection	   50000	     66976 ns/op
+--- BENCH: BenchmarkIsSelection
+	bench_query_test.go:56: IsSelection=true
+	bench_query_test.go:56: IsSelection=true
+	bench_query_test.go:56: IsSelection=true
+	bench_query_test.go:56: IsSelection=true
+BenchmarkIsNodes	   50000	     66740 ns/op
+--- BENCH: BenchmarkIsNodes
+	bench_query_test.go:70: IsNodes=true
+	bench_query_test.go:70: IsNodes=true
+	bench_query_test.go:70: IsNodes=true
+	bench_query_test.go:70: IsNodes=true
+BenchmarkHasClass	    5000	    701722 ns/op
+--- BENCH: BenchmarkHasClass
+	bench_query_test.go:82: HasClass=true
+	bench_query_test.go:82: HasClass=true
+	bench_query_test.go:82: HasClass=true
+BenchmarkContains	100000000	        11.9 ns/op
+--- BENCH: BenchmarkContains
+	bench_query_test.go:96: Contains=true
+	bench_query_test.go:96: Contains=true
+	bench_query_test.go:96: Contains=true
+	bench_query_test.go:96: Contains=true
+	bench_query_test.go:96: Contains=true
+BenchmarkFind	   50000	     55444 ns/op
+--- BENCH: BenchmarkFind
+	bench_traversal_test.go:18: Find=41
+	bench_traversal_test.go:18: Find=41
+	bench_traversal_test.go:18: Find=41
+	bench_traversal_test.go:18: Find=41
+BenchmarkFindWithinSelection	   10000	    127984 ns/op
+--- BENCH: BenchmarkFindWithinSelection
+	bench_traversal_test.go:34: FindWithinSelection=39
+	bench_traversal_test.go:34: FindWithinSelection=39
+	bench_traversal_test.go:34: FindWithinSelection=39
+BenchmarkFindSelection	    5000	    355944 ns/op
+--- BENCH: BenchmarkFindSelection
+	bench_traversal_test.go:51: FindSelection=73
+	bench_traversal_test.go:51: FindSelection=73
+	bench_traversal_test.go:51: FindSelection=73
+BenchmarkFindNodes	    5000	    355596 ns/op
+--- BENCH: BenchmarkFindNodes
+	bench_traversal_test.go:69: FindNodes=73
+	bench_traversal_test.go:69: FindNodes=73
+	bench_traversal_test.go:69: FindNodes=73
+BenchmarkContents	  500000	      5656 ns/op
+--- BENCH: BenchmarkContents
+	bench_traversal_test.go:85: Contents=16
+	bench_traversal_test.go:85: Contents=16
+	bench_traversal_test.go:85: Contents=16
+	bench_traversal_test.go:85: Contents=16
+BenchmarkContentsFiltered	  200000	      9007 ns/op
+--- BENCH: BenchmarkContentsFiltered
+	bench_traversal_test.go:101: ContentsFiltered=1
+	bench_traversal_test.go:101: ContentsFiltered=1
+	bench_traversal_test.go:101: ContentsFiltered=1
+	bench_traversal_test.go:101: ContentsFiltered=1
+BenchmarkChildren	 1000000	      1237 ns/op
+--- BENCH: BenchmarkChildren
+	bench_traversal_test.go:117: Children=2
+	bench_traversal_test.go:117: Children=2
+	bench_traversal_test.go:117: Children=2
+	bench_traversal_test.go:117: Children=2
+BenchmarkChildrenFiltered	  500000	      5613 ns/op
+--- BENCH: BenchmarkChildrenFiltered
+	bench_traversal_test.go:133: ChildrenFiltered=2
+	bench_traversal_test.go:133: ChildrenFiltered=2
+	bench_traversal_test.go:133: ChildrenFiltered=2
+	bench_traversal_test.go:133: ChildrenFiltered=2
+BenchmarkParent	   50000	     47026 ns/op
+--- BENCH: BenchmarkParent
+	bench_traversal_test.go:149: Parent=55
+	bench_traversal_test.go:149: Parent=55
+	bench_traversal_test.go:149: Parent=55
+	bench_traversal_test.go:149: Parent=55
+BenchmarkParentFiltered	   50000	     51438 ns/op
+--- BENCH: BenchmarkParentFiltered
+	bench_traversal_test.go:165: ParentFiltered=4
+	bench_traversal_test.go:165: ParentFiltered=4
+	bench_traversal_test.go:165: ParentFiltered=4
+	bench_traversal_test.go:165: ParentFiltered=4
+BenchmarkParents	   20000	     91820 ns/op
+--- BENCH: BenchmarkParents
+	bench_traversal_test.go:181: Parents=73
+	bench_traversal_test.go:181: Parents=73
+	bench_traversal_test.go:181: Parents=73
+	bench_traversal_test.go:181: Parents=73
+BenchmarkParentsFiltered	   20000	     95156 ns/op
+--- BENCH: BenchmarkParentsFiltered
+	bench_traversal_test.go:197: ParentsFiltered=18
+	bench_traversal_test.go:197: ParentsFiltered=18
+	bench_traversal_test.go:197: ParentsFiltered=18
+	bench_traversal_test.go:197: ParentsFiltered=18
+BenchmarkParentsUntil	   10000	    134383 ns/op
+--- BENCH: BenchmarkParentsUntil
+	bench_traversal_test.go:213: ParentsUntil=52
+	bench_traversal_test.go:213: ParentsUntil=52
+	bench_traversal_test.go:213: ParentsUntil=52
+BenchmarkParentsUntilSelection	   10000	    235456 ns/op
+--- BENCH: BenchmarkParentsUntilSelection
+	bench_traversal_test.go:230: ParentsUntilSelection=70
+	bench_traversal_test.go:230: ParentsUntilSelection=70
+	bench_traversal_test.go:230: ParentsUntilSelection=70
+BenchmarkParentsUntilNodes	   10000	    235936 ns/op
+--- BENCH: BenchmarkParentsUntilNodes
+	bench_traversal_test.go:248: ParentsUntilNodes=70
+	bench_traversal_test.go:248: ParentsUntilNodes=70
+	bench_traversal_test.go:248: ParentsUntilNodes=70
+BenchmarkParentsFilteredUntil	   50000	     32451 ns/op
+--- BENCH: BenchmarkParentsFilteredUntil
+	bench_traversal_test.go:264: ParentsFilteredUntil=2
+	bench_traversal_test.go:264: ParentsFilteredUntil=2
+	bench_traversal_test.go:264: ParentsFilteredUntil=2
+	bench_traversal_test.go:264: ParentsFilteredUntil=2
+BenchmarkParentsFilteredUntilSelection	   50000	     30570 ns/op
+--- BENCH: BenchmarkParentsFilteredUntilSelection
+	bench_traversal_test.go:281: ParentsFilteredUntilSelection=2
+	bench_traversal_test.go:281: ParentsFilteredUntilSelection=2
+	bench_traversal_test.go:281: ParentsFilteredUntilSelection=2
+	bench_traversal_test.go:281: ParentsFilteredUntilSelection=2
+BenchmarkParentsFilteredUntilNodes	   50000	     30729 ns/op
+--- BENCH: BenchmarkParentsFilteredUntilNodes
+	bench_traversal_test.go:299: ParentsFilteredUntilNodes=2
+	bench_traversal_test.go:299: ParentsFilteredUntilNodes=2
+	bench_traversal_test.go:299: ParentsFilteredUntilNodes=2
+	bench_traversal_test.go:299: ParentsFilteredUntilNodes=2
+BenchmarkSiblings	   10000	    106704 ns/op
+--- BENCH: BenchmarkSiblings
+	bench_traversal_test.go:315: Siblings=293
+	bench_traversal_test.go:315: Siblings=293
+	bench_traversal_test.go:315: Siblings=293
+BenchmarkSiblingsFiltered	   10000	    115592 ns/op
+--- BENCH: BenchmarkSiblingsFiltered
+	bench_traversal_test.go:331: SiblingsFiltered=46
+	bench_traversal_test.go:331: SiblingsFiltered=46
+	bench_traversal_test.go:331: SiblingsFiltered=46
+BenchmarkNext	   50000	     54449 ns/op
+--- BENCH: BenchmarkNext
+	bench_traversal_test.go:347: Next=49
+	bench_traversal_test.go:347: Next=49
+	bench_traversal_test.go:347: Next=49
+	bench_traversal_test.go:347: Next=49
+BenchmarkNextFiltered	   50000	     58503 ns/op
+--- BENCH: BenchmarkNextFiltered
+	bench_traversal_test.go:363: NextFiltered=6
+	bench_traversal_test.go:363: NextFiltered=6
+	bench_traversal_test.go:363: NextFiltered=6
+	bench_traversal_test.go:363: NextFiltered=6
+BenchmarkNextAll	   20000	     77698 ns/op
+--- BENCH: BenchmarkNextAll
+	bench_traversal_test.go:379: NextAll=234
+	bench_traversal_test.go:379: NextAll=234
+	bench_traversal_test.go:379: NextAll=234
+	bench_traversal_test.go:379: NextAll=234
+BenchmarkNextAllFiltered	   20000	     85034 ns/op
+--- BENCH: BenchmarkNextAllFiltered
+	bench_traversal_test.go:395: NextAllFiltered=33
+	bench_traversal_test.go:395: NextAllFiltered=33
+	bench_traversal_test.go:395: NextAllFiltered=33
+	bench_traversal_test.go:395: NextAllFiltered=33
+BenchmarkPrev	   50000	     56458 ns/op
+--- BENCH: BenchmarkPrev
+	bench_traversal_test.go:411: Prev=49
+	bench_traversal_test.go:411: Prev=49
+	bench_traversal_test.go:411: Prev=49
+	bench_traversal_test.go:411: Prev=49
+BenchmarkPrevFiltered	   50000	     60163 ns/op
+--- BENCH: BenchmarkPrevFiltered
+	bench_traversal_test.go:429: PrevFiltered=7
+	bench_traversal_test.go:429: PrevFiltered=7
+	bench_traversal_test.go:429: PrevFiltered=7
+	bench_traversal_test.go:429: PrevFiltered=7
+BenchmarkPrevAll	   50000	     47679 ns/op
+--- BENCH: BenchmarkPrevAll
+	bench_traversal_test.go:445: PrevAll=78
+	bench_traversal_test.go:445: PrevAll=78
+	bench_traversal_test.go:445: PrevAll=78
+	bench_traversal_test.go:445: PrevAll=78
+BenchmarkPrevAllFiltered	   50000	     51563 ns/op
+--- BENCH: BenchmarkPrevAllFiltered
+	bench_traversal_test.go:461: PrevAllFiltered=6
+	bench_traversal_test.go:461: PrevAllFiltered=6
+	bench_traversal_test.go:461: PrevAllFiltered=6
+	bench_traversal_test.go:461: PrevAllFiltered=6
+BenchmarkNextUntil	   10000	    213998 ns/op
+--- BENCH: BenchmarkNextUntil
+	bench_traversal_test.go:477: NextUntil=84
+	bench_traversal_test.go:477: NextUntil=84
+	bench_traversal_test.go:477: NextUntil=84
+BenchmarkNextUntilSelection	   10000	    140720 ns/op
+--- BENCH: BenchmarkNextUntilSelection
+	bench_traversal_test.go:494: NextUntilSelection=42
+	bench_traversal_test.go:494: NextUntilSelection=42
+	bench_traversal_test.go:494: NextUntilSelection=42
+BenchmarkNextUntilNodes	   20000	     90702 ns/op
+--- BENCH: BenchmarkNextUntilNodes
+	bench_traversal_test.go:512: NextUntilNodes=12
+	bench_traversal_test.go:512: NextUntilNodes=12
+	bench_traversal_test.go:512: NextUntilNodes=12
+	bench_traversal_test.go:512: NextUntilNodes=12
+BenchmarkPrevUntil	    5000	    456039 ns/op
+--- BENCH: BenchmarkPrevUntil
+	bench_traversal_test.go:528: PrevUntil=238
+	bench_traversal_test.go:528: PrevUntil=238
+	bench_traversal_test.go:528: PrevUntil=238
+BenchmarkPrevUntilSelection	   10000	    167944 ns/op
+--- BENCH: BenchmarkPrevUntilSelection
+	bench_traversal_test.go:545: PrevUntilSelection=49
+	bench_traversal_test.go:545: PrevUntilSelection=49
+	bench_traversal_test.go:545: PrevUntilSelection=49
+BenchmarkPrevUntilNodes	   20000	     82059 ns/op
+--- BENCH: BenchmarkPrevUntilNodes
+	bench_traversal_test.go:563: PrevUntilNodes=11
+	bench_traversal_test.go:563: PrevUntilNodes=11
+	bench_traversal_test.go:563: PrevUntilNodes=11
+	bench_traversal_test.go:563: PrevUntilNodes=11
+BenchmarkNextFilteredUntil	   10000	    150883 ns/op
+--- BENCH: BenchmarkNextFilteredUntil
+	bench_traversal_test.go:579: NextFilteredUntil=22
+	bench_traversal_test.go:579: NextFilteredUntil=22
+	bench_traversal_test.go:579: NextFilteredUntil=22
+BenchmarkNextFilteredUntilSelection	   10000	    146578 ns/op
+--- BENCH: BenchmarkNextFilteredUntilSelection
+	bench_traversal_test.go:596: NextFilteredUntilSelection=22
+	bench_traversal_test.go:596: NextFilteredUntilSelection=22
+	bench_traversal_test.go:596: NextFilteredUntilSelection=22
+BenchmarkNextFilteredUntilNodes	   10000	    148284 ns/op
+--- BENCH: BenchmarkNextFilteredUntilNodes
+	bench_traversal_test.go:614: NextFilteredUntilNodes=22
+	bench_traversal_test.go:614: NextFilteredUntilNodes=22
+	bench_traversal_test.go:614: NextFilteredUntilNodes=22
+BenchmarkPrevFilteredUntil	   10000	    154303 ns/op
+--- BENCH: BenchmarkPrevFilteredUntil
+	bench_traversal_test.go:630: PrevFilteredUntil=20
+	bench_traversal_test.go:630: PrevFilteredUntil=20
+	bench_traversal_test.go:630: PrevFilteredUntil=20
+BenchmarkPrevFilteredUntilSelection	   10000	    149062 ns/op
+--- BENCH: BenchmarkPrevFilteredUntilSelection
+	bench_traversal_test.go:647: PrevFilteredUntilSelection=20
+	bench_traversal_test.go:647: PrevFilteredUntilSelection=20
+	bench_traversal_test.go:647: PrevFilteredUntilSelection=20
+BenchmarkPrevFilteredUntilNodes	   10000	    150584 ns/op
+--- BENCH: BenchmarkPrevFilteredUntilNodes
+	bench_traversal_test.go:665: PrevFilteredUntilNodes=20
+	bench_traversal_test.go:665: PrevFilteredUntilNodes=20
+	bench_traversal_test.go:665: PrevFilteredUntilNodes=20
+ok  	github.com/PuerkitoBio/goquery	188.326s
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench/v0.1.1 b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench/v0.1.1
new file mode 100644
index 00000000..c0d9d06c
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench/v0.1.1
@@ -0,0 +1,438 @@
+PASS
+BenchmarkFirst	20000000	        96.2 ns/op
+BenchmarkLast	20000000	        95.8 ns/op
+BenchmarkEq	20000000	        94.4 ns/op
+BenchmarkSlice	20000000	        89.9 ns/op
+BenchmarkGet	1000000000	         2.31 ns/op
+BenchmarkIndex	 1000000	      1911 ns/op
+--- BENCH: BenchmarkIndex
+	bench_array_test.go:73: Index=3
+	bench_array_test.go:73: Index=3
+	bench_array_test.go:73: Index=3
+	bench_array_test.go:73: Index=3
+BenchmarkIndexSelector	   50000	     56034 ns/op
+--- BENCH: BenchmarkIndexSelector
+	bench_array_test.go:85: IndexSelector=4
+	bench_array_test.go:85: IndexSelector=4
+	bench_array_test.go:85: IndexSelector=4
+	bench_array_test.go:85: IndexSelector=4
+BenchmarkIndexOfNode	100000000	        11.8 ns/op
+--- BENCH: BenchmarkIndexOfNode
+	bench_array_test.go:99: IndexOfNode=2
+	bench_array_test.go:99: IndexOfNode=2
+	bench_array_test.go:99: IndexOfNode=2
+	bench_array_test.go:99: IndexOfNode=2
+	bench_array_test.go:99: IndexOfNode=2
+BenchmarkIndexOfSelection	100000000	        12.1 ns/op
+--- BENCH: BenchmarkIndexOfSelection
+	bench_array_test.go:111: IndexOfSelection=2
+	bench_array_test.go:111: IndexOfSelection=2
+	bench_array_test.go:111: IndexOfSelection=2
+	bench_array_test.go:111: IndexOfSelection=2
+	bench_array_test.go:111: IndexOfSelection=2
+BenchmarkMetalReviewExample	    5000	    336823 ns/op
+--- BENCH: BenchmarkMetalReviewExample
+	bench_example_test.go:40: Review 0: Midnight - Complete and Total Hell (8.5).
+		Review 1: Over Your Threshold - Facticity (6.0).
+		Review 2: Nuclear Death Terror - Chaos Reigns (7.5).
+		Review 3: Evoken - Atra Mors (9.5).
+		
+	bench_example_test.go:41: MetalReviewExample=10
+	bench_example_test.go:40: Review 0: Midnight - Complete and Total Hell (8.5).
+		Review 1: Over Your Threshold - Facticity (6.0).
+		Review 2: Nuclear Death Terror - Chaos Reigns (7.5).
+		Review 3: Evoken - Atra Mors (9.5).
+	... [output truncated]
+BenchmarkAdd	   50000	     54709 ns/op
+--- BENCH: BenchmarkAdd
+	bench_expand_test.go:20: Add=43
+	bench_expand_test.go:20: Add=43
+	bench_expand_test.go:20: Add=43
+	bench_expand_test.go:20: Add=43
+BenchmarkAddSelection	10000000	       209 ns/op
+--- BENCH: BenchmarkAddSelection
+	bench_expand_test.go:37: AddSelection=43
+	bench_expand_test.go:37: AddSelection=43
+	bench_expand_test.go:37: AddSelection=43
+	bench_expand_test.go:37: AddSelection=43
+	bench_expand_test.go:37: AddSelection=43
+BenchmarkAddNodes	10000000	       202 ns/op
+--- BENCH: BenchmarkAddNodes
+	bench_expand_test.go:55: AddNodes=43
+	bench_expand_test.go:55: AddNodes=43
+	bench_expand_test.go:55: AddNodes=43
+	bench_expand_test.go:55: AddNodes=43
+	bench_expand_test.go:55: AddNodes=43
+BenchmarkAndSelf	 1000000	      2634 ns/op
+--- BENCH: BenchmarkAndSelf
+	bench_expand_test.go:71: AndSelf=44
+	bench_expand_test.go:71: AndSelf=44
+	bench_expand_test.go:71: AndSelf=44
+	bench_expand_test.go:71: AndSelf=44
+BenchmarkFilter	   50000	     31049 ns/op
+--- BENCH: BenchmarkFilter
+	bench_filter_test.go:20: Filter=13
+	bench_filter_test.go:20: Filter=13
+	bench_filter_test.go:20: Filter=13
+	bench_filter_test.go:20: Filter=13
+BenchmarkNot	   50000	     35167 ns/op
+--- BENCH: BenchmarkNot
+	bench_filter_test.go:36: Not=371
+	bench_filter_test.go:36: Not=371
+	bench_filter_test.go:36: Not=371
+	bench_filter_test.go:36: Not=371
+BenchmarkFilterFunction	   50000	     68974 ns/op
+--- BENCH: BenchmarkFilterFunction
+	bench_filter_test.go:55: FilterFunction=112
+	bench_filter_test.go:55: FilterFunction=112
+	bench_filter_test.go:55: FilterFunction=112
+	bench_filter_test.go:55: FilterFunction=112
+BenchmarkNotFunction	   50000	     74760 ns/op
+--- BENCH: BenchmarkNotFunction
+	bench_filter_test.go:74: NotFunction=261
+	bench_filter_test.go:74: NotFunction=261
+	bench_filter_test.go:74: NotFunction=261
+	bench_filter_test.go:74: NotFunction=261
+BenchmarkFilterNodes	   50000	     68670 ns/op
+--- BENCH: BenchmarkFilterNodes
+	bench_filter_test.go:92: FilterNodes=2
+	bench_filter_test.go:92: FilterNodes=2
+	bench_filter_test.go:92: FilterNodes=2
+	bench_filter_test.go:92: FilterNodes=2
+BenchmarkNotNodes	   20000	     81357 ns/op
+--- BENCH: BenchmarkNotNodes
+	bench_filter_test.go:110: NotNodes=360
+	bench_filter_test.go:110: NotNodes=360
+	bench_filter_test.go:110: NotNodes=360
+	bench_filter_test.go:110: NotNodes=360
+BenchmarkFilterSelection	   50000	     68388 ns/op
+--- BENCH: BenchmarkFilterSelection
+	bench_filter_test.go:127: FilterSelection=2
+	bench_filter_test.go:127: FilterSelection=2
+	bench_filter_test.go:127: FilterSelection=2
+	bench_filter_test.go:127: FilterSelection=2
+BenchmarkNotSelection	   20000	     82108 ns/op
+--- BENCH: BenchmarkNotSelection
+	bench_filter_test.go:144: NotSelection=360
+	bench_filter_test.go:144: NotSelection=360
+	bench_filter_test.go:144: NotSelection=360
+	bench_filter_test.go:144: NotSelection=360
+BenchmarkHas	    5000	    582934 ns/op
+--- BENCH: BenchmarkHas
+	bench_filter_test.go:160: Has=13
+	bench_filter_test.go:160: Has=13
+	bench_filter_test.go:160: Has=13
+BenchmarkHasNodes	   10000	    241602 ns/op
+--- BENCH: BenchmarkHasNodes
+	bench_filter_test.go:178: HasNodes=15
+	bench_filter_test.go:178: HasNodes=15
+	bench_filter_test.go:178: HasNodes=15
+BenchmarkHasSelection	   10000	    243612 ns/op
+--- BENCH: BenchmarkHasSelection
+	bench_filter_test.go:195: HasSelection=15
+	bench_filter_test.go:195: HasSelection=15
+	bench_filter_test.go:195: HasSelection=15
+BenchmarkEnd	500000000	         4.14 ns/op
+--- BENCH: BenchmarkEnd
+	bench_filter_test.go:211: End=373
+	bench_filter_test.go:211: End=373
+	bench_filter_test.go:211: End=373
+	bench_filter_test.go:211: End=373
+	bench_filter_test.go:211: End=373
+	bench_filter_test.go:211: End=373
+BenchmarkEach	  200000	      9848 ns/op
+--- BENCH: BenchmarkEach
+	bench_iteration_test.go:22: Each=59
+	bench_iteration_test.go:22: Each=59
+	bench_iteration_test.go:22: Each=59
+	bench_iteration_test.go:22: Each=59
+BenchmarkMap	  100000	     17569 ns/op
+--- BENCH: BenchmarkMap
+	bench_iteration_test.go:41: Map=59
+	bench_iteration_test.go:41: Map=59
+	bench_iteration_test.go:41: Map=59
+	bench_iteration_test.go:41: Map=59
+BenchmarkAttr	50000000	        37.6 ns/op
+--- BENCH: BenchmarkAttr
+	bench_property_test.go:16: Attr=firstHeading
+	bench_property_test.go:16: Attr=firstHeading
+	bench_property_test.go:16: Attr=firstHeading
+	bench_property_test.go:16: Attr=firstHeading
+	bench_property_test.go:16: Attr=firstHeading
+BenchmarkText	  100000	     19345 ns/op
+BenchmarkLength	2000000000	         0.80 ns/op
+--- BENCH: BenchmarkLength
+	bench_property_test.go:37: Length=14
+	bench_property_test.go:37: Length=14
+	bench_property_test.go:37: Length=14
+	bench_property_test.go:37: Length=14
+	bench_property_test.go:37: Length=14
+	bench_property_test.go:37: Length=14
+BenchmarkHtml	 5000000	       688 ns/op
+BenchmarkIs	   50000	     35061 ns/op
+--- BENCH: BenchmarkIs
+	bench_query_test.go:16: Is=true
+	bench_query_test.go:16: Is=true
+	bench_query_test.go:16: Is=true
+	bench_query_test.go:16: Is=true
+BenchmarkIsPositional	   50000	     32789 ns/op
+--- BENCH: BenchmarkIsPositional
+	bench_query_test.go:28: IsPositional=true
+	bench_query_test.go:28: IsPositional=true
+	bench_query_test.go:28: IsPositional=true
+	bench_query_test.go:28: IsPositional=true
+BenchmarkIsFunction	 1000000	      2816 ns/op
+--- BENCH: BenchmarkIsFunction
+	bench_query_test.go:43: IsFunction=true
+	bench_query_test.go:43: IsFunction=true
+	bench_query_test.go:43: IsFunction=true
+	bench_query_test.go:43: IsFunction=true
+BenchmarkIsSelection	   50000	     68272 ns/op
+--- BENCH: BenchmarkIsSelection
+	bench_query_test.go:56: IsSelection=true
+	bench_query_test.go:56: IsSelection=true
+	bench_query_test.go:56: IsSelection=true
+	bench_query_test.go:56: IsSelection=true
+BenchmarkIsNodes	   50000	     68107 ns/op
+--- BENCH: BenchmarkIsNodes
+	bench_query_test.go:70: IsNodes=true
+	bench_query_test.go:70: IsNodes=true
+	bench_query_test.go:70: IsNodes=true
+	bench_query_test.go:70: IsNodes=true
+BenchmarkHasClass	    5000	    709386 ns/op
+--- BENCH: BenchmarkHasClass
+	bench_query_test.go:82: HasClass=true
+	bench_query_test.go:82: HasClass=true
+	bench_query_test.go:82: HasClass=true
+BenchmarkContains	100000000	        12.4 ns/op
+--- BENCH: BenchmarkContains
+	bench_query_test.go:96: Contains=true
+	bench_query_test.go:96: Contains=true
+	bench_query_test.go:96: Contains=true
+	bench_query_test.go:96: Contains=true
+	bench_query_test.go:96: Contains=true
+BenchmarkFind	   50000	     56342 ns/op
+--- BENCH: BenchmarkFind
+	bench_traversal_test.go:18: Find=41
+	bench_traversal_test.go:18: Find=41
+	bench_traversal_test.go:18: Find=41
+	bench_traversal_test.go:18: Find=41
+BenchmarkFindWithinSelection	   10000	    131878 ns/op
+--- BENCH: BenchmarkFindWithinSelection
+	bench_traversal_test.go:34: FindWithinSelection=39
+	bench_traversal_test.go:34: FindWithinSelection=39
+	bench_traversal_test.go:34: FindWithinSelection=39
+BenchmarkFindSelection	    5000	    374240 ns/op
+--- BENCH: BenchmarkFindSelection
+	bench_traversal_test.go:51: FindSelection=73
+	bench_traversal_test.go:51: FindSelection=73
+	bench_traversal_test.go:51: FindSelection=73
+BenchmarkFindNodes	    5000	    374447 ns/op
+--- BENCH: BenchmarkFindNodes
+	bench_traversal_test.go:69: FindNodes=73
+	bench_traversal_test.go:69: FindNodes=73
+	bench_traversal_test.go:69: FindNodes=73
+BenchmarkContents	  200000	      9721 ns/op
+--- BENCH: BenchmarkContents
+	bench_traversal_test.go:85: Contents=16
+	bench_traversal_test.go:85: Contents=16
+	bench_traversal_test.go:85: Contents=16
+	bench_traversal_test.go:85: Contents=16
+BenchmarkContentsFiltered	  200000	     12909 ns/op
+--- BENCH: BenchmarkContentsFiltered
+	bench_traversal_test.go:101: ContentsFiltered=1
+	bench_traversal_test.go:101: ContentsFiltered=1
+	bench_traversal_test.go:101: ContentsFiltered=1
+	bench_traversal_test.go:101: ContentsFiltered=1
+BenchmarkChildren	 1000000	      1869 ns/op
+--- BENCH: BenchmarkChildren
+	bench_traversal_test.go:117: Children=2
+	bench_traversal_test.go:117: Children=2
+	bench_traversal_test.go:117: Children=2
+	bench_traversal_test.go:117: Children=2
+BenchmarkChildrenFiltered	  500000	      5941 ns/op
+--- BENCH: BenchmarkChildrenFiltered
+	bench_traversal_test.go:133: ChildrenFiltered=2
+	bench_traversal_test.go:133: ChildrenFiltered=2
+	bench_traversal_test.go:133: ChildrenFiltered=2
+	bench_traversal_test.go:133: ChildrenFiltered=2
+BenchmarkParent	   50000	     46223 ns/op
+--- BENCH: BenchmarkParent
+	bench_traversal_test.go:149: Parent=55
+	bench_traversal_test.go:149: Parent=55
+	bench_traversal_test.go:149: Parent=55
+	bench_traversal_test.go:149: Parent=55
+BenchmarkParentFiltered	   50000	     51452 ns/op
+--- BENCH: BenchmarkParentFiltered
+	bench_traversal_test.go:165: ParentFiltered=4
+	bench_traversal_test.go:165: ParentFiltered=4
+	bench_traversal_test.go:165: ParentFiltered=4
+	bench_traversal_test.go:165: ParentFiltered=4
+BenchmarkParents	   20000	     93967 ns/op
+--- BENCH: BenchmarkParents
+	bench_traversal_test.go:181: Parents=73
+	bench_traversal_test.go:181: Parents=73
+	bench_traversal_test.go:181: Parents=73
+	bench_traversal_test.go:181: Parents=73
+BenchmarkParentsFiltered	   20000	     97617 ns/op
+--- BENCH: BenchmarkParentsFiltered
+	bench_traversal_test.go:197: ParentsFiltered=18
+	bench_traversal_test.go:197: ParentsFiltered=18
+	bench_traversal_test.go:197: ParentsFiltered=18
+	bench_traversal_test.go:197: ParentsFiltered=18
+BenchmarkParentsUntil	   10000	    138898 ns/op
+--- BENCH: BenchmarkParentsUntil
+	bench_traversal_test.go:213: ParentsUntil=52
+	bench_traversal_test.go:213: ParentsUntil=52
+	bench_traversal_test.go:213: ParentsUntil=52
+BenchmarkParentsUntilSelection	   10000	    247817 ns/op
+--- BENCH: BenchmarkParentsUntilSelection
+	bench_traversal_test.go:230: ParentsUntilSelection=70
+	bench_traversal_test.go:230: ParentsUntilSelection=70
+	bench_traversal_test.go:230: ParentsUntilSelection=70
+BenchmarkParentsUntilNodes	   10000	    246055 ns/op
+--- BENCH: BenchmarkParentsUntilNodes
+	bench_traversal_test.go:248: ParentsUntilNodes=70
+	bench_traversal_test.go:248: ParentsUntilNodes=70
+	bench_traversal_test.go:248: ParentsUntilNodes=70
+BenchmarkParentsFilteredUntil	   50000	     33201 ns/op
+--- BENCH: BenchmarkParentsFilteredUntil
+	bench_traversal_test.go:264: ParentsFilteredUntil=2
+	bench_traversal_test.go:264: ParentsFilteredUntil=2
+	bench_traversal_test.go:264: ParentsFilteredUntil=2
+	bench_traversal_test.go:264: ParentsFilteredUntil=2
+BenchmarkParentsFilteredUntilSelection	   50000	     31486 ns/op
+--- BENCH: BenchmarkParentsFilteredUntilSelection
+	bench_traversal_test.go:281: ParentsFilteredUntilSelection=2
+	bench_traversal_test.go:281: ParentsFilteredUntilSelection=2
+	bench_traversal_test.go:281: ParentsFilteredUntilSelection=2
+	bench_traversal_test.go:281: ParentsFilteredUntilSelection=2
+BenchmarkParentsFilteredUntilNodes	   50000	     31754 ns/op
+--- BENCH: BenchmarkParentsFilteredUntilNodes
+	bench_traversal_test.go:299: ParentsFilteredUntilNodes=2
+	bench_traversal_test.go:299: ParentsFilteredUntilNodes=2
+	bench_traversal_test.go:299: ParentsFilteredUntilNodes=2
+	bench_traversal_test.go:299: ParentsFilteredUntilNodes=2
+BenchmarkSiblings	   20000	     94749 ns/op
+--- BENCH: BenchmarkSiblings
+	bench_traversal_test.go:315: Siblings=293
+	bench_traversal_test.go:315: Siblings=293
+	bench_traversal_test.go:315: Siblings=293
+	bench_traversal_test.go:315: Siblings=293
+BenchmarkSiblingsFiltered	   10000	    103926 ns/op
+--- BENCH: BenchmarkSiblingsFiltered
+	bench_traversal_test.go:331: SiblingsFiltered=46
+	bench_traversal_test.go:331: SiblingsFiltered=46
+	bench_traversal_test.go:331: SiblingsFiltered=46
+BenchmarkNext	   50000	     33782 ns/op
+--- BENCH: BenchmarkNext
+	bench_traversal_test.go:347: Next=49
+	bench_traversal_test.go:347: Next=49
+	bench_traversal_test.go:347: Next=49
+	bench_traversal_test.go:347: Next=49
+BenchmarkNextFiltered	   50000	     37108 ns/op
+--- BENCH: BenchmarkNextFiltered
+	bench_traversal_test.go:363: NextFiltered=6
+	bench_traversal_test.go:363: NextFiltered=6
+	bench_traversal_test.go:363: NextFiltered=6
+	bench_traversal_test.go:363: NextFiltered=6
+BenchmarkNextAll	   50000	     64769 ns/op
+--- BENCH: BenchmarkNextAll
+	bench_traversal_test.go:379: NextAll=234
+	bench_traversal_test.go:379: NextAll=234
+	bench_traversal_test.go:379: NextAll=234
+	bench_traversal_test.go:379: NextAll=234
+BenchmarkNextAllFiltered	   50000	     71050 ns/op
+--- BENCH: BenchmarkNextAllFiltered
+	bench_traversal_test.go:395: NextAllFiltered=33
+	bench_traversal_test.go:395: NextAllFiltered=33
+	bench_traversal_test.go:395: NextAllFiltered=33
+	bench_traversal_test.go:395: NextAllFiltered=33
+BenchmarkPrev	   50000	     33908 ns/op
+--- BENCH: BenchmarkPrev
+	bench_traversal_test.go:411: Prev=49
+	bench_traversal_test.go:411: Prev=49
+	bench_traversal_test.go:411: Prev=49
+	bench_traversal_test.go:411: Prev=49
+BenchmarkPrevFiltered	   50000	     37353 ns/op
+--- BENCH: BenchmarkPrevFiltered
+	bench_traversal_test.go:429: PrevFiltered=7
+	bench_traversal_test.go:429: PrevFiltered=7
+	bench_traversal_test.go:429: PrevFiltered=7
+	bench_traversal_test.go:429: PrevFiltered=7
+BenchmarkPrevAll	   50000	     31056 ns/op
+--- BENCH: BenchmarkPrevAll
+	bench_traversal_test.go:445: PrevAll=78
+	bench_traversal_test.go:445: PrevAll=78
+	bench_traversal_test.go:445: PrevAll=78
+	bench_traversal_test.go:445: PrevAll=78
+BenchmarkPrevAllFiltered	   50000	     34286 ns/op
+--- BENCH: BenchmarkPrevAllFiltered
+	bench_traversal_test.go:461: PrevAllFiltered=6
+	bench_traversal_test.go:461: PrevAllFiltered=6
+	bench_traversal_test.go:461: PrevAllFiltered=6
+	bench_traversal_test.go:461: PrevAllFiltered=6
+BenchmarkNextUntil	   10000	    202553 ns/op
+--- BENCH: BenchmarkNextUntil
+	bench_traversal_test.go:477: NextUntil=84
+	bench_traversal_test.go:477: NextUntil=84
+	bench_traversal_test.go:477: NextUntil=84
+BenchmarkNextUntilSelection	   20000	     98693 ns/op
+--- BENCH: BenchmarkNextUntilSelection
+	bench_traversal_test.go:494: NextUntilSelection=42
+	bench_traversal_test.go:494: NextUntilSelection=42
+	bench_traversal_test.go:494: NextUntilSelection=42
+	bench_traversal_test.go:494: NextUntilSelection=42
+BenchmarkNextUntilNodes	   50000	     45532 ns/op
+--- BENCH: BenchmarkNextUntilNodes
+	bench_traversal_test.go:512: NextUntilNodes=12
+	bench_traversal_test.go:512: NextUntilNodes=12
+	bench_traversal_test.go:512: NextUntilNodes=12
+	bench_traversal_test.go:512: NextUntilNodes=12
+BenchmarkPrevUntil	    5000	    454378 ns/op
+--- BENCH: BenchmarkPrevUntil
+	bench_traversal_test.go:528: PrevUntil=238
+	bench_traversal_test.go:528: PrevUntil=238
+	bench_traversal_test.go:528: PrevUntil=238
+BenchmarkPrevUntilSelection	   10000	    123594 ns/op
+--- BENCH: BenchmarkPrevUntilSelection
+	bench_traversal_test.go:545: PrevUntilSelection=49
+	bench_traversal_test.go:545: PrevUntilSelection=49
+	bench_traversal_test.go:545: PrevUntilSelection=49
+BenchmarkPrevUntilNodes	   50000	     37509 ns/op
+--- BENCH: BenchmarkPrevUntilNodes
+	bench_traversal_test.go:563: PrevUntilNodes=11
+	bench_traversal_test.go:563: PrevUntilNodes=11
+	bench_traversal_test.go:563: PrevUntilNodes=11
+	bench_traversal_test.go:563: PrevUntilNodes=11
+BenchmarkNextFilteredUntil	   10000	    109317 ns/op
+--- BENCH: BenchmarkNextFilteredUntil
+	bench_traversal_test.go:579: NextFilteredUntil=22
+	bench_traversal_test.go:579: NextFilteredUntil=22
+	bench_traversal_test.go:579: NextFilteredUntil=22
+BenchmarkNextFilteredUntilSelection	   10000	    105959 ns/op
+--- BENCH: BenchmarkNextFilteredUntilSelection
+	bench_traversal_test.go:596: NextFilteredUntilSelection=22
+	bench_traversal_test.go:596: NextFilteredUntilSelection=22
+	bench_traversal_test.go:596: NextFilteredUntilSelection=22
+BenchmarkNextFilteredUntilNodes	   10000	    107132 ns/op
+--- BENCH: BenchmarkNextFilteredUntilNodes
+	bench_traversal_test.go:614: NextFilteredUntilNodes=22
+	bench_traversal_test.go:614: NextFilteredUntilNodes=22
+	bench_traversal_test.go:614: NextFilteredUntilNodes=22
+BenchmarkPrevFilteredUntil	   10000	    114474 ns/op
+--- BENCH: BenchmarkPrevFilteredUntil
+	bench_traversal_test.go:630: PrevFilteredUntil=20
+	bench_traversal_test.go:630: PrevFilteredUntil=20
+	bench_traversal_test.go:630: PrevFilteredUntil=20
+BenchmarkPrevFilteredUntilSelection	   10000	    107592 ns/op
+--- BENCH: BenchmarkPrevFilteredUntilSelection
+	bench_traversal_test.go:647: PrevFilteredUntilSelection=20
+	bench_traversal_test.go:647: PrevFilteredUntilSelection=20
+	bench_traversal_test.go:647: PrevFilteredUntilSelection=20
+BenchmarkPrevFilteredUntilNodes	   10000	    107495 ns/op
+--- BENCH: BenchmarkPrevFilteredUntilNodes
+	bench_traversal_test.go:665: PrevFilteredUntilNodes=20
+	bench_traversal_test.go:665: PrevFilteredUntilNodes=20
+	bench_traversal_test.go:665: PrevFilteredUntilNodes=20
+ok  	github.com/PuerkitoBio/goquery	187.652s
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench/v0.1.1-v0.2.1-go1.1rc1.svg b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench/v0.1.1-v0.2.1-go1.1rc1.svg
new file mode 100644
index 00000000..849a70b7
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench/v0.1.1-v0.2.1-go1.1rc1.svg
@@ -0,0 +1,405 @@
+<?xml version="1.0"?>
+<!-- Generated by SVGo -->
+<svg width="1024" height="768"
+     xmlns="http://www.w3.org/2000/svg" 
+     xmlns:xlink="http://www.w3.org/1999/xlink">
+<g style="font-size:20px;font-family:sans-serif">
+<rect x="0" y="0" width="1024" height="768" style="fill:white"/>
+<text x="100" y="50" style="font-size:150%"></text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="118" width="0" height="20" style="fill-opacity:0.3;fill:red"/>
+<text x="607" y="133" style="text-anchor:end">+0.10%</text>
+</g>
+<text x="100" y="138" style="text-anchor:start">BenchmarkFirst</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="144" width="0" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="617" y="159" style="text-anchor:start">-0.10%</text>
+</g>
+<text x="100" y="164" style="text-anchor:start">BenchmarkLast</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="604" y="170" width="8" height="20" style="fill-opacity:0.3;fill:red"/>
+<text x="599" y="185" style="text-anchor:end">+2.86%</text>
+</g>
+<text x="100" y="190" style="text-anchor:start">BenchmarkEq</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="604" y="196" width="8" height="20" style="fill-opacity:0.3;fill:red"/>
+<text x="599" y="211" style="text-anchor:end">+2.67%</text>
+</g>
+<text x="100" y="216" style="text-anchor:start">BenchmarkSlice</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="222" width="32" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="649" y="237" style="text-anchor:start">-10.82%</text>
+</g>
+<text x="100" y="242" style="text-anchor:start">BenchmarkGet</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="248" width="132" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="749" y="263" style="text-anchor:start">-44.06%</text>
+</g>
+<text x="100" y="268" style="text-anchor:start">BenchmarkIndex</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="274" width="156" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="773" y="289" style="text-anchor:start">-52.26%</text>
+</g>
+<text x="100" y="294" style="text-anchor:start">BenchmarkIndexSelector</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="300" width="27" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="644" y="315" style="text-anchor:start">-9.32%</text>
+</g>
+<text x="100" y="320" style="text-anchor:start">BenchmarkIndexOfNode</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="326" width="7" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="624" y="341" style="text-anchor:start">-2.48%</text>
+</g>
+<text x="100" y="346" style="text-anchor:start">BenchmarkIndexOfSelection</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="352" width="104" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="721" y="367" style="text-anchor:start">-34.96%</text>
+</g>
+<text x="100" y="372" style="text-anchor:start">BenchmarkMetalReviewExample</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="378" width="177" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="794" y="393" style="text-anchor:start">-59.16%</text>
+</g>
+<text x="100" y="398" style="text-anchor:start">BenchmarkAdd</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="404" width="0" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="617" y="419" style="text-anchor:start">+0.00%</text>
+</g>
+<text x="100" y="424" style="text-anchor:start">BenchmarkAddSelection</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="602" y="430" width="10" height="20" style="fill-opacity:0.3;fill:red"/>
+<text x="597" y="445" style="text-anchor:end">+3.47%</text>
+</g>
+<text x="100" y="450" style="text-anchor:start">BenchmarkAddNodes</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="456" width="7" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="624" y="471" style="text-anchor:start">-2.51%</text>
+</g>
+<text x="100" y="476" style="text-anchor:start">BenchmarkAndSelf</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="482" width="41" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="658" y="497" style="text-anchor:start">-13.96%</text>
+</g>
+<text x="100" y="502" style="text-anchor:start">BenchmarkFilter</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="508" width="43" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="660" y="523" style="text-anchor:start">-14.53%</text>
+</g>
+<text x="100" y="528" style="text-anchor:start">BenchmarkNot</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="534" width="11" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="628" y="549" style="text-anchor:start">-3.81%</text>
+</g>
+<text x="100" y="554" style="text-anchor:start">BenchmarkFilterFunction</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="560" width="8" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="625" y="575" style="text-anchor:start">-2.83%</text>
+</g>
+<text x="100" y="580" style="text-anchor:start">BenchmarkNotFunction</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="586" width="13" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="630" y="601" style="text-anchor:start">-4.63%</text>
+</g>
+<text x="100" y="606" style="text-anchor:start">BenchmarkFilterNodes</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="612" width="6" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="623" y="627" style="text-anchor:start">-2.32%</text>
+</g>
+<text x="100" y="632" style="text-anchor:start">BenchmarkNotNodes</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="638" width="12" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="629" y="653" style="text-anchor:start">-4.23%</text>
+</g>
+<text x="100" y="658" style="text-anchor:start">BenchmarkFilterSelection</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="664" width="9" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="626" y="679" style="text-anchor:start">-3.31%</text>
+</g>
+<text x="100" y="684" style="text-anchor:start">BenchmarkNotSelection</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="690" width="101" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="718" y="705" style="text-anchor:start">-33.69%</text>
+</g>
+<text x="100" y="710" style="text-anchor:start">BenchmarkHas</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="716" width="13" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="630" y="731" style="text-anchor:start">-4.53%</text>
+</g>
+<text x="100" y="736" style="text-anchor:start">BenchmarkHasNodes</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="742" width="15" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="632" y="757" style="text-anchor:start">-5.30%</text>
+</g>
+<text x="100" y="762" style="text-anchor:start">BenchmarkHasSelection</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="578" y="768" width="34" height="20" style="fill-opacity:0.3;fill:red"/>
+<text x="573" y="783" style="text-anchor:end">+11.35%</text>
+</g>
+<text x="100" y="788" style="text-anchor:start">BenchmarkEnd</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="794" width="9" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="626" y="809" style="text-anchor:start">-3.33%</text>
+</g>
+<text x="100" y="814" style="text-anchor:start">BenchmarkEach</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="820" width="27" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="644" y="835" style="text-anchor:start">-9.16%</text>
+</g>
+<text x="100" y="840" style="text-anchor:start">BenchmarkMap</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="846" width="57" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="674" y="861" style="text-anchor:start">-19.15%</text>
+</g>
+<text x="100" y="866" style="text-anchor:start">BenchmarkAttr</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="872" width="9" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="626" y="887" style="text-anchor:start">-3.24%</text>
+</g>
+<text x="100" y="892" style="text-anchor:start">BenchmarkText</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="898" width="183" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="800" y="913" style="text-anchor:start">-61.25%</text>
+</g>
+<text x="100" y="918" style="text-anchor:start">BenchmarkLength</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="924" width="35" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="652" y="939" style="text-anchor:start">-11.92%</text>
+</g>
+<text x="100" y="944" style="text-anchor:start">BenchmarkHtml</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="950" width="49" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="666" y="965" style="text-anchor:start">-16.46%</text>
+</g>
+<text x="100" y="970" style="text-anchor:start">BenchmarkIs</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="976" width="81" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="698" y="991" style="text-anchor:start">-27.31%</text>
+</g>
+<text x="100" y="996" style="text-anchor:start">BenchmarkIsPositional</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1002" width="40" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="657" y="1017" style="text-anchor:start">-13.49%</text>
+</g>
+<text x="100" y="1022" style="text-anchor:start">BenchmarkIsFunction</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1028" width="5" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="622" y="1043" style="text-anchor:start">-1.71%</text>
+</g>
+<text x="100" y="1048" style="text-anchor:start">BenchmarkIsSelection</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1054" width="9" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="626" y="1069" style="text-anchor:start">-3.03%</text>
+</g>
+<text x="100" y="1074" style="text-anchor:start">BenchmarkIsNodes</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1080" width="60" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="677" y="1095" style="text-anchor:start">-20.30%</text>
+</g>
+<text x="100" y="1100" style="text-anchor:start">BenchmarkHasClass</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1106" width="33" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="650" y="1121" style="text-anchor:start">-11.29%</text>
+</g>
+<text x="100" y="1126" style="text-anchor:start">BenchmarkContains</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1132" width="152" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="769" y="1147" style="text-anchor:start">-50.88%</text>
+</g>
+<text x="100" y="1152" style="text-anchor:start">BenchmarkFind</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1158" width="135" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="752" y="1173" style="text-anchor:start">-45.28%</text>
+</g>
+<text x="100" y="1178" style="text-anchor:start">BenchmarkFindWithinSelection</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="544" y="1184" width="68" height="20" style="fill-opacity:0.3;fill:red"/>
+<text x="539" y="1199" style="text-anchor:end">+22.95%</text>
+</g>
+<text x="100" y="1204" style="text-anchor:start">BenchmarkFindSelection</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="544" y="1210" width="68" height="20" style="fill-opacity:0.3;fill:red"/>
+<text x="539" y="1225" style="text-anchor:end">+22.68%</text>
+</g>
+<text x="100" y="1230" style="text-anchor:start">BenchmarkFindNodes</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1236" width="195" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="812" y="1251" style="text-anchor:start">-65.08%</text>
+</g>
+<text x="100" y="1256" style="text-anchor:start">BenchmarkContents</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1262" width="179" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="796" y="1277" style="text-anchor:start">-59.77%</text>
+</g>
+<text x="100" y="1282" style="text-anchor:start">BenchmarkContentsFiltered</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1288" width="192" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="809" y="1303" style="text-anchor:start">-64.31%</text>
+</g>
+<text x="100" y="1308" style="text-anchor:start">BenchmarkChildren</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1314" width="118" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="735" y="1329" style="text-anchor:start">-39.56%</text>
+</g>
+<text x="100" y="1334" style="text-anchor:start">BenchmarkChildrenFiltered</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1340" width="19" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="636" y="1355" style="text-anchor:start">-6.61%</text>
+</g>
+<text x="100" y="1360" style="text-anchor:start">BenchmarkParent</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1366" width="32" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="649" y="1381" style="text-anchor:start">-10.92%</text>
+</g>
+<text x="100" y="1386" style="text-anchor:start">BenchmarkParentFiltered</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1392" width="5" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="622" y="1407" style="text-anchor:start">-1.72%</text>
+</g>
+<text x="100" y="1412" style="text-anchor:start">BenchmarkParents</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1418" width="7" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="624" y="1433" style="text-anchor:start">-2.37%</text>
+</g>
+<text x="100" y="1438" style="text-anchor:start">BenchmarkParentsFiltered</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1444" width="142" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="759" y="1459" style="text-anchor:start">-47.60%</text>
+</g>
+<text x="100" y="1464" style="text-anchor:start">BenchmarkParentsUntil</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1470" width="109" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="726" y="1485" style="text-anchor:start">-36.39%</text>
+</g>
+<text x="100" y="1490" style="text-anchor:start">BenchmarkParentsUntilSelection</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1496" width="107" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="724" y="1511" style="text-anchor:start">-35.99%</text>
+</g>
+<text x="100" y="1516" style="text-anchor:start">BenchmarkParentsUntilNodes</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1522" width="146" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="763" y="1537" style="text-anchor:start">-48.84%</text>
+</g>
+<text x="100" y="1542" style="text-anchor:start">BenchmarkParentsFilteredUntil</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1548" width="98" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="715" y="1563" style="text-anchor:start">-32.75%</text>
+</g>
+<text x="100" y="1568" style="text-anchor:start">BenchmarkParentsFilteredUntilSelection</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1574" width="99" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="716" y="1589" style="text-anchor:start">-33.12%</text>
+</g>
+<text x="100" y="1594" style="text-anchor:start">BenchmarkParentsFilteredUntilNodes</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1600" width="89" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="706" y="1615" style="text-anchor:start">-29.78%</text>
+</g>
+<text x="100" y="1620" style="text-anchor:start">BenchmarkSiblings</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1626" width="92" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="709" y="1641" style="text-anchor:start">-30.89%</text>
+</g>
+<text x="100" y="1646" style="text-anchor:start">BenchmarkSiblingsFiltered</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1652" width="204" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="821" y="1667" style="text-anchor:start">-68.19%</text>
+</g>
+<text x="100" y="1672" style="text-anchor:start">BenchmarkNext</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1678" width="199" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="816" y="1693" style="text-anchor:start">-66.59%</text>
+</g>
+<text x="100" y="1698" style="text-anchor:start">BenchmarkNextFiltered</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1704" width="93" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="710" y="1719" style="text-anchor:start">-31.08%</text>
+</g>
+<text x="100" y="1724" style="text-anchor:start">BenchmarkNextAll</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1730" width="90" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="707" y="1745" style="text-anchor:start">-30.03%</text>
+</g>
+<text x="100" y="1750" style="text-anchor:start">BenchmarkNextAllFiltered</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1756" width="204" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="821" y="1771" style="text-anchor:start">-68.32%</text>
+</g>
+<text x="100" y="1776" style="text-anchor:start">BenchmarkPrev</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1782" width="199" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="816" y="1797" style="text-anchor:start">-66.65%</text>
+</g>
+<text x="100" y="1802" style="text-anchor:start">BenchmarkPrevFiltered</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1808" width="129" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="746" y="1823" style="text-anchor:start">-43.33%</text>
+</g>
+<text x="100" y="1828" style="text-anchor:start">BenchmarkPrevAll</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1834" width="129" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="746" y="1849" style="text-anchor:start">-43.24%</text>
+</g>
+<text x="100" y="1854" style="text-anchor:start">BenchmarkPrevAllFiltered</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1860" width="162" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="779" y="1875" style="text-anchor:start">-54.27%</text>
+</g>
+<text x="100" y="1880" style="text-anchor:start">BenchmarkNextUntil</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1886" width="113" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="730" y="1901" style="text-anchor:start">-37.90%</text>
+</g>
+<text x="100" y="1906" style="text-anchor:start">BenchmarkNextUntilSelection</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1912" width="129" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="746" y="1927" style="text-anchor:start">-43.21%</text>
+</g>
+<text x="100" y="1932" style="text-anchor:start">BenchmarkNextUntilNodes</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1938" width="147" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="764" y="1953" style="text-anchor:start">-49.33%</text>
+</g>
+<text x="100" y="1958" style="text-anchor:start">BenchmarkPrevUntil</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1964" width="111" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="728" y="1979" style="text-anchor:start">-37.02%</text>
+</g>
+<text x="100" y="1984" style="text-anchor:start">BenchmarkPrevUntilSelection</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1990" width="133" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="750" y="2005" style="text-anchor:start">-44.59%</text>
+</g>
+<text x="100" y="2010" style="text-anchor:start">BenchmarkPrevUntilNodes</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="2016" width="173" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="790" y="2031" style="text-anchor:start">-57.79%</text>
+</g>
+<text x="100" y="2036" style="text-anchor:start">BenchmarkNextFilteredUntil</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="2042" width="109" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="726" y="2057" style="text-anchor:start">-36.61%</text>
+</g>
+<text x="100" y="2062" style="text-anchor:start">BenchmarkNextFilteredUntilSelection</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="2068" width="113" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="730" y="2083" style="text-anchor:start">-37.81%</text>
+</g>
+<text x="100" y="2088" style="text-anchor:start">BenchmarkNextFilteredUntilNodes</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="2094" width="177" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="794" y="2109" style="text-anchor:start">-59.21%</text>
+</g>
+<text x="100" y="2114" style="text-anchor:start">BenchmarkPrevFilteredUntil</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="2120" width="108" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="725" y="2135" style="text-anchor:start">-36.20%</text>
+</g>
+<text x="100" y="2140" style="text-anchor:start">BenchmarkPrevFilteredUntilSelection</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="2146" width="108" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="725" y="2161" style="text-anchor:start">-36.05%</text>
+</g>
+<text x="100" y="2166" style="text-anchor:start">BenchmarkPrevFilteredUntilNodes</text>
+</g>
+</svg>
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench/v0.2.0 b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench/v0.2.0
new file mode 100644
index 00000000..3ea8dcb1
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench/v0.2.0
@@ -0,0 +1,459 @@
+PASS
+BenchmarkFirst	20000000	        94.3 ns/op
+BenchmarkLast	20000000	        94.7 ns/op
+BenchmarkEq	20000000	        93.7 ns/op
+BenchmarkSlice	20000000	        89.9 ns/op
+BenchmarkGet	1000000000	         2.72 ns/op
+BenchmarkIndex	 1000000	      1834 ns/op
+--- BENCH: BenchmarkIndex
+bench_array_test.go:73: 	Index=3
+bench_array_test.go:73: 	Index=3
+bench_array_test.go:73: 	Index=3
+bench_array_test.go:73: 	Index=3
+BenchmarkIndexSelector	   50000	     53958 ns/op
+--- BENCH: BenchmarkIndexSelector
+bench_array_test.go:85: 	IndexSelector=4
+bench_array_test.go:85: 	IndexSelector=4
+bench_array_test.go:85: 	IndexSelector=4
+bench_array_test.go:85: 	IndexSelector=4
+BenchmarkIndexOfNode	100000000	        10.1 ns/op
+--- BENCH: BenchmarkIndexOfNode
+bench_array_test.go:99: 	IndexOfNode=2
+bench_array_test.go:99: 	IndexOfNode=2
+bench_array_test.go:99: 	IndexOfNode=2
+bench_array_test.go:99: 	IndexOfNode=2
+bench_array_test.go:99: 	IndexOfNode=2
+BenchmarkIndexOfSelection	100000000	        10.9 ns/op
+--- BENCH: BenchmarkIndexOfSelection
+bench_array_test.go:111: 	IndexOfSelection=2
+bench_array_test.go:111: 	IndexOfSelection=2
+bench_array_test.go:111: 	IndexOfSelection=2
+bench_array_test.go:111: 	IndexOfSelection=2
+bench_array_test.go:111: 	IndexOfSelection=2
+BenchmarkMetalReviewExample	    5000	    326712 ns/op
+--- BENCH: BenchmarkMetalReviewExample
+bench_example_test.go:40: 	Review 0: Midnight - Complete and Total Hell (8.5).
+		Review 1: Over Your Threshold - Facticity (6.0).
+		Review 2: Nuclear Death Terror - Chaos Reigns (7.5).
+		Review 3: Evoken - Atra Mors (9.5).
+		
+		bench_example_test.go:41: 	MetalReviewExample=10
+bench_example_test.go:40: 	Review 0: Midnight - Complete and Total Hell (8.5).
+		Review 1: Over Your Threshold - Facticity (6.0).
+		Review 2: Nuclear Death Terror - Chaos Reigns (7.5).
+		Review 3: Evoken - Atra Mors (9.5).
+	... [output truncated]
+BenchmarkAdd	   50000	     51776 ns/op
+--- BENCH: BenchmarkAdd
+bench_expand_test.go:20: 	Add=43
+bench_expand_test.go:20: 	Add=43
+bench_expand_test.go:20: 	Add=43
+bench_expand_test.go:20: 	Add=43
+BenchmarkAddSelection	10000000	       196 ns/op
+--- BENCH: BenchmarkAddSelection
+bench_expand_test.go:37: 	AddSelection=43
+bench_expand_test.go:37: 	AddSelection=43
+bench_expand_test.go:37: 	AddSelection=43
+bench_expand_test.go:37: 	AddSelection=43
+bench_expand_test.go:37: 	AddSelection=43
+BenchmarkAddNodes	10000000	       191 ns/op
+--- BENCH: BenchmarkAddNodes
+bench_expand_test.go:55: 	AddNodes=43
+bench_expand_test.go:55: 	AddNodes=43
+bench_expand_test.go:55: 	AddNodes=43
+bench_expand_test.go:55: 	AddNodes=43
+bench_expand_test.go:55: 	AddNodes=43
+BenchmarkAndSelf	 1000000	      2495 ns/op
+--- BENCH: BenchmarkAndSelf
+bench_expand_test.go:71: 	AndSelf=44
+bench_expand_test.go:71: 	AndSelf=44
+bench_expand_test.go:71: 	AndSelf=44
+bench_expand_test.go:71: 	AndSelf=44
+BenchmarkFilter	   50000	     30974 ns/op
+--- BENCH: BenchmarkFilter
+bench_filter_test.go:20: 	Filter=13
+bench_filter_test.go:20: 	Filter=13
+bench_filter_test.go:20: 	Filter=13
+bench_filter_test.go:20: 	Filter=13
+BenchmarkNot	   50000	     35322 ns/op
+--- BENCH: BenchmarkNot
+bench_filter_test.go:36: 	Not=371
+bench_filter_test.go:36: 	Not=371
+bench_filter_test.go:36: 	Not=371
+bench_filter_test.go:36: 	Not=371
+BenchmarkFilterFunction	   50000	     65644 ns/op
+--- BENCH: BenchmarkFilterFunction
+bench_filter_test.go:55: 	FilterFunction=112
+bench_filter_test.go:55: 	FilterFunction=112
+bench_filter_test.go:55: 	FilterFunction=112
+bench_filter_test.go:55: 	FilterFunction=112
+BenchmarkNotFunction	   50000	     69245 ns/op
+--- BENCH: BenchmarkNotFunction
+bench_filter_test.go:74: 	NotFunction=261
+bench_filter_test.go:74: 	NotFunction=261
+bench_filter_test.go:74: 	NotFunction=261
+bench_filter_test.go:74: 	NotFunction=261
+BenchmarkFilterNodes	   50000	     64824 ns/op
+--- BENCH: BenchmarkFilterNodes
+bench_filter_test.go:92: 	FilterNodes=2
+bench_filter_test.go:92: 	FilterNodes=2
+bench_filter_test.go:92: 	FilterNodes=2
+bench_filter_test.go:92: 	FilterNodes=2
+BenchmarkNotNodes	   20000	     76247 ns/op
+--- BENCH: BenchmarkNotNodes
+bench_filter_test.go:110: 	NotNodes=360
+bench_filter_test.go:110: 	NotNodes=360
+bench_filter_test.go:110: 	NotNodes=360
+bench_filter_test.go:110: 	NotNodes=360
+BenchmarkFilterSelection	   50000	     66154 ns/op
+--- BENCH: BenchmarkFilterSelection
+bench_filter_test.go:127: 	FilterSelection=2
+bench_filter_test.go:127: 	FilterSelection=2
+bench_filter_test.go:127: 	FilterSelection=2
+bench_filter_test.go:127: 	FilterSelection=2
+BenchmarkNotSelection	   20000	     76336 ns/op
+--- BENCH: BenchmarkNotSelection
+bench_filter_test.go:144: 	NotSelection=360
+bench_filter_test.go:144: 	NotSelection=360
+bench_filter_test.go:144: 	NotSelection=360
+bench_filter_test.go:144: 	NotSelection=360
+BenchmarkHas	    5000	    569495 ns/op
+--- BENCH: BenchmarkHas
+bench_filter_test.go:160: 	Has=13
+bench_filter_test.go:160: 	Has=13
+bench_filter_test.go:160: 	Has=13
+BenchmarkHasNodes	   10000	    227059 ns/op
+--- BENCH: BenchmarkHasNodes
+bench_filter_test.go:178: 	HasNodes=15
+bench_filter_test.go:178: 	HasNodes=15
+bench_filter_test.go:178: 	HasNodes=15
+BenchmarkHasSelection	   10000	    227167 ns/op
+--- BENCH: BenchmarkHasSelection
+bench_filter_test.go:195: 	HasSelection=15
+bench_filter_test.go:195: 	HasSelection=15
+bench_filter_test.go:195: 	HasSelection=15
+BenchmarkEnd	500000000	         3.99 ns/op
+--- BENCH: BenchmarkEnd
+bench_filter_test.go:211: 	End=373
+bench_filter_test.go:211: 	End=373
+bench_filter_test.go:211: 	End=373
+bench_filter_test.go:211: 	End=373
+bench_filter_test.go:211: 	End=373
+bench_filter_test.go:211: 	End=373
+BenchmarkEach	  200000	      9354 ns/op
+--- BENCH: BenchmarkEach
+bench_iteration_test.go:22: 	Each=59
+bench_iteration_test.go:22: 	Each=59
+bench_iteration_test.go:22: 	Each=59
+bench_iteration_test.go:22: 	Each=59
+BenchmarkMap	  100000	     16557 ns/op
+--- BENCH: BenchmarkMap
+bench_iteration_test.go:41: 	Map=59
+bench_iteration_test.go:41: 	Map=59
+bench_iteration_test.go:41: 	Map=59
+bench_iteration_test.go:41: 	Map=59
+BenchmarkAttr	50000000	        36.4 ns/op
+--- BENCH: BenchmarkAttr
+bench_property_test.go:16: 	Attr=firstHeading
+bench_property_test.go:16: 	Attr=firstHeading
+bench_property_test.go:16: 	Attr=firstHeading
+bench_property_test.go:16: 	Attr=firstHeading
+bench_property_test.go:16: 	Attr=firstHeading
+BenchmarkText	  100000	     18473 ns/op
+BenchmarkLength	2000000000	         0.76 ns/op
+--- BENCH: BenchmarkLength
+bench_property_test.go:37: 	Length=14
+bench_property_test.go:37: 	Length=14
+bench_property_test.go:37: 	Length=14
+bench_property_test.go:37: 	Length=14
+bench_property_test.go:37: 	Length=14
+bench_property_test.go:37: 	Length=14
+BenchmarkHtml	 5000000	       666 ns/op
+BenchmarkIs	   50000	     35174 ns/op
+--- BENCH: BenchmarkIs
+bench_query_test.go:16: 	Is=true
+bench_query_test.go:16: 	Is=true
+bench_query_test.go:16: 	Is=true
+bench_query_test.go:16: 	Is=true
+BenchmarkIsPositional	   50000	     31814 ns/op
+--- BENCH: BenchmarkIsPositional
+bench_query_test.go:28: 	IsPositional=true
+bench_query_test.go:28: 	IsPositional=true
+bench_query_test.go:28: 	IsPositional=true
+bench_query_test.go:28: 	IsPositional=true
+BenchmarkIsFunction	 1000000	      2754 ns/op
+--- BENCH: BenchmarkIsFunction
+bench_query_test.go:43: 	IsFunction=true
+bench_query_test.go:43: 	IsFunction=true
+bench_query_test.go:43: 	IsFunction=true
+bench_query_test.go:43: 	IsFunction=true
+BenchmarkIsSelection	   50000	     66260 ns/op
+--- BENCH: BenchmarkIsSelection
+bench_query_test.go:56: 	IsSelection=true
+bench_query_test.go:56: 	IsSelection=true
+bench_query_test.go:56: 	IsSelection=true
+bench_query_test.go:56: 	IsSelection=true
+BenchmarkIsNodes	   50000	     64682 ns/op
+--- BENCH: BenchmarkIsNodes
+bench_query_test.go:70: 	IsNodes=true
+bench_query_test.go:70: 	IsNodes=true
+bench_query_test.go:70: 	IsNodes=true
+bench_query_test.go:70: 	IsNodes=true
+BenchmarkHasClass	    5000	    672953 ns/op
+--- BENCH: BenchmarkHasClass
+bench_query_test.go:82: 	HasClass=true
+bench_query_test.go:82: 	HasClass=true
+bench_query_test.go:82: 	HasClass=true
+BenchmarkContains	100000000	        11.3 ns/op
+--- BENCH: BenchmarkContains
+bench_query_test.go:96: 	Contains=true
+bench_query_test.go:96: 	Contains=true
+bench_query_test.go:96: 	Contains=true
+bench_query_test.go:96: 	Contains=true
+bench_query_test.go:96: 	Contains=true
+BenchmarkFind	   50000	     53780 ns/op
+--- BENCH: BenchmarkFind
+bench_traversal_test.go:18: 	Find=41
+bench_traversal_test.go:18: 	Find=41
+bench_traversal_test.go:18: 	Find=41
+bench_traversal_test.go:18: 	Find=41
+BenchmarkFindWithinSelection	   10000	    125963 ns/op
+--- BENCH: BenchmarkFindWithinSelection
+bench_traversal_test.go:34: 	FindWithinSelection=39
+bench_traversal_test.go:34: 	FindWithinSelection=39
+bench_traversal_test.go:34: 	FindWithinSelection=39
+BenchmarkFindSelection	    5000	    357318 ns/op
+--- BENCH: BenchmarkFindSelection
+bench_traversal_test.go:51: 	FindSelection=73
+bench_traversal_test.go:51: 	FindSelection=73
+bench_traversal_test.go:51: 	FindSelection=73
+BenchmarkFindNodes	    5000	    357587 ns/op
+--- BENCH: BenchmarkFindNodes
+bench_traversal_test.go:69: 	FindNodes=73
+bench_traversal_test.go:69: 	FindNodes=73
+bench_traversal_test.go:69: 	FindNodes=73
+BenchmarkContents	  200000	      9135 ns/op
+--- BENCH: BenchmarkContents
+bench_traversal_test.go:85: 	Contents=16
+bench_traversal_test.go:85: 	Contents=16
+bench_traversal_test.go:85: 	Contents=16
+bench_traversal_test.go:85: 	Contents=16
+BenchmarkContentsFiltered	  200000	     12383 ns/op
+--- BENCH: BenchmarkContentsFiltered
+bench_traversal_test.go:101: 	ContentsFiltered=1
+bench_traversal_test.go:101: 	ContentsFiltered=1
+bench_traversal_test.go:101: 	ContentsFiltered=1
+bench_traversal_test.go:101: 	ContentsFiltered=1
+BenchmarkChildren	 1000000	      1809 ns/op
+--- BENCH: BenchmarkChildren
+bench_traversal_test.go:117: 	Children=2
+bench_traversal_test.go:117: 	Children=2
+bench_traversal_test.go:117: 	Children=2
+bench_traversal_test.go:117: 	Children=2
+BenchmarkChildrenFiltered	  500000	      5814 ns/op
+--- BENCH: BenchmarkChildrenFiltered
+bench_traversal_test.go:133: 	ChildrenFiltered=2
+bench_traversal_test.go:133: 	ChildrenFiltered=2
+bench_traversal_test.go:133: 	ChildrenFiltered=2
+bench_traversal_test.go:133: 	ChildrenFiltered=2
+BenchmarkParent	   50000	     44810 ns/op
+--- BENCH: BenchmarkParent
+bench_traversal_test.go:149: 	Parent=55
+bench_traversal_test.go:149: 	Parent=55
+bench_traversal_test.go:149: 	Parent=55
+bench_traversal_test.go:149: 	Parent=55
+BenchmarkParentFiltered	   50000	     48795 ns/op
+--- BENCH: BenchmarkParentFiltered
+bench_traversal_test.go:165: 	ParentFiltered=4
+bench_traversal_test.go:165: 	ParentFiltered=4
+bench_traversal_test.go:165: 	ParentFiltered=4
+bench_traversal_test.go:165: 	ParentFiltered=4
+BenchmarkParents	   20000	     89102 ns/op
+--- BENCH: BenchmarkParents
+bench_traversal_test.go:181: 	Parents=73
+bench_traversal_test.go:181: 	Parents=73
+bench_traversal_test.go:181: 	Parents=73
+bench_traversal_test.go:181: 	Parents=73
+BenchmarkParentsFiltered	   20000	     93953 ns/op
+--- BENCH: BenchmarkParentsFiltered
+bench_traversal_test.go:197: 	ParentsFiltered=18
+bench_traversal_test.go:197: 	ParentsFiltered=18
+bench_traversal_test.go:197: 	ParentsFiltered=18
+bench_traversal_test.go:197: 	ParentsFiltered=18
+BenchmarkParentsUntil	   10000	    130783 ns/op
+--- BENCH: BenchmarkParentsUntil
+bench_traversal_test.go:213: 	ParentsUntil=52
+bench_traversal_test.go:213: 	ParentsUntil=52
+bench_traversal_test.go:213: 	ParentsUntil=52
+BenchmarkParentsUntilSelection	   10000	    231797 ns/op
+--- BENCH: BenchmarkParentsUntilSelection
+bench_traversal_test.go:230: 	ParentsUntilSelection=70
+bench_traversal_test.go:230: 	ParentsUntilSelection=70
+bench_traversal_test.go:230: 	ParentsUntilSelection=70
+BenchmarkParentsUntilNodes	   10000	    233761 ns/op
+--- BENCH: BenchmarkParentsUntilNodes
+bench_traversal_test.go:248: 	ParentsUntilNodes=70
+bench_traversal_test.go:248: 	ParentsUntilNodes=70
+bench_traversal_test.go:248: 	ParentsUntilNodes=70
+BenchmarkParentsFilteredUntil	   50000	     31360 ns/op
+--- BENCH: BenchmarkParentsFilteredUntil
+bench_traversal_test.go:264: 	ParentsFilteredUntil=2
+bench_traversal_test.go:264: 	ParentsFilteredUntil=2
+bench_traversal_test.go:264: 	ParentsFilteredUntil=2
+bench_traversal_test.go:264: 	ParentsFilteredUntil=2
+BenchmarkParentsFilteredUntilSelection	   50000	     30272 ns/op
+--- BENCH: BenchmarkParentsFilteredUntilSelection
+bench_traversal_test.go:281: 	ParentsFilteredUntilSelection=2
+bench_traversal_test.go:281: 	ParentsFilteredUntilSelection=2
+bench_traversal_test.go:281: 	ParentsFilteredUntilSelection=2
+bench_traversal_test.go:281: 	ParentsFilteredUntilSelection=2
+BenchmarkParentsFilteredUntilNodes	   50000	     30327 ns/op
+--- BENCH: BenchmarkParentsFilteredUntilNodes
+bench_traversal_test.go:299: 	ParentsFilteredUntilNodes=2
+bench_traversal_test.go:299: 	ParentsFilteredUntilNodes=2
+bench_traversal_test.go:299: 	ParentsFilteredUntilNodes=2
+bench_traversal_test.go:299: 	ParentsFilteredUntilNodes=2
+BenchmarkSiblings	   20000	     89862 ns/op
+--- BENCH: BenchmarkSiblings
+bench_traversal_test.go:315: 	Siblings=293
+bench_traversal_test.go:315: 	Siblings=293
+bench_traversal_test.go:315: 	Siblings=293
+bench_traversal_test.go:315: 	Siblings=293
+BenchmarkSiblingsFiltered	   20000	     97948 ns/op
+--- BENCH: BenchmarkSiblingsFiltered
+bench_traversal_test.go:331: 	SiblingsFiltered=46
+bench_traversal_test.go:331: 	SiblingsFiltered=46
+bench_traversal_test.go:331: 	SiblingsFiltered=46
+bench_traversal_test.go:331: 	SiblingsFiltered=46
+BenchmarkNext	   50000	     31975 ns/op
+--- BENCH: BenchmarkNext
+bench_traversal_test.go:347: 	Next=49
+bench_traversal_test.go:347: 	Next=49
+bench_traversal_test.go:347: 	Next=49
+bench_traversal_test.go:347: 	Next=49
+BenchmarkNextFiltered	   50000	     34887 ns/op
+--- BENCH: BenchmarkNextFiltered
+bench_traversal_test.go:363: 	NextFiltered=6
+bench_traversal_test.go:363: 	NextFiltered=6
+bench_traversal_test.go:363: 	NextFiltered=6
+bench_traversal_test.go:363: 	NextFiltered=6
+BenchmarkNextAll	   50000	     60734 ns/op
+--- BENCH: BenchmarkNextAll
+bench_traversal_test.go:379: 	NextAll=234
+bench_traversal_test.go:379: 	NextAll=234
+bench_traversal_test.go:379: 	NextAll=234
+bench_traversal_test.go:379: 	NextAll=234
+BenchmarkNextAllFiltered	   50000	     67428 ns/op
+--- BENCH: BenchmarkNextAllFiltered
+bench_traversal_test.go:395: 	NextAllFiltered=33
+bench_traversal_test.go:395: 	NextAllFiltered=33
+bench_traversal_test.go:395: 	NextAllFiltered=33
+bench_traversal_test.go:395: 	NextAllFiltered=33
+BenchmarkPrev	   50000	     32399 ns/op
+--- BENCH: BenchmarkPrev
+bench_traversal_test.go:411: 	Prev=49
+bench_traversal_test.go:411: 	Prev=49
+bench_traversal_test.go:411: 	Prev=49
+bench_traversal_test.go:411: 	Prev=49
+BenchmarkPrevFiltered	   50000	     34944 ns/op
+--- BENCH: BenchmarkPrevFiltered
+bench_traversal_test.go:429: 	PrevFiltered=7
+bench_traversal_test.go:429: 	PrevFiltered=7
+bench_traversal_test.go:429: 	PrevFiltered=7
+bench_traversal_test.go:429: 	PrevFiltered=7
+BenchmarkPrevAll	  100000	     29360 ns/op
+--- BENCH: BenchmarkPrevAll
+bench_traversal_test.go:445: 	PrevAll=78
+bench_traversal_test.go:445: 	PrevAll=78
+bench_traversal_test.go:445: 	PrevAll=78
+bench_traversal_test.go:445: 	PrevAll=78
+BenchmarkPrevAllFiltered	   50000	     32291 ns/op
+--- BENCH: BenchmarkPrevAllFiltered
+bench_traversal_test.go:461: 	PrevAllFiltered=6
+bench_traversal_test.go:461: 	PrevAllFiltered=6
+bench_traversal_test.go:461: 	PrevAllFiltered=6
+bench_traversal_test.go:461: 	PrevAllFiltered=6
+BenchmarkNextUntil	   10000	    191890 ns/op
+--- BENCH: BenchmarkNextUntil
+bench_traversal_test.go:477: 	NextUntil=84
+bench_traversal_test.go:477: 	NextUntil=84
+bench_traversal_test.go:477: 	NextUntil=84
+BenchmarkNextUntilSelection	   20000	     92054 ns/op
+--- BENCH: BenchmarkNextUntilSelection
+bench_traversal_test.go:494: 	NextUntilSelection=42
+bench_traversal_test.go:494: 	NextUntilSelection=42
+bench_traversal_test.go:494: 	NextUntilSelection=42
+bench_traversal_test.go:494: 	NextUntilSelection=42
+BenchmarkNextUntilNodes	   50000	     43401 ns/op
+--- BENCH: BenchmarkNextUntilNodes
+bench_traversal_test.go:512: 	NextUntilNodes=12
+bench_traversal_test.go:512: 	NextUntilNodes=12
+bench_traversal_test.go:512: 	NextUntilNodes=12
+bench_traversal_test.go:512: 	NextUntilNodes=12
+BenchmarkPrevUntil	    5000	    433383 ns/op
+--- BENCH: BenchmarkPrevUntil
+bench_traversal_test.go:528: 	PrevUntil=238
+bench_traversal_test.go:528: 	PrevUntil=238
+bench_traversal_test.go:528: 	PrevUntil=238
+BenchmarkPrevUntilSelection	   10000	    116423 ns/op
+--- BENCH: BenchmarkPrevUntilSelection
+bench_traversal_test.go:545: 	PrevUntilSelection=49
+bench_traversal_test.go:545: 	PrevUntilSelection=49
+bench_traversal_test.go:545: 	PrevUntilSelection=49
+BenchmarkPrevUntilNodes	   50000	     35338 ns/op
+--- BENCH: BenchmarkPrevUntilNodes
+bench_traversal_test.go:563: 	PrevUntilNodes=11
+bench_traversal_test.go:563: 	PrevUntilNodes=11
+bench_traversal_test.go:563: 	PrevUntilNodes=11
+bench_traversal_test.go:563: 	PrevUntilNodes=11
+BenchmarkNextFilteredUntil	   10000	    104686 ns/op
+--- BENCH: BenchmarkNextFilteredUntil
+bench_traversal_test.go:579: 	NextFilteredUntil=22
+bench_traversal_test.go:579: 	NextFilteredUntil=22
+bench_traversal_test.go:579: 	NextFilteredUntil=22
+BenchmarkNextFilteredUntilSelection	   20000	     99485 ns/op
+--- BENCH: BenchmarkNextFilteredUntilSelection
+bench_traversal_test.go:596: 	NextFilteredUntilSelection=22
+bench_traversal_test.go:596: 	NextFilteredUntilSelection=22
+bench_traversal_test.go:596: 	NextFilteredUntilSelection=22
+bench_traversal_test.go:596: 	NextFilteredUntilSelection=22
+BenchmarkNextFilteredUntilNodes	   20000	     99452 ns/op
+--- BENCH: BenchmarkNextFilteredUntilNodes
+bench_traversal_test.go:614: 	NextFilteredUntilNodes=22
+bench_traversal_test.go:614: 	NextFilteredUntilNodes=22
+bench_traversal_test.go:614: 	NextFilteredUntilNodes=22
+bench_traversal_test.go:614: 	NextFilteredUntilNodes=22
+BenchmarkPrevFilteredUntil	   10000	    112640 ns/op
+--- BENCH: BenchmarkPrevFilteredUntil
+bench_traversal_test.go:630: 	PrevFilteredUntil=20
+bench_traversal_test.go:630: 	PrevFilteredUntil=20
+bench_traversal_test.go:630: 	PrevFilteredUntil=20
+BenchmarkPrevFilteredUntilSelection	   10000	    103702 ns/op
+--- BENCH: BenchmarkPrevFilteredUntilSelection
+bench_traversal_test.go:647: 	PrevFilteredUntilSelection=20
+bench_traversal_test.go:647: 	PrevFilteredUntilSelection=20
+bench_traversal_test.go:647: 	PrevFilteredUntilSelection=20
+BenchmarkPrevFilteredUntilNodes	   10000	    103277 ns/op
+--- BENCH: BenchmarkPrevFilteredUntilNodes
+bench_traversal_test.go:665: 	PrevFilteredUntilNodes=20
+bench_traversal_test.go:665: 	PrevFilteredUntilNodes=20
+bench_traversal_test.go:665: 	PrevFilteredUntilNodes=20
+BenchmarkClosest	  500000	      6530 ns/op
+--- BENCH: BenchmarkClosest
+bench_traversal_test.go:681: 	Closest=2
+bench_traversal_test.go:681: 	Closest=2
+bench_traversal_test.go:681: 	Closest=2
+bench_traversal_test.go:681: 	Closest=2
+BenchmarkClosestSelection	 1000000	      1135 ns/op
+--- BENCH: BenchmarkClosestSelection
+bench_traversal_test.go:698: 	ClosestSelection=2
+bench_traversal_test.go:698: 	ClosestSelection=2
+bench_traversal_test.go:698: 	ClosestSelection=2
+bench_traversal_test.go:698: 	ClosestSelection=2
+BenchmarkClosestNodes	 1000000	      1133 ns/op
+--- BENCH: BenchmarkClosestNodes
+bench_traversal_test.go:715: 	ClosestNodes=2
+bench_traversal_test.go:715: 	ClosestNodes=2
+bench_traversal_test.go:715: 	ClosestNodes=2
+bench_traversal_test.go:715: 	ClosestNodes=2
+ok  	github.com/PuerkitoBio/goquery	192.541s
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench/v0.2.0-v0.2.1-go1.1rc1.svg b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench/v0.2.0-v0.2.1-go1.1rc1.svg
new file mode 100644
index 00000000..eaabc618
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench/v0.2.0-v0.2.1-go1.1rc1.svg
@@ -0,0 +1,420 @@
+<?xml version="1.0"?>
+<!-- Generated by SVGo -->
+<svg width="1024" height="768"
+     xmlns="http://www.w3.org/2000/svg" 
+     xmlns:xlink="http://www.w3.org/1999/xlink">
+<g style="font-size:20px;font-family:sans-serif">
+<rect x="0" y="0" width="1024" height="768" style="fill:white"/>
+<text x="100" y="50" style="font-size:150%"></text>
+<g style="font-style:italic;font-size:75%">
+<rect x="606" y="118" width="6" height="20" style="fill-opacity:0.3;fill:red"/>
+<text x="601" y="133" style="text-anchor:end">+2.12%</text>
+</g>
+<text x="100" y="138" style="text-anchor:start">BenchmarkFirst</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="609" y="144" width="3" height="20" style="fill-opacity:0.3;fill:red"/>
+<text x="604" y="159" style="text-anchor:end">+1.06%</text>
+</g>
+<text x="100" y="164" style="text-anchor:start">BenchmarkLast</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="602" y="170" width="10" height="20" style="fill-opacity:0.3;fill:red"/>
+<text x="597" y="185" style="text-anchor:end">+3.63%</text>
+</g>
+<text x="100" y="190" style="text-anchor:start">BenchmarkEq</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="604" y="196" width="8" height="20" style="fill-opacity:0.3;fill:red"/>
+<text x="599" y="211" style="text-anchor:end">+2.67%</text>
+</g>
+<text x="100" y="216" style="text-anchor:start">BenchmarkSlice</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="222" width="72" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="689" y="237" style="text-anchor:start">-24.26%</text>
+</g>
+<text x="100" y="242" style="text-anchor:start">BenchmarkGet</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="248" width="125" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="742" y="263" style="text-anchor:start">-41.71%</text>
+</g>
+<text x="100" y="268" style="text-anchor:start">BenchmarkIndex</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="274" width="151" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="768" y="289" style="text-anchor:start">-50.42%</text>
+</g>
+<text x="100" y="294" style="text-anchor:start">BenchmarkIndexSelector</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="595" y="300" width="17" height="20" style="fill-opacity:0.3;fill:red"/>
+<text x="590" y="315" style="text-anchor:end">+5.94%</text>
+</g>
+<text x="100" y="320" style="text-anchor:start">BenchmarkIndexOfNode</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="588" y="326" width="24" height="20" style="fill-opacity:0.3;fill:red"/>
+<text x="583" y="341" style="text-anchor:end">+8.26%</text>
+</g>
+<text x="100" y="346" style="text-anchor:start">BenchmarkIndexOfSelection</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="352" width="98" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="715" y="367" style="text-anchor:start">-32.94%</text>
+</g>
+<text x="100" y="372" style="text-anchor:start">BenchmarkMetalReviewExample</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="378" width="170" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="787" y="393" style="text-anchor:start">-56.84%</text>
+</g>
+<text x="100" y="398" style="text-anchor:start">BenchmarkAdd</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="593" y="404" width="19" height="20" style="fill-opacity:0.3;fill:red"/>
+<text x="588" y="419" style="text-anchor:end">+6.63%</text>
+</g>
+<text x="100" y="424" style="text-anchor:start">BenchmarkAddSelection</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="584" y="430" width="28" height="20" style="fill-opacity:0.3;fill:red"/>
+<text x="579" y="445" style="text-anchor:end">+9.42%</text>
+</g>
+<text x="100" y="450" style="text-anchor:start">BenchmarkAddNodes</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="604" y="456" width="8" height="20" style="fill-opacity:0.3;fill:red"/>
+<text x="599" y="471" style="text-anchor:end">+2.93%</text>
+</g>
+<text x="100" y="476" style="text-anchor:start">BenchmarkAndSelf</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="482" width="41" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="658" y="497" style="text-anchor:start">-13.75%</text>
+</g>
+<text x="100" y="502" style="text-anchor:start">BenchmarkFilter</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="508" width="44" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="661" y="523" style="text-anchor:start">-14.90%</text>
+</g>
+<text x="100" y="528" style="text-anchor:start">BenchmarkNot</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="609" y="534" width="3" height="20" style="fill-opacity:0.3;fill:red"/>
+<text x="604" y="549" style="text-anchor:end">+1.07%</text>
+</g>
+<text x="100" y="554" style="text-anchor:start">BenchmarkFilterFunction</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="598" y="560" width="14" height="20" style="fill-opacity:0.3;fill:red"/>
+<text x="593" y="575" style="text-anchor:end">+4.91%</text>
+</g>
+<text x="100" y="580" style="text-anchor:start">BenchmarkNotFunction</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="609" y="586" width="3" height="20" style="fill-opacity:0.3;fill:red"/>
+<text x="604" y="601" style="text-anchor:end">+1.03%</text>
+</g>
+<text x="100" y="606" style="text-anchor:start">BenchmarkFilterNodes</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="600" y="612" width="12" height="20" style="fill-opacity:0.3;fill:red"/>
+<text x="595" y="627" style="text-anchor:end">+4.22%</text>
+</g>
+<text x="100" y="632" style="text-anchor:start">BenchmarkNotNodes</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="638" width="3" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="620" y="653" style="text-anchor:start">-1.00%</text>
+</g>
+<text x="100" y="658" style="text-anchor:start">BenchmarkFilterSelection</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="600" y="664" width="12" height="20" style="fill-opacity:0.3;fill:red"/>
+<text x="595" y="679" style="text-anchor:end">+4.00%</text>
+</g>
+<text x="100" y="684" style="text-anchor:start">BenchmarkNotSelection</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="690" width="96" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="713" y="705" style="text-anchor:start">-32.12%</text>
+</g>
+<text x="100" y="710" style="text-anchor:start">BenchmarkHas</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="608" y="716" width="4" height="20" style="fill-opacity:0.3;fill:red"/>
+<text x="603" y="731" style="text-anchor:end">+1.59%</text>
+</g>
+<text x="100" y="736" style="text-anchor:start">BenchmarkHasNodes</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="608" y="742" width="4" height="20" style="fill-opacity:0.3;fill:red"/>
+<text x="603" y="757" style="text-anchor:end">+1.56%</text>
+</g>
+<text x="100" y="762" style="text-anchor:start">BenchmarkHasSelection</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="566" y="768" width="46" height="20" style="fill-opacity:0.3;fill:red"/>
+<text x="561" y="783" style="text-anchor:end">+15.54%</text>
+</g>
+<text x="100" y="788" style="text-anchor:start">BenchmarkEnd</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="607" y="794" width="5" height="20" style="fill-opacity:0.3;fill:red"/>
+<text x="602" y="809" style="text-anchor:end">+1.77%</text>
+</g>
+<text x="100" y="814" style="text-anchor:start">BenchmarkEach</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="820" width="10" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="627" y="835" style="text-anchor:start">-3.61%</text>
+</g>
+<text x="100" y="840" style="text-anchor:start">BenchmarkMap</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="846" width="49" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="666" y="861" style="text-anchor:start">-16.48%</text>
+</g>
+<text x="100" y="866" style="text-anchor:start">BenchmarkAttr</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="609" y="872" width="3" height="20" style="fill-opacity:0.3;fill:red"/>
+<text x="604" y="887" style="text-anchor:end">+1.33%</text>
+</g>
+<text x="100" y="892" style="text-anchor:start">BenchmarkText</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="898" width="177" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="794" y="913" style="text-anchor:start">-59.21%</text>
+</g>
+<text x="100" y="918" style="text-anchor:start">BenchmarkLength</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="924" width="27" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="644" y="939" style="text-anchor:start">-9.01%</text>
+</g>
+<text x="100" y="944" style="text-anchor:start">BenchmarkHtml</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="950" width="50" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="667" y="965" style="text-anchor:start">-16.73%</text>
+</g>
+<text x="100" y="970" style="text-anchor:start">BenchmarkIs</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="976" width="75" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="692" y="991" style="text-anchor:start">-25.08%</text>
+</g>
+<text x="100" y="996" style="text-anchor:start">BenchmarkIsPositional</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1002" width="34" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="651" y="1017" style="text-anchor:start">-11.55%</text>
+</g>
+<text x="100" y="1022" style="text-anchor:start">BenchmarkIsFunction</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="609" y="1028" width="3" height="20" style="fill-opacity:0.3;fill:red"/>
+<text x="604" y="1043" style="text-anchor:end">+1.28%</text>
+</g>
+<text x="100" y="1048" style="text-anchor:start">BenchmarkIsSelection</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="606" y="1054" width="6" height="20" style="fill-opacity:0.3;fill:red"/>
+<text x="601" y="1069" style="text-anchor:end">+2.10%</text>
+</g>
+<text x="100" y="1074" style="text-anchor:start">BenchmarkIsNodes</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1080" width="47" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="664" y="1095" style="text-anchor:start">-15.99%</text>
+</g>
+<text x="100" y="1100" style="text-anchor:start">BenchmarkHasClass</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1106" width="7" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="624" y="1121" style="text-anchor:start">-2.65%</text>
+</g>
+<text x="100" y="1126" style="text-anchor:start">BenchmarkContains</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1132" width="145" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="762" y="1147" style="text-anchor:start">-48.54%</text>
+</g>
+<text x="100" y="1152" style="text-anchor:start">BenchmarkFind</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1158" width="128" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="745" y="1173" style="text-anchor:start">-42.71%</text>
+</g>
+<text x="100" y="1178" style="text-anchor:start">BenchmarkFindWithinSelection</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="526" y="1184" width="86" height="20" style="fill-opacity:0.3;fill:red"/>
+<text x="521" y="1199" style="text-anchor:end">+28.77%</text>
+</g>
+<text x="100" y="1204" style="text-anchor:start">BenchmarkFindSelection</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="527" y="1210" width="85" height="20" style="fill-opacity:0.3;fill:red"/>
+<text x="522" y="1225" style="text-anchor:end">+28.47%</text>
+</g>
+<text x="100" y="1230" style="text-anchor:start">BenchmarkFindNodes</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1236" width="188" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="805" y="1251" style="text-anchor:start">-62.84%</text>
+</g>
+<text x="100" y="1256" style="text-anchor:start">BenchmarkContents</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1262" width="174" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="791" y="1277" style="text-anchor:start">-58.06%</text>
+</g>
+<text x="100" y="1282" style="text-anchor:start">BenchmarkContentsFiltered</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1288" width="189" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="806" y="1303" style="text-anchor:start">-63.13%</text>
+</g>
+<text x="100" y="1308" style="text-anchor:start">BenchmarkChildren</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1314" width="114" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="731" y="1329" style="text-anchor:start">-38.24%</text>
+</g>
+<text x="100" y="1334" style="text-anchor:start">BenchmarkChildrenFiltered</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1340" width="10" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="627" y="1355" style="text-anchor:start">-3.66%</text>
+</g>
+<text x="100" y="1360" style="text-anchor:start">BenchmarkParent</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1366" width="18" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="635" y="1381" style="text-anchor:start">-6.06%</text>
+</g>
+<text x="100" y="1386" style="text-anchor:start">BenchmarkParentFiltered</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="602" y="1392" width="10" height="20" style="fill-opacity:0.3;fill:red"/>
+<text x="597" y="1407" style="text-anchor:end">+3.64%</text>
+</g>
+<text x="100" y="1412" style="text-anchor:start">BenchmarkParents</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="608" y="1418" width="4" height="20" style="fill-opacity:0.3;fill:red"/>
+<text x="603" y="1433" style="text-anchor:end">+1.44%</text>
+</g>
+<text x="100" y="1438" style="text-anchor:start">BenchmarkParentsFiltered</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1444" width="133" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="750" y="1459" style="text-anchor:start">-44.35%</text>
+</g>
+<text x="100" y="1464" style="text-anchor:start">BenchmarkParentsUntil</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1470" width="95" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="712" y="1485" style="text-anchor:start">-31.99%</text>
+</g>
+<text x="100" y="1490" style="text-anchor:start">BenchmarkParentsUntilSelection</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1496" width="97" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="714" y="1511" style="text-anchor:start">-32.62%</text>
+</g>
+<text x="100" y="1516" style="text-anchor:start">BenchmarkParentsUntilNodes</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1522" width="137" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="754" y="1537" style="text-anchor:start">-45.83%</text>
+</g>
+<text x="100" y="1542" style="text-anchor:start">BenchmarkParentsFilteredUntil</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1548" width="90" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="707" y="1563" style="text-anchor:start">-30.05%</text>
+</g>
+<text x="100" y="1568" style="text-anchor:start">BenchmarkParentsFilteredUntilSelection</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1574" width="89" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="706" y="1589" style="text-anchor:start">-29.97%</text>
+</g>
+<text x="100" y="1594" style="text-anchor:start">BenchmarkParentsFilteredUntilNodes</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1600" width="77" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="694" y="1615" style="text-anchor:start">-25.96%</text>
+</g>
+<text x="100" y="1620" style="text-anchor:start">BenchmarkSiblings</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1626" width="80" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="697" y="1641" style="text-anchor:start">-26.67%</text>
+</g>
+<text x="100" y="1646" style="text-anchor:start">BenchmarkSiblingsFiltered</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1652" width="199" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="816" y="1667" style="text-anchor:start">-66.40%</text>
+</g>
+<text x="100" y="1672" style="text-anchor:start">BenchmarkNext</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1678" width="193" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="810" y="1693" style="text-anchor:start">-64.46%</text>
+</g>
+<text x="100" y="1698" style="text-anchor:start">BenchmarkNextFiltered</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1704" width="79" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="696" y="1719" style="text-anchor:start">-26.50%</text>
+</g>
+<text x="100" y="1724" style="text-anchor:start">BenchmarkNextAll</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1730" width="78" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="695" y="1745" style="text-anchor:start">-26.27%</text>
+</g>
+<text x="100" y="1750" style="text-anchor:start">BenchmarkNextAllFiltered</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1756" width="200" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="817" y="1771" style="text-anchor:start">-66.84%</text>
+</g>
+<text x="100" y="1776" style="text-anchor:start">BenchmarkPrev</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1782" width="193" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="810" y="1797" style="text-anchor:start">-64.35%</text>
+</g>
+<text x="100" y="1802" style="text-anchor:start">BenchmarkPrevFiltered</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1808" width="120" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="737" y="1823" style="text-anchor:start">-40.05%</text>
+</g>
+<text x="100" y="1828" style="text-anchor:start">BenchmarkPrevAll</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1834" width="119" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="736" y="1849" style="text-anchor:start">-39.74%</text>
+</g>
+<text x="100" y="1854" style="text-anchor:start">BenchmarkPrevAllFiltered</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1860" width="155" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="772" y="1875" style="text-anchor:start">-51.73%</text>
+</g>
+<text x="100" y="1880" style="text-anchor:start">BenchmarkNextUntil</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1886" width="100" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="717" y="1901" style="text-anchor:start">-33.42%</text>
+</g>
+<text x="100" y="1906" style="text-anchor:start">BenchmarkNextUntilSelection</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1912" width="121" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="738" y="1927" style="text-anchor:start">-40.42%</text>
+</g>
+<text x="100" y="1932" style="text-anchor:start">BenchmarkNextUntilNodes</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1938" width="140" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="757" y="1953" style="text-anchor:start">-46.87%</text>
+</g>
+<text x="100" y="1958" style="text-anchor:start">BenchmarkPrevUntil</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1964" width="99" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="716" y="1979" style="text-anchor:start">-33.14%</text>
+</g>
+<text x="100" y="1984" style="text-anchor:start">BenchmarkPrevUntilSelection</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="1990" width="123" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="740" y="2005" style="text-anchor:start">-41.19%</text>
+</g>
+<text x="100" y="2010" style="text-anchor:start">BenchmarkPrevUntilNodes</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="2016" width="167" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="784" y="2031" style="text-anchor:start">-55.92%</text>
+</g>
+<text x="100" y="2036" style="text-anchor:start">BenchmarkNextFilteredUntil</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="2042" width="97" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="714" y="2057" style="text-anchor:start">-32.49%</text>
+</g>
+<text x="100" y="2062" style="text-anchor:start">BenchmarkNextFilteredUntilSelection</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="2068" width="99" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="716" y="2083" style="text-anchor:start">-33.00%</text>
+</g>
+<text x="100" y="2088" style="text-anchor:start">BenchmarkNextFilteredUntilNodes</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="2094" width="175" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="792" y="2109" style="text-anchor:start">-58.54%</text>
+</g>
+<text x="100" y="2114" style="text-anchor:start">BenchmarkPrevFilteredUntil</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="2120" width="101" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="718" y="2135" style="text-anchor:start">-33.80%</text>
+</g>
+<text x="100" y="2140" style="text-anchor:start">BenchmarkPrevFilteredUntilSelection</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="2146" width="100" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="717" y="2161" style="text-anchor:start">-33.44%</text>
+</g>
+<text x="100" y="2166" style="text-anchor:start">BenchmarkPrevFilteredUntilNodes</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="2172" width="74" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="691" y="2187" style="text-anchor:start">-24.82%</text>
+</g>
+<text x="100" y="2192" style="text-anchor:start">BenchmarkClosest</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="2198" width="103" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="720" y="2213" style="text-anchor:start">-34.45%</text>
+</g>
+<text x="100" y="2218" style="text-anchor:start">BenchmarkClosestSelection</text>
+<g style="font-style:italic;font-size:75%">
+<rect x="612" y="2224" width="105" height="20" style="fill-opacity:0.3;fill:green"/>
+<text x="722" y="2239" style="text-anchor:start">-35.30%</text>
+</g>
+<text x="100" y="2244" style="text-anchor:start">BenchmarkClosestNodes</text>
+</g>
+</svg>
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench/v0.2.1-go1.1rc1 b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench/v0.2.1-go1.1rc1
new file mode 100644
index 00000000..1f2a426d
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench/v0.2.1-go1.1rc1
@@ -0,0 +1,470 @@
+PASS
+BenchmarkFirst	20000000	        96.3 ns/op
+BenchmarkLast	20000000	        95.7 ns/op
+BenchmarkEq	20000000	        97.1 ns/op
+BenchmarkSlice	20000000	        92.3 ns/op
+BenchmarkGet	1000000000	         2.06 ns/op
+BenchmarkIndex	 1000000	      1069 ns/op
+--- BENCH: BenchmarkIndex
+	bench_array_test.go:73: Index=3
+	bench_array_test.go:73: Index=3
+	bench_array_test.go:73: Index=3
+	bench_array_test.go:73: Index=3
+BenchmarkIndexSelector	  100000	     26750 ns/op
+--- BENCH: BenchmarkIndexSelector
+	bench_array_test.go:85: IndexSelector=4
+	bench_array_test.go:85: IndexSelector=4
+	bench_array_test.go:85: IndexSelector=4
+	bench_array_test.go:85: IndexSelector=4
+BenchmarkIndexOfNode	100000000	        10.7 ns/op
+--- BENCH: BenchmarkIndexOfNode
+	bench_array_test.go:99: IndexOfNode=2
+	bench_array_test.go:99: IndexOfNode=2
+	bench_array_test.go:99: IndexOfNode=2
+	bench_array_test.go:99: IndexOfNode=2
+	bench_array_test.go:99: IndexOfNode=2
+BenchmarkIndexOfSelection	100000000	        11.8 ns/op
+--- BENCH: BenchmarkIndexOfSelection
+	bench_array_test.go:111: IndexOfSelection=2
+	bench_array_test.go:111: IndexOfSelection=2
+	bench_array_test.go:111: IndexOfSelection=2
+	bench_array_test.go:111: IndexOfSelection=2
+	bench_array_test.go:111: IndexOfSelection=2
+BenchmarkMetalReviewExample	   10000	    219078 ns/op
+--- BENCH: BenchmarkMetalReviewExample
+	bench_example_test.go:40: Review 0: Midnight - Complete and Total Hell (8.5).
+		Review 1: Over Your Threshold - Facticity (6.0).
+		Review 2: Nuclear Death Terror - Chaos Reigns (7.5).
+		Review 3: Evoken - Atra Mors (9.5).
+		
+	bench_example_test.go:41: MetalReviewExample=10
+	bench_example_test.go:40: Review 0: Midnight - Complete and Total Hell (8.5).
+		Review 1: Over Your Threshold - Facticity (6.0).
+		Review 2: Nuclear Death Terror - Chaos Reigns (7.5).
+		Review 3: Evoken - Atra Mors (9.5).
+	... [output truncated]
+BenchmarkAdd	  100000	     22345 ns/op
+--- BENCH: BenchmarkAdd
+	bench_expand_test.go:20: Add=43
+	bench_expand_test.go:20: Add=43
+	bench_expand_test.go:20: Add=43
+	bench_expand_test.go:20: Add=43
+BenchmarkAddSelection	10000000	       209 ns/op
+--- BENCH: BenchmarkAddSelection
+	bench_expand_test.go:37: AddSelection=43
+	bench_expand_test.go:37: AddSelection=43
+	bench_expand_test.go:37: AddSelection=43
+	bench_expand_test.go:37: AddSelection=43
+	bench_expand_test.go:37: AddSelection=43
+BenchmarkAddNodes	10000000	       209 ns/op
+--- BENCH: BenchmarkAddNodes
+	bench_expand_test.go:55: AddNodes=43
+	bench_expand_test.go:55: AddNodes=43
+	bench_expand_test.go:55: AddNodes=43
+	bench_expand_test.go:55: AddNodes=43
+	bench_expand_test.go:55: AddNodes=43
+BenchmarkAndSelf	 1000000	      2568 ns/op
+--- BENCH: BenchmarkAndSelf
+	bench_expand_test.go:71: AndSelf=44
+	bench_expand_test.go:71: AndSelf=44
+	bench_expand_test.go:71: AndSelf=44
+	bench_expand_test.go:71: AndSelf=44
+BenchmarkFilter	  100000	     26715 ns/op
+--- BENCH: BenchmarkFilter
+	bench_filter_test.go:20: Filter=13
+	bench_filter_test.go:20: Filter=13
+	bench_filter_test.go:20: Filter=13
+	bench_filter_test.go:20: Filter=13
+BenchmarkNot	   50000	     30058 ns/op
+--- BENCH: BenchmarkNot
+	bench_filter_test.go:36: Not=371
+	bench_filter_test.go:36: Not=371
+	bench_filter_test.go:36: Not=371
+	bench_filter_test.go:36: Not=371
+BenchmarkFilterFunction	   50000	     66346 ns/op
+--- BENCH: BenchmarkFilterFunction
+	bench_filter_test.go:55: FilterFunction=112
+	bench_filter_test.go:55: FilterFunction=112
+	bench_filter_test.go:55: FilterFunction=112
+	bench_filter_test.go:55: FilterFunction=112
+BenchmarkNotFunction	   50000	     72646 ns/op
+--- BENCH: BenchmarkNotFunction
+	bench_filter_test.go:74: NotFunction=261
+	bench_filter_test.go:74: NotFunction=261
+	bench_filter_test.go:74: NotFunction=261
+	bench_filter_test.go:74: NotFunction=261
+BenchmarkFilterNodes	   50000	     65493 ns/op
+--- BENCH: BenchmarkFilterNodes
+	bench_filter_test.go:92: FilterNodes=2
+	bench_filter_test.go:92: FilterNodes=2
+	bench_filter_test.go:92: FilterNodes=2
+	bench_filter_test.go:92: FilterNodes=2
+BenchmarkNotNodes	   20000	     79466 ns/op
+--- BENCH: BenchmarkNotNodes
+	bench_filter_test.go:110: NotNodes=360
+	bench_filter_test.go:110: NotNodes=360
+	bench_filter_test.go:110: NotNodes=360
+	bench_filter_test.go:110: NotNodes=360
+BenchmarkFilterSelection	   50000	     65494 ns/op
+--- BENCH: BenchmarkFilterSelection
+	bench_filter_test.go:127: FilterSelection=2
+	bench_filter_test.go:127: FilterSelection=2
+	bench_filter_test.go:127: FilterSelection=2
+	bench_filter_test.go:127: FilterSelection=2
+BenchmarkNotSelection	   20000	     79387 ns/op
+--- BENCH: BenchmarkNotSelection
+	bench_filter_test.go:144: NotSelection=360
+	bench_filter_test.go:144: NotSelection=360
+	bench_filter_test.go:144: NotSelection=360
+	bench_filter_test.go:144: NotSelection=360
+BenchmarkHas	    5000	    386571 ns/op
+--- BENCH: BenchmarkHas
+	bench_filter_test.go:160: Has=13
+	bench_filter_test.go:160: Has=13
+	bench_filter_test.go:160: Has=13
+BenchmarkHasNodes	   10000	    230664 ns/op
+--- BENCH: BenchmarkHasNodes
+	bench_filter_test.go:178: HasNodes=15
+	bench_filter_test.go:178: HasNodes=15
+	bench_filter_test.go:178: HasNodes=15
+BenchmarkHasSelection	   10000	    230705 ns/op
+--- BENCH: BenchmarkHasSelection
+	bench_filter_test.go:195: HasSelection=15
+	bench_filter_test.go:195: HasSelection=15
+	bench_filter_test.go:195: HasSelection=15
+BenchmarkEnd	500000000	         4.61 ns/op
+--- BENCH: BenchmarkEnd
+	bench_filter_test.go:211: End=373
+	bench_filter_test.go:211: End=373
+	bench_filter_test.go:211: End=373
+	bench_filter_test.go:211: End=373
+	bench_filter_test.go:211: End=373
+	bench_filter_test.go:211: End=373
+BenchmarkEach	  200000	      9520 ns/op
+--- BENCH: BenchmarkEach
+	bench_iteration_test.go:22: Each=59
+	bench_iteration_test.go:22: Each=59
+	bench_iteration_test.go:22: Each=59
+	bench_iteration_test.go:22: Each=59
+BenchmarkMap	  100000	     15960 ns/op
+--- BENCH: BenchmarkMap
+	bench_iteration_test.go:41: Map=59
+	bench_iteration_test.go:41: Map=59
+	bench_iteration_test.go:41: Map=59
+	bench_iteration_test.go:41: Map=59
+BenchmarkAttr	50000000	        30.4 ns/op
+--- BENCH: BenchmarkAttr
+	bench_property_test.go:16: Attr=firstHeading
+	bench_property_test.go:16: Attr=firstHeading
+	bench_property_test.go:16: Attr=firstHeading
+	bench_property_test.go:16: Attr=firstHeading
+	bench_property_test.go:16: Attr=firstHeading
+BenchmarkText	  100000	     18718 ns/op
+BenchmarkLength	2000000000	         0.31 ns/op
+--- BENCH: BenchmarkLength
+	bench_property_test.go:37: Length=14
+	bench_property_test.go:37: Length=14
+	bench_property_test.go:37: Length=14
+	bench_property_test.go:37: Length=14
+	bench_property_test.go:37: Length=14
+	bench_property_test.go:37: Length=14
+BenchmarkHtml	 5000000	       606 ns/op
+BenchmarkIs	  100000	     29289 ns/op
+--- BENCH: BenchmarkIs
+	bench_query_test.go:16: Is=true
+	bench_query_test.go:16: Is=true
+	bench_query_test.go:16: Is=true
+	bench_query_test.go:16: Is=true
+BenchmarkIsPositional	  100000	     23834 ns/op
+--- BENCH: BenchmarkIsPositional
+	bench_query_test.go:28: IsPositional=true
+	bench_query_test.go:28: IsPositional=true
+	bench_query_test.go:28: IsPositional=true
+	bench_query_test.go:28: IsPositional=true
+BenchmarkIsFunction	 1000000	      2436 ns/op
+--- BENCH: BenchmarkIsFunction
+	bench_query_test.go:43: IsFunction=true
+	bench_query_test.go:43: IsFunction=true
+	bench_query_test.go:43: IsFunction=true
+	bench_query_test.go:43: IsFunction=true
+BenchmarkIsSelection	   50000	     67106 ns/op
+--- BENCH: BenchmarkIsSelection
+	bench_query_test.go:56: IsSelection=true
+	bench_query_test.go:56: IsSelection=true
+	bench_query_test.go:56: IsSelection=true
+	bench_query_test.go:56: IsSelection=true
+BenchmarkIsNodes	   50000	     66042 ns/op
+--- BENCH: BenchmarkIsNodes
+	bench_query_test.go:70: IsNodes=true
+	bench_query_test.go:70: IsNodes=true
+	bench_query_test.go:70: IsNodes=true
+	bench_query_test.go:70: IsNodes=true
+BenchmarkHasClass	    5000	    565347 ns/op
+--- BENCH: BenchmarkHasClass
+	bench_query_test.go:82: HasClass=true
+	bench_query_test.go:82: HasClass=true
+	bench_query_test.go:82: HasClass=true
+BenchmarkContains	100000000	        11.0 ns/op
+--- BENCH: BenchmarkContains
+	bench_query_test.go:96: Contains=true
+	bench_query_test.go:96: Contains=true
+	bench_query_test.go:96: Contains=true
+	bench_query_test.go:96: Contains=true
+	bench_query_test.go:96: Contains=true
+BenchmarkFind	  100000	     27677 ns/op
+--- BENCH: BenchmarkFind
+	bench_traversal_test.go:18: Find=41
+	bench_traversal_test.go:18: Find=41
+	bench_traversal_test.go:18: Find=41
+	bench_traversal_test.go:18: Find=41
+BenchmarkFindWithinSelection	   50000	     72162 ns/op
+--- BENCH: BenchmarkFindWithinSelection
+	bench_traversal_test.go:34: FindWithinSelection=39
+	bench_traversal_test.go:34: FindWithinSelection=39
+	bench_traversal_test.go:34: FindWithinSelection=39
+	bench_traversal_test.go:34: FindWithinSelection=39
+BenchmarkFindSelection	    5000	    460124 ns/op
+--- BENCH: BenchmarkFindSelection
+	bench_traversal_test.go:51: FindSelection=73
+	bench_traversal_test.go:51: FindSelection=73
+	bench_traversal_test.go:51: FindSelection=73
+BenchmarkFindNodes	    5000	    459390 ns/op
+--- BENCH: BenchmarkFindNodes
+	bench_traversal_test.go:69: FindNodes=73
+	bench_traversal_test.go:69: FindNodes=73
+	bench_traversal_test.go:69: FindNodes=73
+BenchmarkContents	  500000	      3395 ns/op
+--- BENCH: BenchmarkContents
+	bench_traversal_test.go:85: Contents=16
+	bench_traversal_test.go:85: Contents=16
+	bench_traversal_test.go:85: Contents=16
+	bench_traversal_test.go:85: Contents=16
+BenchmarkContentsFiltered	  500000	      5193 ns/op
+--- BENCH: BenchmarkContentsFiltered
+	bench_traversal_test.go:101: ContentsFiltered=1
+	bench_traversal_test.go:101: ContentsFiltered=1
+	bench_traversal_test.go:101: ContentsFiltered=1
+	bench_traversal_test.go:101: ContentsFiltered=1
+BenchmarkChildren	 5000000	       667 ns/op
+--- BENCH: BenchmarkChildren
+	bench_traversal_test.go:117: Children=2
+	bench_traversal_test.go:117: Children=2
+	bench_traversal_test.go:117: Children=2
+	bench_traversal_test.go:117: Children=2
+	bench_traversal_test.go:117: Children=2
+BenchmarkChildrenFiltered	  500000	      3591 ns/op
+--- BENCH: BenchmarkChildrenFiltered
+	bench_traversal_test.go:133: ChildrenFiltered=2
+	bench_traversal_test.go:133: ChildrenFiltered=2
+	bench_traversal_test.go:133: ChildrenFiltered=2
+	bench_traversal_test.go:133: ChildrenFiltered=2
+BenchmarkParent	   50000	     43168 ns/op
+--- BENCH: BenchmarkParent
+	bench_traversal_test.go:149: Parent=55
+	bench_traversal_test.go:149: Parent=55
+	bench_traversal_test.go:149: Parent=55
+	bench_traversal_test.go:149: Parent=55
+BenchmarkParentFiltered	   50000	     45836 ns/op
+--- BENCH: BenchmarkParentFiltered
+	bench_traversal_test.go:165: ParentFiltered=4
+	bench_traversal_test.go:165: ParentFiltered=4
+	bench_traversal_test.go:165: ParentFiltered=4
+	bench_traversal_test.go:165: ParentFiltered=4
+BenchmarkParents	   20000	     92348 ns/op
+--- BENCH: BenchmarkParents
+	bench_traversal_test.go:181: Parents=73
+	bench_traversal_test.go:181: Parents=73
+	bench_traversal_test.go:181: Parents=73
+	bench_traversal_test.go:181: Parents=73
+BenchmarkParentsFiltered	   20000	     95306 ns/op
+--- BENCH: BenchmarkParentsFiltered
+	bench_traversal_test.go:197: ParentsFiltered=18
+	bench_traversal_test.go:197: ParentsFiltered=18
+	bench_traversal_test.go:197: ParentsFiltered=18
+	bench_traversal_test.go:197: ParentsFiltered=18
+BenchmarkParentsUntil	   50000	     72782 ns/op
+--- BENCH: BenchmarkParentsUntil
+	bench_traversal_test.go:213: ParentsUntil=52
+	bench_traversal_test.go:213: ParentsUntil=52
+	bench_traversal_test.go:213: ParentsUntil=52
+	bench_traversal_test.go:213: ParentsUntil=52
+BenchmarkParentsUntilSelection	   10000	    157639 ns/op
+--- BENCH: BenchmarkParentsUntilSelection
+	bench_traversal_test.go:230: ParentsUntilSelection=70
+	bench_traversal_test.go:230: ParentsUntilSelection=70
+	bench_traversal_test.go:230: ParentsUntilSelection=70
+BenchmarkParentsUntilNodes	   10000	    157510 ns/op
+--- BENCH: BenchmarkParentsUntilNodes
+	bench_traversal_test.go:248: ParentsUntilNodes=70
+	bench_traversal_test.go:248: ParentsUntilNodes=70
+	bench_traversal_test.go:248: ParentsUntilNodes=70
+BenchmarkParentsFilteredUntil	  100000	     16987 ns/op
+--- BENCH: BenchmarkParentsFilteredUntil
+	bench_traversal_test.go:264: ParentsFilteredUntil=2
+	bench_traversal_test.go:264: ParentsFilteredUntil=2
+	bench_traversal_test.go:264: ParentsFilteredUntil=2
+	bench_traversal_test.go:264: ParentsFilteredUntil=2
+BenchmarkParentsFilteredUntilSelection	  100000	     21174 ns/op
+--- BENCH: BenchmarkParentsFilteredUntilSelection
+	bench_traversal_test.go:281: ParentsFilteredUntilSelection=2
+	bench_traversal_test.go:281: ParentsFilteredUntilSelection=2
+	bench_traversal_test.go:281: ParentsFilteredUntilSelection=2
+	bench_traversal_test.go:281: ParentsFilteredUntilSelection=2
+BenchmarkParentsFilteredUntilNodes	  100000	     21238 ns/op
+--- BENCH: BenchmarkParentsFilteredUntilNodes
+	bench_traversal_test.go:299: ParentsFilteredUntilNodes=2
+	bench_traversal_test.go:299: ParentsFilteredUntilNodes=2
+	bench_traversal_test.go:299: ParentsFilteredUntilNodes=2
+	bench_traversal_test.go:299: ParentsFilteredUntilNodes=2
+BenchmarkSiblings	   50000	     66536 ns/op
+--- BENCH: BenchmarkSiblings
+	bench_traversal_test.go:315: Siblings=293
+	bench_traversal_test.go:315: Siblings=293
+	bench_traversal_test.go:315: Siblings=293
+	bench_traversal_test.go:315: Siblings=293
+BenchmarkSiblingsFiltered	   50000	     71822 ns/op
+--- BENCH: BenchmarkSiblingsFiltered
+	bench_traversal_test.go:331: SiblingsFiltered=46
+	bench_traversal_test.go:331: SiblingsFiltered=46
+	bench_traversal_test.go:331: SiblingsFiltered=46
+	bench_traversal_test.go:331: SiblingsFiltered=46
+BenchmarkNext	  200000	     10745 ns/op
+--- BENCH: BenchmarkNext
+	bench_traversal_test.go:347: Next=49
+	bench_traversal_test.go:347: Next=49
+	bench_traversal_test.go:347: Next=49
+	bench_traversal_test.go:347: Next=49
+BenchmarkNextFiltered	  200000	     12399 ns/op
+--- BENCH: BenchmarkNextFiltered
+	bench_traversal_test.go:363: NextFiltered=6
+	bench_traversal_test.go:363: NextFiltered=6
+	bench_traversal_test.go:363: NextFiltered=6
+	bench_traversal_test.go:363: NextFiltered=6
+BenchmarkNextAll	   50000	     44640 ns/op
+--- BENCH: BenchmarkNextAll
+	bench_traversal_test.go:379: NextAll=234
+	bench_traversal_test.go:379: NextAll=234
+	bench_traversal_test.go:379: NextAll=234
+	bench_traversal_test.go:379: NextAll=234
+BenchmarkNextAllFiltered	   50000	     49713 ns/op
+--- BENCH: BenchmarkNextAllFiltered
+	bench_traversal_test.go:395: NextAllFiltered=33
+	bench_traversal_test.go:395: NextAllFiltered=33
+	bench_traversal_test.go:395: NextAllFiltered=33
+	bench_traversal_test.go:395: NextAllFiltered=33
+BenchmarkPrev	  200000	     10743 ns/op
+--- BENCH: BenchmarkPrev
+	bench_traversal_test.go:411: Prev=49
+	bench_traversal_test.go:411: Prev=49
+	bench_traversal_test.go:411: Prev=49
+	bench_traversal_test.go:411: Prev=49
+BenchmarkPrevFiltered	  200000	     12456 ns/op
+--- BENCH: BenchmarkPrevFiltered
+	bench_traversal_test.go:429: PrevFiltered=7
+	bench_traversal_test.go:429: PrevFiltered=7
+	bench_traversal_test.go:429: PrevFiltered=7
+	bench_traversal_test.go:429: PrevFiltered=7
+BenchmarkPrevAll	  100000	     17600 ns/op
+--- BENCH: BenchmarkPrevAll
+	bench_traversal_test.go:445: PrevAll=78
+	bench_traversal_test.go:445: PrevAll=78
+	bench_traversal_test.go:445: PrevAll=78
+	bench_traversal_test.go:445: PrevAll=78
+BenchmarkPrevAllFiltered	  100000	     19460 ns/op
+--- BENCH: BenchmarkPrevAllFiltered
+	bench_traversal_test.go:461: PrevAllFiltered=6
+	bench_traversal_test.go:461: PrevAllFiltered=6
+	bench_traversal_test.go:461: PrevAllFiltered=6
+	bench_traversal_test.go:461: PrevAllFiltered=6
+BenchmarkNextUntil	   20000	     92630 ns/op
+--- BENCH: BenchmarkNextUntil
+	bench_traversal_test.go:477: NextUntil=84
+	bench_traversal_test.go:477: NextUntil=84
+	bench_traversal_test.go:477: NextUntil=84
+	bench_traversal_test.go:477: NextUntil=84
+BenchmarkNextUntilSelection	   50000	     61285 ns/op
+--- BENCH: BenchmarkNextUntilSelection
+	bench_traversal_test.go:494: NextUntilSelection=42
+	bench_traversal_test.go:494: NextUntilSelection=42
+	bench_traversal_test.go:494: NextUntilSelection=42
+	bench_traversal_test.go:494: NextUntilSelection=42
+BenchmarkNextUntilNodes	  100000	     25859 ns/op
+--- BENCH: BenchmarkNextUntilNodes
+	bench_traversal_test.go:512: NextUntilNodes=12
+	bench_traversal_test.go:512: NextUntilNodes=12
+	bench_traversal_test.go:512: NextUntilNodes=12
+	bench_traversal_test.go:512: NextUntilNodes=12
+BenchmarkPrevUntil	   10000	    230236 ns/op
+--- BENCH: BenchmarkPrevUntil
+	bench_traversal_test.go:528: PrevUntil=238
+	bench_traversal_test.go:528: PrevUntil=238
+	bench_traversal_test.go:528: PrevUntil=238
+BenchmarkPrevUntilSelection	   20000	     77837 ns/op
+--- BENCH: BenchmarkPrevUntilSelection
+	bench_traversal_test.go:545: PrevUntilSelection=49
+	bench_traversal_test.go:545: PrevUntilSelection=49
+	bench_traversal_test.go:545: PrevUntilSelection=49
+	bench_traversal_test.go:545: PrevUntilSelection=49
+BenchmarkPrevUntilNodes	  100000	     20784 ns/op
+--- BENCH: BenchmarkPrevUntilNodes
+	bench_traversal_test.go:563: PrevUntilNodes=11
+	bench_traversal_test.go:563: PrevUntilNodes=11
+	bench_traversal_test.go:563: PrevUntilNodes=11
+	bench_traversal_test.go:563: PrevUntilNodes=11
+BenchmarkNextFilteredUntil	   50000	     46147 ns/op
+--- BENCH: BenchmarkNextFilteredUntil
+	bench_traversal_test.go:579: NextFilteredUntil=22
+	bench_traversal_test.go:579: NextFilteredUntil=22
+	bench_traversal_test.go:579: NextFilteredUntil=22
+	bench_traversal_test.go:579: NextFilteredUntil=22
+BenchmarkNextFilteredUntilSelection	   50000	     67164 ns/op
+--- BENCH: BenchmarkNextFilteredUntilSelection
+	bench_traversal_test.go:596: NextFilteredUntilSelection=22
+	bench_traversal_test.go:596: NextFilteredUntilSelection=22
+	bench_traversal_test.go:596: NextFilteredUntilSelection=22
+	bench_traversal_test.go:596: NextFilteredUntilSelection=22
+BenchmarkNextFilteredUntilNodes	   50000	     66628 ns/op
+--- BENCH: BenchmarkNextFilteredUntilNodes
+	bench_traversal_test.go:614: NextFilteredUntilNodes=22
+	bench_traversal_test.go:614: NextFilteredUntilNodes=22
+	bench_traversal_test.go:614: NextFilteredUntilNodes=22
+	bench_traversal_test.go:614: NextFilteredUntilNodes=22
+BenchmarkPrevFilteredUntil	   50000	     46697 ns/op
+--- BENCH: BenchmarkPrevFilteredUntil
+	bench_traversal_test.go:630: PrevFilteredUntil=20
+	bench_traversal_test.go:630: PrevFilteredUntil=20
+	bench_traversal_test.go:630: PrevFilteredUntil=20
+	bench_traversal_test.go:630: PrevFilteredUntil=20
+BenchmarkPrevFilteredUntilSelection	   50000	     68646 ns/op
+--- BENCH: BenchmarkPrevFilteredUntilSelection
+	bench_traversal_test.go:647: PrevFilteredUntilSelection=20
+	bench_traversal_test.go:647: PrevFilteredUntilSelection=20
+	bench_traversal_test.go:647: PrevFilteredUntilSelection=20
+	bench_traversal_test.go:647: PrevFilteredUntilSelection=20
+BenchmarkPrevFilteredUntilNodes	   50000	     68745 ns/op
+--- BENCH: BenchmarkPrevFilteredUntilNodes
+	bench_traversal_test.go:665: PrevFilteredUntilNodes=20
+	bench_traversal_test.go:665: PrevFilteredUntilNodes=20
+	bench_traversal_test.go:665: PrevFilteredUntilNodes=20
+	bench_traversal_test.go:665: PrevFilteredUntilNodes=20
+BenchmarkClosest	  500000	      4909 ns/op
+--- BENCH: BenchmarkClosest
+	bench_traversal_test.go:681: Closest=2
+	bench_traversal_test.go:681: Closest=2
+	bench_traversal_test.go:681: Closest=2
+	bench_traversal_test.go:681: Closest=2
+BenchmarkClosestSelection	 5000000	       744 ns/op
+--- BENCH: BenchmarkClosestSelection
+	bench_traversal_test.go:698: ClosestSelection=2
+	bench_traversal_test.go:698: ClosestSelection=2
+	bench_traversal_test.go:698: ClosestSelection=2
+	bench_traversal_test.go:698: ClosestSelection=2
+	bench_traversal_test.go:698: ClosestSelection=2
+BenchmarkClosestNodes	 5000000	       733 ns/op
+--- BENCH: BenchmarkClosestNodes
+	bench_traversal_test.go:715: ClosestNodes=2
+	bench_traversal_test.go:715: ClosestNodes=2
+	bench_traversal_test.go:715: ClosestNodes=2
+	bench_traversal_test.go:715: ClosestNodes=2
+	bench_traversal_test.go:715: ClosestNodes=2
+ok  	github.com/PuerkitoBio/goquery	220.793s
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench/v0.3.0 b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench/v0.3.0
new file mode 100644
index 00000000..037c9a9d
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench/v0.3.0
@@ -0,0 +1,476 @@
+PASS
+BenchmarkFirst	20000000	        95.5 ns/op
+BenchmarkLast	20000000	        94.9 ns/op
+BenchmarkEq	20000000	        95.7 ns/op
+BenchmarkSlice	20000000	        91.7 ns/op
+BenchmarkGet	1000000000	         2.05 ns/op
+BenchmarkIndex	 1000000	      1079 ns/op
+--- BENCH: BenchmarkIndex
+	bench_array_test.go:73: Index=3
+	bench_array_test.go:73: Index=3
+	bench_array_test.go:73: Index=3
+	bench_array_test.go:73: Index=3
+BenchmarkIndexSelector	  100000	     26972 ns/op
+--- BENCH: BenchmarkIndexSelector
+	bench_array_test.go:85: IndexSelector=4
+	bench_array_test.go:85: IndexSelector=4
+	bench_array_test.go:85: IndexSelector=4
+	bench_array_test.go:85: IndexSelector=4
+BenchmarkIndexOfNode	100000000	        10.8 ns/op
+--- BENCH: BenchmarkIndexOfNode
+	bench_array_test.go:99: IndexOfNode=2
+	bench_array_test.go:99: IndexOfNode=2
+	bench_array_test.go:99: IndexOfNode=2
+	bench_array_test.go:99: IndexOfNode=2
+	bench_array_test.go:99: IndexOfNode=2
+BenchmarkIndexOfSelection	100000000	        11.7 ns/op
+--- BENCH: BenchmarkIndexOfSelection
+	bench_array_test.go:111: IndexOfSelection=2
+	bench_array_test.go:111: IndexOfSelection=2
+	bench_array_test.go:111: IndexOfSelection=2
+	bench_array_test.go:111: IndexOfSelection=2
+	bench_array_test.go:111: IndexOfSelection=2
+BenchmarkMetalReviewExample	   10000	    213800 ns/op
+--- BENCH: BenchmarkMetalReviewExample
+	bench_example_test.go:40: Review 0: Midnight - Complete and Total Hell (8.5).
+		Review 1: Over Your Threshold - Facticity (6.0).
+		Review 2: Nuclear Death Terror - Chaos Reigns (7.5).
+		Review 3: Evoken - Atra Mors (9.5).
+		
+	bench_example_test.go:41: MetalReviewExample=10
+	bench_example_test.go:40: Review 0: Midnight - Complete and Total Hell (8.5).
+		Review 1: Over Your Threshold - Facticity (6.0).
+		Review 2: Nuclear Death Terror - Chaos Reigns (7.5).
+		Review 3: Evoken - Atra Mors (9.5).
+	... [output truncated]
+BenchmarkAdd	  100000	     21811 ns/op
+--- BENCH: BenchmarkAdd
+	bench_expand_test.go:20: Add=43
+	bench_expand_test.go:20: Add=43
+	bench_expand_test.go:20: Add=43
+	bench_expand_test.go:20: Add=43
+BenchmarkAddSelection	10000000	       205 ns/op
+--- BENCH: BenchmarkAddSelection
+	bench_expand_test.go:37: AddSelection=43
+	bench_expand_test.go:37: AddSelection=43
+	bench_expand_test.go:37: AddSelection=43
+	bench_expand_test.go:37: AddSelection=43
+	bench_expand_test.go:37: AddSelection=43
+BenchmarkAddNodes	10000000	       202 ns/op
+--- BENCH: BenchmarkAddNodes
+	bench_expand_test.go:55: AddNodes=43
+	bench_expand_test.go:55: AddNodes=43
+	bench_expand_test.go:55: AddNodes=43
+	bench_expand_test.go:55: AddNodes=43
+	bench_expand_test.go:55: AddNodes=43
+BenchmarkAndSelf	 1000000	      2467 ns/op
+--- BENCH: BenchmarkAndSelf
+	bench_expand_test.go:71: AndSelf=44
+	bench_expand_test.go:71: AndSelf=44
+	bench_expand_test.go:71: AndSelf=44
+	bench_expand_test.go:71: AndSelf=44
+BenchmarkFilter	  100000	     25643 ns/op
+--- BENCH: BenchmarkFilter
+	bench_filter_test.go:20: Filter=13
+	bench_filter_test.go:20: Filter=13
+	bench_filter_test.go:20: Filter=13
+	bench_filter_test.go:20: Filter=13
+BenchmarkNot	  100000	     29566 ns/op
+--- BENCH: BenchmarkNot
+	bench_filter_test.go:36: Not=371
+	bench_filter_test.go:36: Not=371
+	bench_filter_test.go:36: Not=371
+	bench_filter_test.go:36: Not=371
+BenchmarkFilterFunction	   50000	     66894 ns/op
+--- BENCH: BenchmarkFilterFunction
+	bench_filter_test.go:55: FilterFunction=112
+	bench_filter_test.go:55: FilterFunction=112
+	bench_filter_test.go:55: FilterFunction=112
+	bench_filter_test.go:55: FilterFunction=112
+BenchmarkNotFunction	   50000	     72183 ns/op
+--- BENCH: BenchmarkNotFunction
+	bench_filter_test.go:74: NotFunction=261
+	bench_filter_test.go:74: NotFunction=261
+	bench_filter_test.go:74: NotFunction=261
+	bench_filter_test.go:74: NotFunction=261
+BenchmarkFilterNodes	   50000	     65516 ns/op
+--- BENCH: BenchmarkFilterNodes
+	bench_filter_test.go:92: FilterNodes=2
+	bench_filter_test.go:92: FilterNodes=2
+	bench_filter_test.go:92: FilterNodes=2
+	bench_filter_test.go:92: FilterNodes=2
+BenchmarkNotNodes	   20000	     78880 ns/op
+--- BENCH: BenchmarkNotNodes
+	bench_filter_test.go:110: NotNodes=360
+	bench_filter_test.go:110: NotNodes=360
+	bench_filter_test.go:110: NotNodes=360
+	bench_filter_test.go:110: NotNodes=360
+BenchmarkFilterSelection	   50000	     65232 ns/op
+--- BENCH: BenchmarkFilterSelection
+	bench_filter_test.go:127: FilterSelection=2
+	bench_filter_test.go:127: FilterSelection=2
+	bench_filter_test.go:127: FilterSelection=2
+	bench_filter_test.go:127: FilterSelection=2
+BenchmarkNotSelection	   20000	     78813 ns/op
+--- BENCH: BenchmarkNotSelection
+	bench_filter_test.go:144: NotSelection=360
+	bench_filter_test.go:144: NotSelection=360
+	bench_filter_test.go:144: NotSelection=360
+	bench_filter_test.go:144: NotSelection=360
+BenchmarkHas	    5000	    388834 ns/op
+--- BENCH: BenchmarkHas
+	bench_filter_test.go:160: Has=13
+	bench_filter_test.go:160: Has=13
+	bench_filter_test.go:160: Has=13
+BenchmarkHasNodes	   10000	    228552 ns/op
+--- BENCH: BenchmarkHasNodes
+	bench_filter_test.go:178: HasNodes=15
+	bench_filter_test.go:178: HasNodes=15
+	bench_filter_test.go:178: HasNodes=15
+BenchmarkHasSelection	   10000	    228365 ns/op
+--- BENCH: BenchmarkHasSelection
+	bench_filter_test.go:195: HasSelection=15
+	bench_filter_test.go:195: HasSelection=15
+	bench_filter_test.go:195: HasSelection=15
+BenchmarkEnd	500000000	         4.62 ns/op
+--- BENCH: BenchmarkEnd
+	bench_filter_test.go:211: End=373
+	bench_filter_test.go:211: End=373
+	bench_filter_test.go:211: End=373
+	bench_filter_test.go:211: End=373
+	bench_filter_test.go:211: End=373
+	bench_filter_test.go:211: End=373
+BenchmarkEach	  200000	      9548 ns/op
+--- BENCH: BenchmarkEach
+	bench_iteration_test.go:22: Each=59
+	bench_iteration_test.go:22: Each=59
+	bench_iteration_test.go:22: Each=59
+	bench_iteration_test.go:22: Each=59
+BenchmarkMap	  100000	     15900 ns/op
+--- BENCH: BenchmarkMap
+	bench_iteration_test.go:41: Map=59
+	bench_iteration_test.go:41: Map=59
+	bench_iteration_test.go:41: Map=59
+	bench_iteration_test.go:41: Map=59
+BenchmarkEachWithBreak	 1000000	      1650 ns/op
+--- BENCH: BenchmarkEachWithBreak
+	bench_iteration_test.go:61: Each=10
+	bench_iteration_test.go:61: Each=10
+	bench_iteration_test.go:61: Each=10
+	bench_iteration_test.go:61: Each=10
+BenchmarkAttr	50000000	        30.5 ns/op
+--- BENCH: BenchmarkAttr
+	bench_property_test.go:16: Attr=firstHeading
+	bench_property_test.go:16: Attr=firstHeading
+	bench_property_test.go:16: Attr=firstHeading
+	bench_property_test.go:16: Attr=firstHeading
+	bench_property_test.go:16: Attr=firstHeading
+BenchmarkText	  100000	     18873 ns/op
+BenchmarkLength	2000000000	         0.31 ns/op
+--- BENCH: BenchmarkLength
+	bench_property_test.go:37: Length=14
+	bench_property_test.go:37: Length=14
+	bench_property_test.go:37: Length=14
+	bench_property_test.go:37: Length=14
+	bench_property_test.go:37: Length=14
+	bench_property_test.go:37: Length=14
+BenchmarkHtml	 5000000	       616 ns/op
+BenchmarkIs	  100000	     29499 ns/op
+--- BENCH: BenchmarkIs
+	bench_query_test.go:16: Is=true
+	bench_query_test.go:16: Is=true
+	bench_query_test.go:16: Is=true
+	bench_query_test.go:16: Is=true
+BenchmarkIsPositional	  100000	     23733 ns/op
+--- BENCH: BenchmarkIsPositional
+	bench_query_test.go:28: IsPositional=true
+	bench_query_test.go:28: IsPositional=true
+	bench_query_test.go:28: IsPositional=true
+	bench_query_test.go:28: IsPositional=true
+BenchmarkIsFunction	 1000000	      2404 ns/op
+--- BENCH: BenchmarkIsFunction
+	bench_query_test.go:43: IsFunction=true
+	bench_query_test.go:43: IsFunction=true
+	bench_query_test.go:43: IsFunction=true
+	bench_query_test.go:43: IsFunction=true
+BenchmarkIsSelection	   50000	     65376 ns/op
+--- BENCH: BenchmarkIsSelection
+	bench_query_test.go:56: IsSelection=true
+	bench_query_test.go:56: IsSelection=true
+	bench_query_test.go:56: IsSelection=true
+	bench_query_test.go:56: IsSelection=true
+BenchmarkIsNodes	   50000	     65322 ns/op
+--- BENCH: BenchmarkIsNodes
+	bench_query_test.go:70: IsNodes=true
+	bench_query_test.go:70: IsNodes=true
+	bench_query_test.go:70: IsNodes=true
+	bench_query_test.go:70: IsNodes=true
+BenchmarkHasClass	    5000	    558933 ns/op
+--- BENCH: BenchmarkHasClass
+	bench_query_test.go:82: HasClass=true
+	bench_query_test.go:82: HasClass=true
+	bench_query_test.go:82: HasClass=true
+BenchmarkContains	100000000	        11.1 ns/op
+--- BENCH: BenchmarkContains
+	bench_query_test.go:96: Contains=true
+	bench_query_test.go:96: Contains=true
+	bench_query_test.go:96: Contains=true
+	bench_query_test.go:96: Contains=true
+	bench_query_test.go:96: Contains=true
+BenchmarkFind	  100000	     27841 ns/op
+--- BENCH: BenchmarkFind
+	bench_traversal_test.go:18: Find=41
+	bench_traversal_test.go:18: Find=41
+	bench_traversal_test.go:18: Find=41
+	bench_traversal_test.go:18: Find=41
+BenchmarkFindWithinSelection	   50000	     72096 ns/op
+--- BENCH: BenchmarkFindWithinSelection
+	bench_traversal_test.go:34: FindWithinSelection=39
+	bench_traversal_test.go:34: FindWithinSelection=39
+	bench_traversal_test.go:34: FindWithinSelection=39
+	bench_traversal_test.go:34: FindWithinSelection=39
+BenchmarkFindSelection	    5000	    457349 ns/op
+--- BENCH: BenchmarkFindSelection
+	bench_traversal_test.go:51: FindSelection=73
+	bench_traversal_test.go:51: FindSelection=73
+	bench_traversal_test.go:51: FindSelection=73
+BenchmarkFindNodes	    5000	    459324 ns/op
+--- BENCH: BenchmarkFindNodes
+	bench_traversal_test.go:69: FindNodes=73
+	bench_traversal_test.go:69: FindNodes=73
+	bench_traversal_test.go:69: FindNodes=73
+BenchmarkContents	  500000	      3435 ns/op
+--- BENCH: BenchmarkContents
+	bench_traversal_test.go:85: Contents=16
+	bench_traversal_test.go:85: Contents=16
+	bench_traversal_test.go:85: Contents=16
+	bench_traversal_test.go:85: Contents=16
+BenchmarkContentsFiltered	  500000	      5241 ns/op
+--- BENCH: BenchmarkContentsFiltered
+	bench_traversal_test.go:101: ContentsFiltered=1
+	bench_traversal_test.go:101: ContentsFiltered=1
+	bench_traversal_test.go:101: ContentsFiltered=1
+	bench_traversal_test.go:101: ContentsFiltered=1
+BenchmarkChildren	 5000000	       667 ns/op
+--- BENCH: BenchmarkChildren
+	bench_traversal_test.go:117: Children=2
+	bench_traversal_test.go:117: Children=2
+	bench_traversal_test.go:117: Children=2
+	bench_traversal_test.go:117: Children=2
+	bench_traversal_test.go:117: Children=2
+BenchmarkChildrenFiltered	  500000	      3639 ns/op
+--- BENCH: BenchmarkChildrenFiltered
+	bench_traversal_test.go:133: ChildrenFiltered=2
+	bench_traversal_test.go:133: ChildrenFiltered=2
+	bench_traversal_test.go:133: ChildrenFiltered=2
+	bench_traversal_test.go:133: ChildrenFiltered=2
+BenchmarkParent	   50000	     44867 ns/op
+--- BENCH: BenchmarkParent
+	bench_traversal_test.go:149: Parent=55
+	bench_traversal_test.go:149: Parent=55
+	bench_traversal_test.go:149: Parent=55
+	bench_traversal_test.go:149: Parent=55
+BenchmarkParentFiltered	   50000	     46476 ns/op
+--- BENCH: BenchmarkParentFiltered
+	bench_traversal_test.go:165: ParentFiltered=4
+	bench_traversal_test.go:165: ParentFiltered=4
+	bench_traversal_test.go:165: ParentFiltered=4
+	bench_traversal_test.go:165: ParentFiltered=4
+BenchmarkParents	   20000	     92559 ns/op
+--- BENCH: BenchmarkParents
+	bench_traversal_test.go:181: Parents=73
+	bench_traversal_test.go:181: Parents=73
+	bench_traversal_test.go:181: Parents=73
+	bench_traversal_test.go:181: Parents=73
+BenchmarkParentsFiltered	   20000	     96142 ns/op
+--- BENCH: BenchmarkParentsFiltered
+	bench_traversal_test.go:197: ParentsFiltered=18
+	bench_traversal_test.go:197: ParentsFiltered=18
+	bench_traversal_test.go:197: ParentsFiltered=18
+	bench_traversal_test.go:197: ParentsFiltered=18
+BenchmarkParentsUntil	   50000	     73931 ns/op
+--- BENCH: BenchmarkParentsUntil
+	bench_traversal_test.go:213: ParentsUntil=52
+	bench_traversal_test.go:213: ParentsUntil=52
+	bench_traversal_test.go:213: ParentsUntil=52
+	bench_traversal_test.go:213: ParentsUntil=52
+BenchmarkParentsUntilSelection	   10000	    159820 ns/op
+--- BENCH: BenchmarkParentsUntilSelection
+	bench_traversal_test.go:230: ParentsUntilSelection=70
+	bench_traversal_test.go:230: ParentsUntilSelection=70
+	bench_traversal_test.go:230: ParentsUntilSelection=70
+BenchmarkParentsUntilNodes	   10000	    158811 ns/op
+--- BENCH: BenchmarkParentsUntilNodes
+	bench_traversal_test.go:248: ParentsUntilNodes=70
+	bench_traversal_test.go:248: ParentsUntilNodes=70
+	bench_traversal_test.go:248: ParentsUntilNodes=70
+BenchmarkParentsFilteredUntil	  100000	     17203 ns/op
+--- BENCH: BenchmarkParentsFilteredUntil
+	bench_traversal_test.go:264: ParentsFilteredUntil=2
+	bench_traversal_test.go:264: ParentsFilteredUntil=2
+	bench_traversal_test.go:264: ParentsFilteredUntil=2
+	bench_traversal_test.go:264: ParentsFilteredUntil=2
+BenchmarkParentsFilteredUntilSelection	  100000	     21358 ns/op
+--- BENCH: BenchmarkParentsFilteredUntilSelection
+	bench_traversal_test.go:281: ParentsFilteredUntilSelection=2
+	bench_traversal_test.go:281: ParentsFilteredUntilSelection=2
+	bench_traversal_test.go:281: ParentsFilteredUntilSelection=2
+	bench_traversal_test.go:281: ParentsFilteredUntilSelection=2
+BenchmarkParentsFilteredUntilNodes	  100000	     21338 ns/op
+--- BENCH: BenchmarkParentsFilteredUntilNodes
+	bench_traversal_test.go:299: ParentsFilteredUntilNodes=2
+	bench_traversal_test.go:299: ParentsFilteredUntilNodes=2
+	bench_traversal_test.go:299: ParentsFilteredUntilNodes=2
+	bench_traversal_test.go:299: ParentsFilteredUntilNodes=2
+BenchmarkSiblings	   50000	     66463 ns/op
+--- BENCH: BenchmarkSiblings
+	bench_traversal_test.go:315: Siblings=293
+	bench_traversal_test.go:315: Siblings=293
+	bench_traversal_test.go:315: Siblings=293
+	bench_traversal_test.go:315: Siblings=293
+BenchmarkSiblingsFiltered	   50000	     72503 ns/op
+--- BENCH: BenchmarkSiblingsFiltered
+	bench_traversal_test.go:331: SiblingsFiltered=46
+	bench_traversal_test.go:331: SiblingsFiltered=46
+	bench_traversal_test.go:331: SiblingsFiltered=46
+	bench_traversal_test.go:331: SiblingsFiltered=46
+BenchmarkNext	  200000	     10881 ns/op
+--- BENCH: BenchmarkNext
+	bench_traversal_test.go:347: Next=49
+	bench_traversal_test.go:347: Next=49
+	bench_traversal_test.go:347: Next=49
+	bench_traversal_test.go:347: Next=49
+BenchmarkNextFiltered	  200000	     12588 ns/op
+--- BENCH: BenchmarkNextFiltered
+	bench_traversal_test.go:363: NextFiltered=6
+	bench_traversal_test.go:363: NextFiltered=6
+	bench_traversal_test.go:363: NextFiltered=6
+	bench_traversal_test.go:363: NextFiltered=6
+BenchmarkNextAll	   50000	     45075 ns/op
+--- BENCH: BenchmarkNextAll
+	bench_traversal_test.go:379: NextAll=234
+	bench_traversal_test.go:379: NextAll=234
+	bench_traversal_test.go:379: NextAll=234
+	bench_traversal_test.go:379: NextAll=234
+BenchmarkNextAllFiltered	   50000	     50455 ns/op
+--- BENCH: BenchmarkNextAllFiltered
+	bench_traversal_test.go:395: NextAllFiltered=33
+	bench_traversal_test.go:395: NextAllFiltered=33
+	bench_traversal_test.go:395: NextAllFiltered=33
+	bench_traversal_test.go:395: NextAllFiltered=33
+BenchmarkPrev	  200000	     10933 ns/op
+--- BENCH: BenchmarkPrev
+	bench_traversal_test.go:411: Prev=49
+	bench_traversal_test.go:411: Prev=49
+	bench_traversal_test.go:411: Prev=49
+	bench_traversal_test.go:411: Prev=49
+BenchmarkPrevFiltered	  200000	     12579 ns/op
+--- BENCH: BenchmarkPrevFiltered
+	bench_traversal_test.go:429: PrevFiltered=7
+	bench_traversal_test.go:429: PrevFiltered=7
+	bench_traversal_test.go:429: PrevFiltered=7
+	bench_traversal_test.go:429: PrevFiltered=7
+BenchmarkPrevAll	  100000	     17751 ns/op
+--- BENCH: BenchmarkPrevAll
+	bench_traversal_test.go:445: PrevAll=78
+	bench_traversal_test.go:445: PrevAll=78
+	bench_traversal_test.go:445: PrevAll=78
+	bench_traversal_test.go:445: PrevAll=78
+BenchmarkPrevAllFiltered	  100000	     19702 ns/op
+--- BENCH: BenchmarkPrevAllFiltered
+	bench_traversal_test.go:461: PrevAllFiltered=6
+	bench_traversal_test.go:461: PrevAllFiltered=6
+	bench_traversal_test.go:461: PrevAllFiltered=6
+	bench_traversal_test.go:461: PrevAllFiltered=6
+BenchmarkNextUntil	   20000	     93586 ns/op
+--- BENCH: BenchmarkNextUntil
+	bench_traversal_test.go:477: NextUntil=84
+	bench_traversal_test.go:477: NextUntil=84
+	bench_traversal_test.go:477: NextUntil=84
+	bench_traversal_test.go:477: NextUntil=84
+BenchmarkNextUntilSelection	   50000	     61155 ns/op
+--- BENCH: BenchmarkNextUntilSelection
+	bench_traversal_test.go:494: NextUntilSelection=42
+	bench_traversal_test.go:494: NextUntilSelection=42
+	bench_traversal_test.go:494: NextUntilSelection=42
+	bench_traversal_test.go:494: NextUntilSelection=42
+BenchmarkNextUntilNodes	  100000	     25805 ns/op
+--- BENCH: BenchmarkNextUntilNodes
+	bench_traversal_test.go:512: NextUntilNodes=12
+	bench_traversal_test.go:512: NextUntilNodes=12
+	bench_traversal_test.go:512: NextUntilNodes=12
+	bench_traversal_test.go:512: NextUntilNodes=12
+BenchmarkPrevUntil	   10000	    232225 ns/op
+--- BENCH: BenchmarkPrevUntil
+	bench_traversal_test.go:528: PrevUntil=238
+	bench_traversal_test.go:528: PrevUntil=238
+	bench_traversal_test.go:528: PrevUntil=238
+BenchmarkPrevUntilSelection	   20000	     78316 ns/op
+--- BENCH: BenchmarkPrevUntilSelection
+	bench_traversal_test.go:545: PrevUntilSelection=49
+	bench_traversal_test.go:545: PrevUntilSelection=49
+	bench_traversal_test.go:545: PrevUntilSelection=49
+	bench_traversal_test.go:545: PrevUntilSelection=49
+BenchmarkPrevUntilNodes	  100000	     20657 ns/op
+--- BENCH: BenchmarkPrevUntilNodes
+	bench_traversal_test.go:563: PrevUntilNodes=11
+	bench_traversal_test.go:563: PrevUntilNodes=11
+	bench_traversal_test.go:563: PrevUntilNodes=11
+	bench_traversal_test.go:563: PrevUntilNodes=11
+BenchmarkNextFilteredUntil	   50000	     46567 ns/op
+--- BENCH: BenchmarkNextFilteredUntil
+	bench_traversal_test.go:579: NextFilteredUntil=22
+	bench_traversal_test.go:579: NextFilteredUntil=22
+	bench_traversal_test.go:579: NextFilteredUntil=22
+	bench_traversal_test.go:579: NextFilteredUntil=22
+BenchmarkNextFilteredUntilSelection	   50000	     67227 ns/op
+--- BENCH: BenchmarkNextFilteredUntilSelection
+	bench_traversal_test.go:596: NextFilteredUntilSelection=22
+	bench_traversal_test.go:596: NextFilteredUntilSelection=22
+	bench_traversal_test.go:596: NextFilteredUntilSelection=22
+	bench_traversal_test.go:596: NextFilteredUntilSelection=22
+BenchmarkNextFilteredUntilNodes	   50000	     66995 ns/op
+--- BENCH: BenchmarkNextFilteredUntilNodes
+	bench_traversal_test.go:614: NextFilteredUntilNodes=22
+	bench_traversal_test.go:614: NextFilteredUntilNodes=22
+	bench_traversal_test.go:614: NextFilteredUntilNodes=22
+	bench_traversal_test.go:614: NextFilteredUntilNodes=22
+BenchmarkPrevFilteredUntil	   50000	     47361 ns/op
+--- BENCH: BenchmarkPrevFilteredUntil
+	bench_traversal_test.go:630: PrevFilteredUntil=20
+	bench_traversal_test.go:630: PrevFilteredUntil=20
+	bench_traversal_test.go:630: PrevFilteredUntil=20
+	bench_traversal_test.go:630: PrevFilteredUntil=20
+BenchmarkPrevFilteredUntilSelection	   50000	     68802 ns/op
+--- BENCH: BenchmarkPrevFilteredUntilSelection
+	bench_traversal_test.go:647: PrevFilteredUntilSelection=20
+	bench_traversal_test.go:647: PrevFilteredUntilSelection=20
+	bench_traversal_test.go:647: PrevFilteredUntilSelection=20
+	bench_traversal_test.go:647: PrevFilteredUntilSelection=20
+BenchmarkPrevFilteredUntilNodes	   50000	     68928 ns/op
+--- BENCH: BenchmarkPrevFilteredUntilNodes
+	bench_traversal_test.go:665: PrevFilteredUntilNodes=20
+	bench_traversal_test.go:665: PrevFilteredUntilNodes=20
+	bench_traversal_test.go:665: PrevFilteredUntilNodes=20
+	bench_traversal_test.go:665: PrevFilteredUntilNodes=20
+BenchmarkClosest	  500000	      4922 ns/op
+--- BENCH: BenchmarkClosest
+	bench_traversal_test.go:681: Closest=2
+	bench_traversal_test.go:681: Closest=2
+	bench_traversal_test.go:681: Closest=2
+	bench_traversal_test.go:681: Closest=2
+BenchmarkClosestSelection	 5000000	       738 ns/op
+--- BENCH: BenchmarkClosestSelection
+	bench_traversal_test.go:698: ClosestSelection=2
+	bench_traversal_test.go:698: ClosestSelection=2
+	bench_traversal_test.go:698: ClosestSelection=2
+	bench_traversal_test.go:698: ClosestSelection=2
+	bench_traversal_test.go:698: ClosestSelection=2
+BenchmarkClosestNodes	 5000000	       737 ns/op
+--- BENCH: BenchmarkClosestNodes
+	bench_traversal_test.go:715: ClosestNodes=2
+	bench_traversal_test.go:715: ClosestNodes=2
+	bench_traversal_test.go:715: ClosestNodes=2
+	bench_traversal_test.go:715: ClosestNodes=2
+	bench_traversal_test.go:715: ClosestNodes=2
+ok  	github.com/PuerkitoBio/goquery	224.003s
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench/v0.3.2-go1.2 b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench/v0.3.2-go1.2
new file mode 100644
index 00000000..0a8704c8
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench/v0.3.2-go1.2
@@ -0,0 +1,478 @@
+PASS
+BenchmarkFirst	20000000	        88.4 ns/op
+BenchmarkLast	20000000	        88.2 ns/op
+BenchmarkEq	20000000	        87.4 ns/op
+BenchmarkSlice	20000000	        84.9 ns/op
+BenchmarkGet	2000000000	         1.99 ns/op
+BenchmarkIndex	 2000000	       906 ns/op
+--- BENCH: BenchmarkIndex
+	bench_array_test.go:73: Index=3
+	bench_array_test.go:73: Index=3
+	bench_array_test.go:73: Index=3
+	bench_array_test.go:73: Index=3
+	bench_array_test.go:73: Index=3
+BenchmarkIndexSelector	  100000	     22276 ns/op
+--- BENCH: BenchmarkIndexSelector
+	bench_array_test.go:85: IndexSelector=4
+	bench_array_test.go:85: IndexSelector=4
+	bench_array_test.go:85: IndexSelector=4
+	bench_array_test.go:85: IndexSelector=4
+BenchmarkIndexOfNode	200000000	         9.72 ns/op
+--- BENCH: BenchmarkIndexOfNode
+	bench_array_test.go:99: IndexOfNode=2
+	bench_array_test.go:99: IndexOfNode=2
+	bench_array_test.go:99: IndexOfNode=2
+	bench_array_test.go:99: IndexOfNode=2
+	bench_array_test.go:99: IndexOfNode=2
+	bench_array_test.go:99: IndexOfNode=2
+BenchmarkIndexOfSelection	100000000	        10.4 ns/op
+--- BENCH: BenchmarkIndexOfSelection
+	bench_array_test.go:111: IndexOfSelection=2
+	bench_array_test.go:111: IndexOfSelection=2
+	bench_array_test.go:111: IndexOfSelection=2
+	bench_array_test.go:111: IndexOfSelection=2
+	bench_array_test.go:111: IndexOfSelection=2
+BenchmarkMetalReviewExample	   10000	    199277 ns/op
+--- BENCH: BenchmarkMetalReviewExample
+	bench_example_test.go:40: Review 0: Midnight - Complete and Total Hell (8.5).
+		Review 1: Over Your Threshold - Facticity (6.0).
+		Review 2: Nuclear Death Terror - Chaos Reigns (7.5).
+		Review 3: Evoken - Atra Mors (9.5).
+		
+	bench_example_test.go:41: MetalReviewExample=10
+	bench_example_test.go:40: Review 0: Midnight - Complete and Total Hell (8.5).
+		Review 1: Over Your Threshold - Facticity (6.0).
+		Review 2: Nuclear Death Terror - Chaos Reigns (7.5).
+		Review 3: Evoken - Atra Mors (9.5).
+	... [output truncated]
+BenchmarkAdd	  100000	     18277 ns/op
+--- BENCH: BenchmarkAdd
+	bench_expand_test.go:20: Add=43
+	bench_expand_test.go:20: Add=43
+	bench_expand_test.go:20: Add=43
+	bench_expand_test.go:20: Add=43
+BenchmarkAddSelection	10000000	       200 ns/op
+--- BENCH: BenchmarkAddSelection
+	bench_expand_test.go:37: AddSelection=43
+	bench_expand_test.go:37: AddSelection=43
+	bench_expand_test.go:37: AddSelection=43
+	bench_expand_test.go:37: AddSelection=43
+	bench_expand_test.go:37: AddSelection=43
+BenchmarkAddNodes	10000000	       189 ns/op
+--- BENCH: BenchmarkAddNodes
+	bench_expand_test.go:55: AddNodes=43
+	bench_expand_test.go:55: AddNodes=43
+	bench_expand_test.go:55: AddNodes=43
+	bench_expand_test.go:55: AddNodes=43
+	bench_expand_test.go:55: AddNodes=43
+BenchmarkAndSelf	 1000000	      2569 ns/op
+--- BENCH: BenchmarkAndSelf
+	bench_expand_test.go:71: AndSelf=44
+	bench_expand_test.go:71: AndSelf=44
+	bench_expand_test.go:71: AndSelf=44
+	bench_expand_test.go:71: AndSelf=44
+BenchmarkFilter	  100000	     25195 ns/op
+--- BENCH: BenchmarkFilter
+	bench_filter_test.go:20: Filter=13
+	bench_filter_test.go:20: Filter=13
+	bench_filter_test.go:20: Filter=13
+	bench_filter_test.go:20: Filter=13
+BenchmarkNot	  100000	     29003 ns/op
+--- BENCH: BenchmarkNot
+	bench_filter_test.go:36: Not=371
+	bench_filter_test.go:36: Not=371
+	bench_filter_test.go:36: Not=371
+	bench_filter_test.go:36: Not=371
+BenchmarkFilterFunction	   50000	     60690 ns/op
+--- BENCH: BenchmarkFilterFunction
+	bench_filter_test.go:55: FilterFunction=112
+	bench_filter_test.go:55: FilterFunction=112
+	bench_filter_test.go:55: FilterFunction=112
+	bench_filter_test.go:55: FilterFunction=112
+BenchmarkNotFunction	   50000	     66008 ns/op
+--- BENCH: BenchmarkNotFunction
+	bench_filter_test.go:74: NotFunction=261
+	bench_filter_test.go:74: NotFunction=261
+	bench_filter_test.go:74: NotFunction=261
+	bench_filter_test.go:74: NotFunction=261
+BenchmarkFilterNodes	   50000	     59723 ns/op
+--- BENCH: BenchmarkFilterNodes
+	bench_filter_test.go:92: FilterNodes=2
+	bench_filter_test.go:92: FilterNodes=2
+	bench_filter_test.go:92: FilterNodes=2
+	bench_filter_test.go:92: FilterNodes=2
+BenchmarkNotNodes	   50000	     72698 ns/op
+--- BENCH: BenchmarkNotNodes
+	bench_filter_test.go:110: NotNodes=360
+	bench_filter_test.go:110: NotNodes=360
+	bench_filter_test.go:110: NotNodes=360
+	bench_filter_test.go:110: NotNodes=360
+BenchmarkFilterSelection	   50000	     59598 ns/op
+--- BENCH: BenchmarkFilterSelection
+	bench_filter_test.go:127: FilterSelection=2
+	bench_filter_test.go:127: FilterSelection=2
+	bench_filter_test.go:127: FilterSelection=2
+	bench_filter_test.go:127: FilterSelection=2
+BenchmarkNotSelection	   50000	     72526 ns/op
+--- BENCH: BenchmarkNotSelection
+	bench_filter_test.go:144: NotSelection=360
+	bench_filter_test.go:144: NotSelection=360
+	bench_filter_test.go:144: NotSelection=360
+	bench_filter_test.go:144: NotSelection=360
+BenchmarkHas	    5000	    367076 ns/op
+--- BENCH: BenchmarkHas
+	bench_filter_test.go:160: Has=13
+	bench_filter_test.go:160: Has=13
+	bench_filter_test.go:160: Has=13
+BenchmarkHasNodes	   10000	    219710 ns/op
+--- BENCH: BenchmarkHasNodes
+	bench_filter_test.go:178: HasNodes=15
+	bench_filter_test.go:178: HasNodes=15
+	bench_filter_test.go:178: HasNodes=15
+BenchmarkHasSelection	   10000	    219105 ns/op
+--- BENCH: BenchmarkHasSelection
+	bench_filter_test.go:195: HasSelection=15
+	bench_filter_test.go:195: HasSelection=15
+	bench_filter_test.go:195: HasSelection=15
+BenchmarkEnd	500000000	         4.58 ns/op
+--- BENCH: BenchmarkEnd
+	bench_filter_test.go:211: End=373
+	bench_filter_test.go:211: End=373
+	bench_filter_test.go:211: End=373
+	bench_filter_test.go:211: End=373
+	bench_filter_test.go:211: End=373
+	bench_filter_test.go:211: End=373
+BenchmarkEach	  200000	      8615 ns/op
+--- BENCH: BenchmarkEach
+	bench_iteration_test.go:22: Each=59
+	bench_iteration_test.go:22: Each=59
+	bench_iteration_test.go:22: Each=59
+	bench_iteration_test.go:22: Each=59
+BenchmarkMap	  200000	     14271 ns/op
+--- BENCH: BenchmarkMap
+	bench_iteration_test.go:41: Map=59
+	bench_iteration_test.go:41: Map=59
+	bench_iteration_test.go:41: Map=59
+	bench_iteration_test.go:41: Map=59
+BenchmarkEachWithBreak	 1000000	      1497 ns/op
+--- BENCH: BenchmarkEachWithBreak
+	bench_iteration_test.go:61: Each=10
+	bench_iteration_test.go:61: Each=10
+	bench_iteration_test.go:61: Each=10
+	bench_iteration_test.go:61: Each=10
+BenchmarkAttr	50000000	        30.9 ns/op
+--- BENCH: BenchmarkAttr
+	bench_property_test.go:16: Attr=firstHeading
+	bench_property_test.go:16: Attr=firstHeading
+	bench_property_test.go:16: Attr=firstHeading
+	bench_property_test.go:16: Attr=firstHeading
+	bench_property_test.go:16: Attr=firstHeading
+BenchmarkText	  200000	     13729 ns/op
+BenchmarkLength	2000000000	         0.31 ns/op
+--- BENCH: BenchmarkLength
+	bench_property_test.go:37: Length=14
+	bench_property_test.go:37: Length=14
+	bench_property_test.go:37: Length=14
+	bench_property_test.go:37: Length=14
+	bench_property_test.go:37: Length=14
+	bench_property_test.go:37: Length=14
+BenchmarkHtml	 5000000	       537 ns/op
+BenchmarkIs	  100000	     28904 ns/op
+--- BENCH: BenchmarkIs
+	bench_query_test.go:16: Is=true
+	bench_query_test.go:16: Is=true
+	bench_query_test.go:16: Is=true
+	bench_query_test.go:16: Is=true
+BenchmarkIsPositional	  100000	     23556 ns/op
+--- BENCH: BenchmarkIsPositional
+	bench_query_test.go:28: IsPositional=true
+	bench_query_test.go:28: IsPositional=true
+	bench_query_test.go:28: IsPositional=true
+	bench_query_test.go:28: IsPositional=true
+BenchmarkIsFunction	 1000000	      2195 ns/op
+--- BENCH: BenchmarkIsFunction
+	bench_query_test.go:43: IsFunction=true
+	bench_query_test.go:43: IsFunction=true
+	bench_query_test.go:43: IsFunction=true
+	bench_query_test.go:43: IsFunction=true
+BenchmarkIsSelection	   50000	     60100 ns/op
+--- BENCH: BenchmarkIsSelection
+	bench_query_test.go:56: IsSelection=true
+	bench_query_test.go:56: IsSelection=true
+	bench_query_test.go:56: IsSelection=true
+	bench_query_test.go:56: IsSelection=true
+BenchmarkIsNodes	   50000	     59962 ns/op
+--- BENCH: BenchmarkIsNodes
+	bench_query_test.go:70: IsNodes=true
+	bench_query_test.go:70: IsNodes=true
+	bench_query_test.go:70: IsNodes=true
+	bench_query_test.go:70: IsNodes=true
+BenchmarkHasClass	    5000	    388679 ns/op
+--- BENCH: BenchmarkHasClass
+	bench_query_test.go:82: HasClass=true
+	bench_query_test.go:82: HasClass=true
+	bench_query_test.go:82: HasClass=true
+BenchmarkContains	100000000	        11.0 ns/op
+--- BENCH: BenchmarkContains
+	bench_query_test.go:96: Contains=true
+	bench_query_test.go:96: Contains=true
+	bench_query_test.go:96: Contains=true
+	bench_query_test.go:96: Contains=true
+	bench_query_test.go:96: Contains=true
+BenchmarkFind	  100000	     22779 ns/op
+--- BENCH: BenchmarkFind
+	bench_traversal_test.go:18: Find=41
+	bench_traversal_test.go:18: Find=41
+	bench_traversal_test.go:18: Find=41
+	bench_traversal_test.go:18: Find=41
+BenchmarkFindWithinSelection	   50000	     62033 ns/op
+--- BENCH: BenchmarkFindWithinSelection
+	bench_traversal_test.go:34: FindWithinSelection=39
+	bench_traversal_test.go:34: FindWithinSelection=39
+	bench_traversal_test.go:34: FindWithinSelection=39
+	bench_traversal_test.go:34: FindWithinSelection=39
+BenchmarkFindSelection	    5000	    446918 ns/op
+--- BENCH: BenchmarkFindSelection
+	bench_traversal_test.go:51: FindSelection=73
+	bench_traversal_test.go:51: FindSelection=73
+	bench_traversal_test.go:51: FindSelection=73
+BenchmarkFindNodes	    5000	    441753 ns/op
+--- BENCH: BenchmarkFindNodes
+	bench_traversal_test.go:69: FindNodes=73
+	bench_traversal_test.go:69: FindNodes=73
+	bench_traversal_test.go:69: FindNodes=73
+BenchmarkContents	 1000000	      2807 ns/op
+--- BENCH: BenchmarkContents
+	bench_traversal_test.go:85: Contents=16
+	bench_traversal_test.go:85: Contents=16
+	bench_traversal_test.go:85: Contents=16
+	bench_traversal_test.go:85: Contents=16
+BenchmarkContentsFiltered	  500000	      4477 ns/op
+--- BENCH: BenchmarkContentsFiltered
+	bench_traversal_test.go:101: ContentsFiltered=1
+	bench_traversal_test.go:101: ContentsFiltered=1
+	bench_traversal_test.go:101: ContentsFiltered=1
+	bench_traversal_test.go:101: ContentsFiltered=1
+BenchmarkChildren	 5000000	       548 ns/op
+--- BENCH: BenchmarkChildren
+	bench_traversal_test.go:117: Children=2
+	bench_traversal_test.go:117: Children=2
+	bench_traversal_test.go:117: Children=2
+	bench_traversal_test.go:117: Children=2
+	bench_traversal_test.go:117: Children=2
+BenchmarkChildrenFiltered	  500000	      3304 ns/op
+--- BENCH: BenchmarkChildrenFiltered
+	bench_traversal_test.go:133: ChildrenFiltered=2
+	bench_traversal_test.go:133: ChildrenFiltered=2
+	bench_traversal_test.go:133: ChildrenFiltered=2
+	bench_traversal_test.go:133: ChildrenFiltered=2
+BenchmarkParent	   50000	     38248 ns/op
+--- BENCH: BenchmarkParent
+	bench_traversal_test.go:149: Parent=55
+	bench_traversal_test.go:149: Parent=55
+	bench_traversal_test.go:149: Parent=55
+	bench_traversal_test.go:149: Parent=55
+BenchmarkParentFiltered	   50000	     40677 ns/op
+--- BENCH: BenchmarkParentFiltered
+	bench_traversal_test.go:165: ParentFiltered=4
+	bench_traversal_test.go:165: ParentFiltered=4
+	bench_traversal_test.go:165: ParentFiltered=4
+	bench_traversal_test.go:165: ParentFiltered=4
+BenchmarkParents	   20000	     83043 ns/op
+--- BENCH: BenchmarkParents
+	bench_traversal_test.go:181: Parents=73
+	bench_traversal_test.go:181: Parents=73
+	bench_traversal_test.go:181: Parents=73
+	bench_traversal_test.go:181: Parents=73
+BenchmarkParentsFiltered	   20000	     85391 ns/op
+--- BENCH: BenchmarkParentsFiltered
+	bench_traversal_test.go:197: ParentsFiltered=18
+	bench_traversal_test.go:197: ParentsFiltered=18
+	bench_traversal_test.go:197: ParentsFiltered=18
+	bench_traversal_test.go:197: ParentsFiltered=18
+BenchmarkParentsUntil	   50000	     65118 ns/op
+--- BENCH: BenchmarkParentsUntil
+	bench_traversal_test.go:213: ParentsUntil=52
+	bench_traversal_test.go:213: ParentsUntil=52
+	bench_traversal_test.go:213: ParentsUntil=52
+	bench_traversal_test.go:213: ParentsUntil=52
+BenchmarkParentsUntilSelection	   10000	    144028 ns/op
+--- BENCH: BenchmarkParentsUntilSelection
+	bench_traversal_test.go:230: ParentsUntilSelection=70
+	bench_traversal_test.go:230: ParentsUntilSelection=70
+	bench_traversal_test.go:230: ParentsUntilSelection=70
+BenchmarkParentsUntilNodes	   10000	    146713 ns/op
+--- BENCH: BenchmarkParentsUntilNodes
+	bench_traversal_test.go:248: ParentsUntilNodes=70
+	bench_traversal_test.go:248: ParentsUntilNodes=70
+	bench_traversal_test.go:248: ParentsUntilNodes=70
+BenchmarkParentsFilteredUntil	  100000	     15113 ns/op
+--- BENCH: BenchmarkParentsFilteredUntil
+	bench_traversal_test.go:264: ParentsFilteredUntil=2
+	bench_traversal_test.go:264: ParentsFilteredUntil=2
+	bench_traversal_test.go:264: ParentsFilteredUntil=2
+	bench_traversal_test.go:264: ParentsFilteredUntil=2
+BenchmarkParentsFilteredUntilSelection	  100000	     18881 ns/op
+--- BENCH: BenchmarkParentsFilteredUntilSelection
+	bench_traversal_test.go:281: ParentsFilteredUntilSelection=2
+	bench_traversal_test.go:281: ParentsFilteredUntilSelection=2
+	bench_traversal_test.go:281: ParentsFilteredUntilSelection=2
+	bench_traversal_test.go:281: ParentsFilteredUntilSelection=2
+BenchmarkParentsFilteredUntilNodes	  100000	     18926 ns/op
+--- BENCH: BenchmarkParentsFilteredUntilNodes
+	bench_traversal_test.go:299: ParentsFilteredUntilNodes=2
+	bench_traversal_test.go:299: ParentsFilteredUntilNodes=2
+	bench_traversal_test.go:299: ParentsFilteredUntilNodes=2
+	bench_traversal_test.go:299: ParentsFilteredUntilNodes=2
+BenchmarkSiblings	   50000	     63221 ns/op
+--- BENCH: BenchmarkSiblings
+	bench_traversal_test.go:315: Siblings=293
+	bench_traversal_test.go:315: Siblings=293
+	bench_traversal_test.go:315: Siblings=293
+	bench_traversal_test.go:315: Siblings=293
+BenchmarkSiblingsFiltered	   50000	     69028 ns/op
+--- BENCH: BenchmarkSiblingsFiltered
+	bench_traversal_test.go:331: SiblingsFiltered=46
+	bench_traversal_test.go:331: SiblingsFiltered=46
+	bench_traversal_test.go:331: SiblingsFiltered=46
+	bench_traversal_test.go:331: SiblingsFiltered=46
+BenchmarkNext	  200000	      9133 ns/op
+--- BENCH: BenchmarkNext
+	bench_traversal_test.go:347: Next=49
+	bench_traversal_test.go:347: Next=49
+	bench_traversal_test.go:347: Next=49
+	bench_traversal_test.go:347: Next=49
+BenchmarkNextFiltered	  200000	     10601 ns/op
+--- BENCH: BenchmarkNextFiltered
+	bench_traversal_test.go:363: NextFiltered=6
+	bench_traversal_test.go:363: NextFiltered=6
+	bench_traversal_test.go:363: NextFiltered=6
+	bench_traversal_test.go:363: NextFiltered=6
+BenchmarkNextAll	   50000	     43089 ns/op
+--- BENCH: BenchmarkNextAll
+	bench_traversal_test.go:379: NextAll=234
+	bench_traversal_test.go:379: NextAll=234
+	bench_traversal_test.go:379: NextAll=234
+	bench_traversal_test.go:379: NextAll=234
+BenchmarkNextAllFiltered	   50000	     47867 ns/op
+--- BENCH: BenchmarkNextAllFiltered
+	bench_traversal_test.go:395: NextAllFiltered=33
+	bench_traversal_test.go:395: NextAllFiltered=33
+	bench_traversal_test.go:395: NextAllFiltered=33
+	bench_traversal_test.go:395: NextAllFiltered=33
+BenchmarkPrev	  200000	      9104 ns/op
+--- BENCH: BenchmarkPrev
+	bench_traversal_test.go:411: Prev=49
+	bench_traversal_test.go:411: Prev=49
+	bench_traversal_test.go:411: Prev=49
+	bench_traversal_test.go:411: Prev=49
+BenchmarkPrevFiltered	  200000	     10579 ns/op
+--- BENCH: BenchmarkPrevFiltered
+	bench_traversal_test.go:429: PrevFiltered=7
+	bench_traversal_test.go:429: PrevFiltered=7
+	bench_traversal_test.go:429: PrevFiltered=7
+	bench_traversal_test.go:429: PrevFiltered=7
+BenchmarkPrevAll	  100000	     15185 ns/op
+--- BENCH: BenchmarkPrevAll
+	bench_traversal_test.go:445: PrevAll=78
+	bench_traversal_test.go:445: PrevAll=78
+	bench_traversal_test.go:445: PrevAll=78
+	bench_traversal_test.go:445: PrevAll=78
+BenchmarkPrevAllFiltered	  100000	     17108 ns/op
+--- BENCH: BenchmarkPrevAllFiltered
+	bench_traversal_test.go:461: PrevAllFiltered=6
+	bench_traversal_test.go:461: PrevAllFiltered=6
+	bench_traversal_test.go:461: PrevAllFiltered=6
+	bench_traversal_test.go:461: PrevAllFiltered=6
+BenchmarkNextUntil	   20000	     81087 ns/op
+--- BENCH: BenchmarkNextUntil
+	bench_traversal_test.go:477: NextUntil=84
+	bench_traversal_test.go:477: NextUntil=84
+	bench_traversal_test.go:477: NextUntil=84
+	bench_traversal_test.go:477: NextUntil=84
+BenchmarkNextUntilSelection	   50000	     55831 ns/op
+--- BENCH: BenchmarkNextUntilSelection
+	bench_traversal_test.go:494: NextUntilSelection=42
+	bench_traversal_test.go:494: NextUntilSelection=42
+	bench_traversal_test.go:494: NextUntilSelection=42
+	bench_traversal_test.go:494: NextUntilSelection=42
+BenchmarkNextUntilNodes	  100000	     23130 ns/op
+--- BENCH: BenchmarkNextUntilNodes
+	bench_traversal_test.go:512: NextUntilNodes=12
+	bench_traversal_test.go:512: NextUntilNodes=12
+	bench_traversal_test.go:512: NextUntilNodes=12
+	bench_traversal_test.go:512: NextUntilNodes=12
+BenchmarkPrevUntil	   10000	    204673 ns/op
+--- BENCH: BenchmarkPrevUntil
+	bench_traversal_test.go:528: PrevUntil=238
+	bench_traversal_test.go:528: PrevUntil=238
+	bench_traversal_test.go:528: PrevUntil=238
+BenchmarkPrevUntilSelection	   50000	     70965 ns/op
+--- BENCH: BenchmarkPrevUntilSelection
+	bench_traversal_test.go:545: PrevUntilSelection=49
+	bench_traversal_test.go:545: PrevUntilSelection=49
+	bench_traversal_test.go:545: PrevUntilSelection=49
+	bench_traversal_test.go:545: PrevUntilSelection=49
+BenchmarkPrevUntilNodes	  100000	     18591 ns/op
+--- BENCH: BenchmarkPrevUntilNodes
+	bench_traversal_test.go:563: PrevUntilNodes=11
+	bench_traversal_test.go:563: PrevUntilNodes=11
+	bench_traversal_test.go:563: PrevUntilNodes=11
+	bench_traversal_test.go:563: PrevUntilNodes=11
+BenchmarkNextFilteredUntil	   50000	     42004 ns/op
+--- BENCH: BenchmarkNextFilteredUntil
+	bench_traversal_test.go:579: NextFilteredUntil=22
+	bench_traversal_test.go:579: NextFilteredUntil=22
+	bench_traversal_test.go:579: NextFilteredUntil=22
+	bench_traversal_test.go:579: NextFilteredUntil=22
+BenchmarkNextFilteredUntilSelection	   50000	     61953 ns/op
+--- BENCH: BenchmarkNextFilteredUntilSelection
+	bench_traversal_test.go:596: NextFilteredUntilSelection=22
+	bench_traversal_test.go:596: NextFilteredUntilSelection=22
+	bench_traversal_test.go:596: NextFilteredUntilSelection=22
+	bench_traversal_test.go:596: NextFilteredUntilSelection=22
+BenchmarkNextFilteredUntilNodes	   50000	     62124 ns/op
+--- BENCH: BenchmarkNextFilteredUntilNodes
+	bench_traversal_test.go:614: NextFilteredUntilNodes=22
+	bench_traversal_test.go:614: NextFilteredUntilNodes=22
+	bench_traversal_test.go:614: NextFilteredUntilNodes=22
+	bench_traversal_test.go:614: NextFilteredUntilNodes=22
+BenchmarkPrevFilteredUntil	   50000	     42861 ns/op
+--- BENCH: BenchmarkPrevFilteredUntil
+	bench_traversal_test.go:630: PrevFilteredUntil=20
+	bench_traversal_test.go:630: PrevFilteredUntil=20
+	bench_traversal_test.go:630: PrevFilteredUntil=20
+	bench_traversal_test.go:630: PrevFilteredUntil=20
+BenchmarkPrevFilteredUntilSelection	   50000	     62451 ns/op
+--- BENCH: BenchmarkPrevFilteredUntilSelection
+	bench_traversal_test.go:647: PrevFilteredUntilSelection=20
+	bench_traversal_test.go:647: PrevFilteredUntilSelection=20
+	bench_traversal_test.go:647: PrevFilteredUntilSelection=20
+	bench_traversal_test.go:647: PrevFilteredUntilSelection=20
+BenchmarkPrevFilteredUntilNodes	   50000	     62631 ns/op
+--- BENCH: BenchmarkPrevFilteredUntilNodes
+	bench_traversal_test.go:665: PrevFilteredUntilNodes=20
+	bench_traversal_test.go:665: PrevFilteredUntilNodes=20
+	bench_traversal_test.go:665: PrevFilteredUntilNodes=20
+	bench_traversal_test.go:665: PrevFilteredUntilNodes=20
+BenchmarkClosest	  500000	      4684 ns/op
+--- BENCH: BenchmarkClosest
+	bench_traversal_test.go:681: Closest=2
+	bench_traversal_test.go:681: Closest=2
+	bench_traversal_test.go:681: Closest=2
+	bench_traversal_test.go:681: Closest=2
+BenchmarkClosestSelection	 5000000	       622 ns/op
+--- BENCH: BenchmarkClosestSelection
+	bench_traversal_test.go:698: ClosestSelection=2
+	bench_traversal_test.go:698: ClosestSelection=2
+	bench_traversal_test.go:698: ClosestSelection=2
+	bench_traversal_test.go:698: ClosestSelection=2
+	bench_traversal_test.go:698: ClosestSelection=2
+BenchmarkClosestNodes	 5000000	       617 ns/op
+--- BENCH: BenchmarkClosestNodes
+	bench_traversal_test.go:715: ClosestNodes=2
+	bench_traversal_test.go:715: ClosestNodes=2
+	bench_traversal_test.go:715: ClosestNodes=2
+	bench_traversal_test.go:715: ClosestNodes=2
+	bench_traversal_test.go:715: ClosestNodes=2
+ok  	github.com/PuerkitoBio/goquery	218.724s
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench/v0.3.2-go1.2-take2 b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench/v0.3.2-go1.2-take2
new file mode 100644
index 00000000..02a81187
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench/v0.3.2-go1.2-take2
@@ -0,0 +1,477 @@
+PASS
+BenchmarkFirst	20000000	        88.3 ns/op
+BenchmarkLast	20000000	        88.9 ns/op
+BenchmarkEq	20000000	        86.7 ns/op
+BenchmarkSlice	20000000	        84.1 ns/op
+BenchmarkGet	2000000000	         1.99 ns/op
+BenchmarkIndex	 2000000	       907 ns/op
+--- BENCH: BenchmarkIndex
+	bench_array_test.go:73: Index=3
+	bench_array_test.go:73: Index=3
+	bench_array_test.go:73: Index=3
+	bench_array_test.go:73: Index=3
+	bench_array_test.go:73: Index=3
+BenchmarkIndexSelector	  200000	     13052 ns/op
+--- BENCH: BenchmarkIndexSelector
+	bench_array_test.go:85: IndexSelector=4
+	bench_array_test.go:85: IndexSelector=4
+	bench_array_test.go:85: IndexSelector=4
+	bench_array_test.go:85: IndexSelector=4
+BenchmarkIndexOfNode	100000000	        10.5 ns/op
+--- BENCH: BenchmarkIndexOfNode
+	bench_array_test.go:99: IndexOfNode=2
+	bench_array_test.go:99: IndexOfNode=2
+	bench_array_test.go:99: IndexOfNode=2
+	bench_array_test.go:99: IndexOfNode=2
+	bench_array_test.go:99: IndexOfNode=2
+BenchmarkIndexOfSelection	100000000	        11.6 ns/op
+--- BENCH: BenchmarkIndexOfSelection
+	bench_array_test.go:111: IndexOfSelection=2
+	bench_array_test.go:111: IndexOfSelection=2
+	bench_array_test.go:111: IndexOfSelection=2
+	bench_array_test.go:111: IndexOfSelection=2
+	bench_array_test.go:111: IndexOfSelection=2
+BenchmarkMetalReviewExample	   10000	    189556 ns/op
+--- BENCH: BenchmarkMetalReviewExample
+	bench_example_test.go:40: Review 0: Midnight - Complete and Total Hell (8.5).
+		Review 1: Over Your Threshold - Facticity (6.0).
+		Review 2: Nuclear Death Terror - Chaos Reigns (7.5).
+		Review 3: Evoken - Atra Mors (9.5).
+		
+	bench_example_test.go:41: MetalReviewExample=10
+	bench_example_test.go:40: Review 0: Midnight - Complete and Total Hell (8.5).
+		Review 1: Over Your Threshold - Facticity (6.0).
+		Review 2: Nuclear Death Terror - Chaos Reigns (7.5).
+		Review 3: Evoken - Atra Mors (9.5).
+	... [output truncated]
+BenchmarkAdd	  200000	     13714 ns/op
+--- BENCH: BenchmarkAdd
+	bench_expand_test.go:20: Add=43
+	bench_expand_test.go:20: Add=43
+	bench_expand_test.go:20: Add=43
+	bench_expand_test.go:20: Add=43
+BenchmarkAddSelection	10000000	       200 ns/op
+--- BENCH: BenchmarkAddSelection
+	bench_expand_test.go:37: AddSelection=43
+	bench_expand_test.go:37: AddSelection=43
+	bench_expand_test.go:37: AddSelection=43
+	bench_expand_test.go:37: AddSelection=43
+	bench_expand_test.go:37: AddSelection=43
+BenchmarkAddNodes	10000000	       186 ns/op
+--- BENCH: BenchmarkAddNodes
+	bench_expand_test.go:55: AddNodes=43
+	bench_expand_test.go:55: AddNodes=43
+	bench_expand_test.go:55: AddNodes=43
+	bench_expand_test.go:55: AddNodes=43
+	bench_expand_test.go:55: AddNodes=43
+BenchmarkAndSelf	 1000000	      2532 ns/op
+--- BENCH: BenchmarkAndSelf
+	bench_expand_test.go:71: AndSelf=44
+	bench_expand_test.go:71: AndSelf=44
+	bench_expand_test.go:71: AndSelf=44
+	bench_expand_test.go:71: AndSelf=44
+BenchmarkFilter	  100000	     25199 ns/op
+--- BENCH: BenchmarkFilter
+	bench_filter_test.go:20: Filter=13
+	bench_filter_test.go:20: Filter=13
+	bench_filter_test.go:20: Filter=13
+	bench_filter_test.go:20: Filter=13
+BenchmarkNot	  100000	     29162 ns/op
+--- BENCH: BenchmarkNot
+	bench_filter_test.go:36: Not=371
+	bench_filter_test.go:36: Not=371
+	bench_filter_test.go:36: Not=371
+	bench_filter_test.go:36: Not=371
+BenchmarkFilterFunction	   50000	     60733 ns/op
+--- BENCH: BenchmarkFilterFunction
+	bench_filter_test.go:55: FilterFunction=112
+	bench_filter_test.go:55: FilterFunction=112
+	bench_filter_test.go:55: FilterFunction=112
+	bench_filter_test.go:55: FilterFunction=112
+BenchmarkNotFunction	   50000	     66124 ns/op
+--- BENCH: BenchmarkNotFunction
+	bench_filter_test.go:74: NotFunction=261
+	bench_filter_test.go:74: NotFunction=261
+	bench_filter_test.go:74: NotFunction=261
+	bench_filter_test.go:74: NotFunction=261
+BenchmarkFilterNodes	   50000	     59489 ns/op
+--- BENCH: BenchmarkFilterNodes
+	bench_filter_test.go:92: FilterNodes=2
+	bench_filter_test.go:92: FilterNodes=2
+	bench_filter_test.go:92: FilterNodes=2
+	bench_filter_test.go:92: FilterNodes=2
+BenchmarkNotNodes	   50000	     73623 ns/op
+--- BENCH: BenchmarkNotNodes
+	bench_filter_test.go:110: NotNodes=360
+	bench_filter_test.go:110: NotNodes=360
+	bench_filter_test.go:110: NotNodes=360
+	bench_filter_test.go:110: NotNodes=360
+BenchmarkFilterSelection	   50000	     60053 ns/op
+--- BENCH: BenchmarkFilterSelection
+	bench_filter_test.go:127: FilterSelection=2
+	bench_filter_test.go:127: FilterSelection=2
+	bench_filter_test.go:127: FilterSelection=2
+	bench_filter_test.go:127: FilterSelection=2
+BenchmarkNotSelection	   50000	     73477 ns/op
+--- BENCH: BenchmarkNotSelection
+	bench_filter_test.go:144: NotSelection=360
+	bench_filter_test.go:144: NotSelection=360
+	bench_filter_test.go:144: NotSelection=360
+	bench_filter_test.go:144: NotSelection=360
+BenchmarkHas	    5000	    364859 ns/op
+--- BENCH: BenchmarkHas
+	bench_filter_test.go:160: Has=13
+	bench_filter_test.go:160: Has=13
+	bench_filter_test.go:160: Has=13
+BenchmarkHasNodes	   10000	    226980 ns/op
+--- BENCH: BenchmarkHasNodes
+	bench_filter_test.go:178: HasNodes=15
+	bench_filter_test.go:178: HasNodes=15
+	bench_filter_test.go:178: HasNodes=15
+BenchmarkHasSelection	   10000	    220471 ns/op
+--- BENCH: BenchmarkHasSelection
+	bench_filter_test.go:195: HasSelection=15
+	bench_filter_test.go:195: HasSelection=15
+	bench_filter_test.go:195: HasSelection=15
+BenchmarkEnd	500000000	         4.64 ns/op
+--- BENCH: BenchmarkEnd
+	bench_filter_test.go:211: End=373
+	bench_filter_test.go:211: End=373
+	bench_filter_test.go:211: End=373
+	bench_filter_test.go:211: End=373
+	bench_filter_test.go:211: End=373
+	bench_filter_test.go:211: End=373
+BenchmarkEach	  200000	      8811 ns/op
+--- BENCH: BenchmarkEach
+	bench_iteration_test.go:22: Each=59
+	bench_iteration_test.go:22: Each=59
+	bench_iteration_test.go:22: Each=59
+	bench_iteration_test.go:22: Each=59
+BenchmarkMap	  100000	     15365 ns/op
+--- BENCH: BenchmarkMap
+	bench_iteration_test.go:41: Map=59
+	bench_iteration_test.go:41: Map=59
+	bench_iteration_test.go:41: Map=59
+	bench_iteration_test.go:41: Map=59
+BenchmarkEachWithBreak	 1000000	      1559 ns/op
+--- BENCH: BenchmarkEachWithBreak
+	bench_iteration_test.go:61: Each=10
+	bench_iteration_test.go:61: Each=10
+	bench_iteration_test.go:61: Each=10
+	bench_iteration_test.go:61: Each=10
+BenchmarkAttr	50000000	        31.7 ns/op
+--- BENCH: BenchmarkAttr
+	bench_property_test.go:16: Attr=firstHeading
+	bench_property_test.go:16: Attr=firstHeading
+	bench_property_test.go:16: Attr=firstHeading
+	bench_property_test.go:16: Attr=firstHeading
+	bench_property_test.go:16: Attr=firstHeading
+BenchmarkText	  200000	     13901 ns/op
+BenchmarkLength	2000000000	         0.31 ns/op
+--- BENCH: BenchmarkLength
+	bench_property_test.go:37: Length=14
+	bench_property_test.go:37: Length=14
+	bench_property_test.go:37: Length=14
+	bench_property_test.go:37: Length=14
+	bench_property_test.go:37: Length=14
+	bench_property_test.go:37: Length=14
+BenchmarkHtml	 5000000	       541 ns/op
+BenchmarkIs	  100000	     29435 ns/op
+--- BENCH: BenchmarkIs
+	bench_query_test.go:16: Is=true
+	bench_query_test.go:16: Is=true
+	bench_query_test.go:16: Is=true
+	bench_query_test.go:16: Is=true
+BenchmarkIsPositional	  100000	     22938 ns/op
+--- BENCH: BenchmarkIsPositional
+	bench_query_test.go:28: IsPositional=true
+	bench_query_test.go:28: IsPositional=true
+	bench_query_test.go:28: IsPositional=true
+	bench_query_test.go:28: IsPositional=true
+BenchmarkIsFunction	 1000000	      2185 ns/op
+--- BENCH: BenchmarkIsFunction
+	bench_query_test.go:43: IsFunction=true
+	bench_query_test.go:43: IsFunction=true
+	bench_query_test.go:43: IsFunction=true
+	bench_query_test.go:43: IsFunction=true
+BenchmarkIsSelection	   50000	     60607 ns/op
+--- BENCH: BenchmarkIsSelection
+	bench_query_test.go:56: IsSelection=true
+	bench_query_test.go:56: IsSelection=true
+	bench_query_test.go:56: IsSelection=true
+	bench_query_test.go:56: IsSelection=true
+BenchmarkIsNodes	   50000	     61599 ns/op
+--- BENCH: BenchmarkIsNodes
+	bench_query_test.go:70: IsNodes=true
+	bench_query_test.go:70: IsNodes=true
+	bench_query_test.go:70: IsNodes=true
+	bench_query_test.go:70: IsNodes=true
+BenchmarkHasClass	    5000	    395436 ns/op
+--- BENCH: BenchmarkHasClass
+	bench_query_test.go:82: HasClass=true
+	bench_query_test.go:82: HasClass=true
+	bench_query_test.go:82: HasClass=true
+BenchmarkContains	100000000	        11.0 ns/op
+--- BENCH: BenchmarkContains
+	bench_query_test.go:96: Contains=true
+	bench_query_test.go:96: Contains=true
+	bench_query_test.go:96: Contains=true
+	bench_query_test.go:96: Contains=true
+	bench_query_test.go:96: Contains=true
+BenchmarkFind	  200000	     13788 ns/op
+--- BENCH: BenchmarkFind
+	bench_traversal_test.go:18: Find=41
+	bench_traversal_test.go:18: Find=41
+	bench_traversal_test.go:18: Find=41
+	bench_traversal_test.go:18: Find=41
+BenchmarkFindWithinSelection	   50000	     54253 ns/op
+--- BENCH: BenchmarkFindWithinSelection
+	bench_traversal_test.go:34: FindWithinSelection=39
+	bench_traversal_test.go:34: FindWithinSelection=39
+	bench_traversal_test.go:34: FindWithinSelection=39
+	bench_traversal_test.go:34: FindWithinSelection=39
+BenchmarkFindSelection	    5000	    438879 ns/op
+--- BENCH: BenchmarkFindSelection
+	bench_traversal_test.go:51: FindSelection=73
+	bench_traversal_test.go:51: FindSelection=73
+	bench_traversal_test.go:51: FindSelection=73
+BenchmarkFindNodes	    5000	    437225 ns/op
+--- BENCH: BenchmarkFindNodes
+	bench_traversal_test.go:69: FindNodes=73
+	bench_traversal_test.go:69: FindNodes=73
+	bench_traversal_test.go:69: FindNodes=73
+BenchmarkContents	 1000000	      2844 ns/op
+--- BENCH: BenchmarkContents
+	bench_traversal_test.go:85: Contents=16
+	bench_traversal_test.go:85: Contents=16
+	bench_traversal_test.go:85: Contents=16
+	bench_traversal_test.go:85: Contents=16
+BenchmarkContentsFiltered	  500000	      4528 ns/op
+--- BENCH: BenchmarkContentsFiltered
+	bench_traversal_test.go:101: ContentsFiltered=1
+	bench_traversal_test.go:101: ContentsFiltered=1
+	bench_traversal_test.go:101: ContentsFiltered=1
+	bench_traversal_test.go:101: ContentsFiltered=1
+BenchmarkChildren	 5000000	       552 ns/op
+--- BENCH: BenchmarkChildren
+	bench_traversal_test.go:117: Children=2
+	bench_traversal_test.go:117: Children=2
+	bench_traversal_test.go:117: Children=2
+	bench_traversal_test.go:117: Children=2
+	bench_traversal_test.go:117: Children=2
+BenchmarkChildrenFiltered	  500000	      3345 ns/op
+--- BENCH: BenchmarkChildrenFiltered
+	bench_traversal_test.go:133: ChildrenFiltered=2
+	bench_traversal_test.go:133: ChildrenFiltered=2
+	bench_traversal_test.go:133: ChildrenFiltered=2
+	bench_traversal_test.go:133: ChildrenFiltered=2
+BenchmarkParent	   50000	     39482 ns/op
+--- BENCH: BenchmarkParent
+	bench_traversal_test.go:149: Parent=55
+	bench_traversal_test.go:149: Parent=55
+	bench_traversal_test.go:149: Parent=55
+	bench_traversal_test.go:149: Parent=55
+BenchmarkParentFiltered	   50000	     42113 ns/op
+--- BENCH: BenchmarkParentFiltered
+	bench_traversal_test.go:165: ParentFiltered=4
+	bench_traversal_test.go:165: ParentFiltered=4
+	bench_traversal_test.go:165: ParentFiltered=4
+	bench_traversal_test.go:165: ParentFiltered=4
+BenchmarkParents	   20000	     84136 ns/op
+--- BENCH: BenchmarkParents
+	bench_traversal_test.go:181: Parents=73
+	bench_traversal_test.go:181: Parents=73
+	bench_traversal_test.go:181: Parents=73
+	bench_traversal_test.go:181: Parents=73
+BenchmarkParentsFiltered	   20000	     86041 ns/op
+--- BENCH: BenchmarkParentsFiltered
+	bench_traversal_test.go:197: ParentsFiltered=18
+	bench_traversal_test.go:197: ParentsFiltered=18
+	bench_traversal_test.go:197: ParentsFiltered=18
+	bench_traversal_test.go:197: ParentsFiltered=18
+BenchmarkParentsUntil	   50000	     65844 ns/op
+--- BENCH: BenchmarkParentsUntil
+	bench_traversal_test.go:213: ParentsUntil=52
+	bench_traversal_test.go:213: ParentsUntil=52
+	bench_traversal_test.go:213: ParentsUntil=52
+	bench_traversal_test.go:213: ParentsUntil=52
+BenchmarkParentsUntilSelection	   10000	    146903 ns/op
+--- BENCH: BenchmarkParentsUntilSelection
+	bench_traversal_test.go:230: ParentsUntilSelection=70
+	bench_traversal_test.go:230: ParentsUntilSelection=70
+	bench_traversal_test.go:230: ParentsUntilSelection=70
+BenchmarkParentsUntilNodes	   10000	    146638 ns/op
+--- BENCH: BenchmarkParentsUntilNodes
+	bench_traversal_test.go:248: ParentsUntilNodes=70
+	bench_traversal_test.go:248: ParentsUntilNodes=70
+	bench_traversal_test.go:248: ParentsUntilNodes=70
+BenchmarkParentsFilteredUntil	  100000	     16413 ns/op
+--- BENCH: BenchmarkParentsFilteredUntil
+	bench_traversal_test.go:264: ParentsFilteredUntil=2
+	bench_traversal_test.go:264: ParentsFilteredUntil=2
+	bench_traversal_test.go:264: ParentsFilteredUntil=2
+	bench_traversal_test.go:264: ParentsFilteredUntil=2
+BenchmarkParentsFilteredUntilSelection	  100000	     20366 ns/op
+--- BENCH: BenchmarkParentsFilteredUntilSelection
+	bench_traversal_test.go:281: ParentsFilteredUntilSelection=2
+	bench_traversal_test.go:281: ParentsFilteredUntilSelection=2
+	bench_traversal_test.go:281: ParentsFilteredUntilSelection=2
+	bench_traversal_test.go:281: ParentsFilteredUntilSelection=2
+BenchmarkParentsFilteredUntilNodes	  100000	     18800 ns/op
+--- BENCH: BenchmarkParentsFilteredUntilNodes
+	bench_traversal_test.go:299: ParentsFilteredUntilNodes=2
+	bench_traversal_test.go:299: ParentsFilteredUntilNodes=2
+	bench_traversal_test.go:299: ParentsFilteredUntilNodes=2
+	bench_traversal_test.go:299: ParentsFilteredUntilNodes=2
+BenchmarkSiblings	   50000	     63443 ns/op
+--- BENCH: BenchmarkSiblings
+	bench_traversal_test.go:315: Siblings=293
+	bench_traversal_test.go:315: Siblings=293
+	bench_traversal_test.go:315: Siblings=293
+	bench_traversal_test.go:315: Siblings=293
+BenchmarkSiblingsFiltered	   50000	     69250 ns/op
+--- BENCH: BenchmarkSiblingsFiltered
+	bench_traversal_test.go:331: SiblingsFiltered=46
+	bench_traversal_test.go:331: SiblingsFiltered=46
+	bench_traversal_test.go:331: SiblingsFiltered=46
+	bench_traversal_test.go:331: SiblingsFiltered=46
+BenchmarkNext	  200000	      9193 ns/op
+--- BENCH: BenchmarkNext
+	bench_traversal_test.go:347: Next=49
+	bench_traversal_test.go:347: Next=49
+	bench_traversal_test.go:347: Next=49
+	bench_traversal_test.go:347: Next=49
+BenchmarkNextFiltered	  200000	     10767 ns/op
+--- BENCH: BenchmarkNextFiltered
+	bench_traversal_test.go:363: NextFiltered=6
+	bench_traversal_test.go:363: NextFiltered=6
+	bench_traversal_test.go:363: NextFiltered=6
+	bench_traversal_test.go:363: NextFiltered=6
+BenchmarkNextAll	   50000	     42829 ns/op
+--- BENCH: BenchmarkNextAll
+	bench_traversal_test.go:379: NextAll=234
+	bench_traversal_test.go:379: NextAll=234
+	bench_traversal_test.go:379: NextAll=234
+	bench_traversal_test.go:379: NextAll=234
+BenchmarkNextAllFiltered	   50000	     48174 ns/op
+--- BENCH: BenchmarkNextAllFiltered
+	bench_traversal_test.go:395: NextAllFiltered=33
+	bench_traversal_test.go:395: NextAllFiltered=33
+	bench_traversal_test.go:395: NextAllFiltered=33
+	bench_traversal_test.go:395: NextAllFiltered=33
+BenchmarkPrev	  200000	      9114 ns/op
+--- BENCH: BenchmarkPrev
+	bench_traversal_test.go:411: Prev=49
+	bench_traversal_test.go:411: Prev=49
+	bench_traversal_test.go:411: Prev=49
+	bench_traversal_test.go:411: Prev=49
+BenchmarkPrevFiltered	  200000	     11114 ns/op
+--- BENCH: BenchmarkPrevFiltered
+	bench_traversal_test.go:429: PrevFiltered=7
+	bench_traversal_test.go:429: PrevFiltered=7
+	bench_traversal_test.go:429: PrevFiltered=7
+	bench_traversal_test.go:429: PrevFiltered=7
+BenchmarkPrevAll	  100000	     16387 ns/op
+--- BENCH: BenchmarkPrevAll
+	bench_traversal_test.go:445: PrevAll=78
+	bench_traversal_test.go:445: PrevAll=78
+	bench_traversal_test.go:445: PrevAll=78
+	bench_traversal_test.go:445: PrevAll=78
+BenchmarkPrevAllFiltered	  100000	     18322 ns/op
+--- BENCH: BenchmarkPrevAllFiltered
+	bench_traversal_test.go:461: PrevAllFiltered=6
+	bench_traversal_test.go:461: PrevAllFiltered=6
+	bench_traversal_test.go:461: PrevAllFiltered=6
+	bench_traversal_test.go:461: PrevAllFiltered=6
+BenchmarkNextUntil	   20000	     83828 ns/op
+--- BENCH: BenchmarkNextUntil
+	bench_traversal_test.go:477: NextUntil=84
+	bench_traversal_test.go:477: NextUntil=84
+	bench_traversal_test.go:477: NextUntil=84
+	bench_traversal_test.go:477: NextUntil=84
+BenchmarkNextUntilSelection	   50000	     58822 ns/op
+--- BENCH: BenchmarkNextUntilSelection
+	bench_traversal_test.go:494: NextUntilSelection=42
+	bench_traversal_test.go:494: NextUntilSelection=42
+	bench_traversal_test.go:494: NextUntilSelection=42
+	bench_traversal_test.go:494: NextUntilSelection=42
+BenchmarkNextUntilNodes	  100000	     23173 ns/op
+--- BENCH: BenchmarkNextUntilNodes
+	bench_traversal_test.go:512: NextUntilNodes=12
+	bench_traversal_test.go:512: NextUntilNodes=12
+	bench_traversal_test.go:512: NextUntilNodes=12
+	bench_traversal_test.go:512: NextUntilNodes=12
+BenchmarkPrevUntil	   10000	    219407 ns/op
+--- BENCH: BenchmarkPrevUntil
+	bench_traversal_test.go:528: PrevUntil=238
+	bench_traversal_test.go:528: PrevUntil=238
+	bench_traversal_test.go:528: PrevUntil=238
+BenchmarkPrevUntilSelection	   20000	     76033 ns/op
+--- BENCH: BenchmarkPrevUntilSelection
+	bench_traversal_test.go:545: PrevUntilSelection=49
+	bench_traversal_test.go:545: PrevUntilSelection=49
+	bench_traversal_test.go:545: PrevUntilSelection=49
+	bench_traversal_test.go:545: PrevUntilSelection=49
+BenchmarkPrevUntilNodes	  100000	     19417 ns/op
+--- BENCH: BenchmarkPrevUntilNodes
+	bench_traversal_test.go:563: PrevUntilNodes=11
+	bench_traversal_test.go:563: PrevUntilNodes=11
+	bench_traversal_test.go:563: PrevUntilNodes=11
+	bench_traversal_test.go:563: PrevUntilNodes=11
+BenchmarkNextFilteredUntil	   50000	     44648 ns/op
+--- BENCH: BenchmarkNextFilteredUntil
+	bench_traversal_test.go:579: NextFilteredUntil=22
+	bench_traversal_test.go:579: NextFilteredUntil=22
+	bench_traversal_test.go:579: NextFilteredUntil=22
+	bench_traversal_test.go:579: NextFilteredUntil=22
+BenchmarkNextFilteredUntilSelection	   50000	     62751 ns/op
+--- BENCH: BenchmarkNextFilteredUntilSelection
+	bench_traversal_test.go:596: NextFilteredUntilSelection=22
+	bench_traversal_test.go:596: NextFilteredUntilSelection=22
+	bench_traversal_test.go:596: NextFilteredUntilSelection=22
+	bench_traversal_test.go:596: NextFilteredUntilSelection=22
+BenchmarkNextFilteredUntilNodes	   50000	     62035 ns/op
+--- BENCH: BenchmarkNextFilteredUntilNodes
+	bench_traversal_test.go:614: NextFilteredUntilNodes=22
+	bench_traversal_test.go:614: NextFilteredUntilNodes=22
+	bench_traversal_test.go:614: NextFilteredUntilNodes=22
+	bench_traversal_test.go:614: NextFilteredUntilNodes=22
+BenchmarkPrevFilteredUntil	   50000	     43331 ns/op
+--- BENCH: BenchmarkPrevFilteredUntil
+	bench_traversal_test.go:630: PrevFilteredUntil=20
+	bench_traversal_test.go:630: PrevFilteredUntil=20
+	bench_traversal_test.go:630: PrevFilteredUntil=20
+	bench_traversal_test.go:630: PrevFilteredUntil=20
+BenchmarkPrevFilteredUntilSelection	   50000	     64767 ns/op
+--- BENCH: BenchmarkPrevFilteredUntilSelection
+	bench_traversal_test.go:647: PrevFilteredUntilSelection=20
+	bench_traversal_test.go:647: PrevFilteredUntilSelection=20
+	bench_traversal_test.go:647: PrevFilteredUntilSelection=20
+	bench_traversal_test.go:647: PrevFilteredUntilSelection=20
+BenchmarkPrevFilteredUntilNodes	   50000	     67808 ns/op
+--- BENCH: BenchmarkPrevFilteredUntilNodes
+	bench_traversal_test.go:665: PrevFilteredUntilNodes=20
+	bench_traversal_test.go:665: PrevFilteredUntilNodes=20
+	bench_traversal_test.go:665: PrevFilteredUntilNodes=20
+	bench_traversal_test.go:665: PrevFilteredUntilNodes=20
+BenchmarkClosest	  500000	      4870 ns/op
+--- BENCH: BenchmarkClosest
+	bench_traversal_test.go:681: Closest=2
+	bench_traversal_test.go:681: Closest=2
+	bench_traversal_test.go:681: Closest=2
+	bench_traversal_test.go:681: Closest=2
+BenchmarkClosestSelection	 5000000	       656 ns/op
+--- BENCH: BenchmarkClosestSelection
+	bench_traversal_test.go:698: ClosestSelection=2
+	bench_traversal_test.go:698: ClosestSelection=2
+	bench_traversal_test.go:698: ClosestSelection=2
+	bench_traversal_test.go:698: ClosestSelection=2
+	bench_traversal_test.go:698: ClosestSelection=2
+BenchmarkClosestNodes	 5000000	       663 ns/op
+--- BENCH: BenchmarkClosestNodes
+	bench_traversal_test.go:715: ClosestNodes=2
+	bench_traversal_test.go:715: ClosestNodes=2
+	bench_traversal_test.go:715: ClosestNodes=2
+	bench_traversal_test.go:715: ClosestNodes=2
+	bench_traversal_test.go:715: ClosestNodes=2
+ok  	github.com/PuerkitoBio/goquery	218.007s
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench/v0.3.2-go1.2rc1 b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench/v0.3.2-go1.2rc1
new file mode 100644
index 00000000..e1bada78
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench/v0.3.2-go1.2rc1
@@ -0,0 +1,477 @@
+PASS
+BenchmarkFirst	20000000	        91.0 ns/op
+BenchmarkLast	20000000	        90.5 ns/op
+BenchmarkEq	20000000	        90.2 ns/op
+BenchmarkSlice	20000000	        88.0 ns/op
+BenchmarkGet	1000000000	         2.04 ns/op
+BenchmarkIndex	 2000000	       935 ns/op
+--- BENCH: BenchmarkIndex
+	bench_array_test.go:73: Index=3
+	bench_array_test.go:73: Index=3
+	bench_array_test.go:73: Index=3
+	bench_array_test.go:73: Index=3
+	bench_array_test.go:73: Index=3
+BenchmarkIndexSelector	  100000	     23613 ns/op
+--- BENCH: BenchmarkIndexSelector
+	bench_array_test.go:85: IndexSelector=4
+	bench_array_test.go:85: IndexSelector=4
+	bench_array_test.go:85: IndexSelector=4
+	bench_array_test.go:85: IndexSelector=4
+BenchmarkIndexOfNode	100000000	        10.2 ns/op
+--- BENCH: BenchmarkIndexOfNode
+	bench_array_test.go:99: IndexOfNode=2
+	bench_array_test.go:99: IndexOfNode=2
+	bench_array_test.go:99: IndexOfNode=2
+	bench_array_test.go:99: IndexOfNode=2
+	bench_array_test.go:99: IndexOfNode=2
+BenchmarkIndexOfSelection	100000000	        11.0 ns/op
+--- BENCH: BenchmarkIndexOfSelection
+	bench_array_test.go:111: IndexOfSelection=2
+	bench_array_test.go:111: IndexOfSelection=2
+	bench_array_test.go:111: IndexOfSelection=2
+	bench_array_test.go:111: IndexOfSelection=2
+	bench_array_test.go:111: IndexOfSelection=2
+BenchmarkMetalReviewExample	   10000	    213843 ns/op
+--- BENCH: BenchmarkMetalReviewExample
+	bench_example_test.go:40: Review 0: Midnight - Complete and Total Hell (8.5).
+		Review 1: Over Your Threshold - Facticity (6.0).
+		Review 2: Nuclear Death Terror - Chaos Reigns (7.5).
+		Review 3: Evoken - Atra Mors (9.5).
+		
+	bench_example_test.go:41: MetalReviewExample=10
+	bench_example_test.go:40: Review 0: Midnight - Complete and Total Hell (8.5).
+		Review 1: Over Your Threshold - Facticity (6.0).
+		Review 2: Nuclear Death Terror - Chaos Reigns (7.5).
+		Review 3: Evoken - Atra Mors (9.5).
+	... [output truncated]
+BenchmarkAdd	  100000	     18671 ns/op
+--- BENCH: BenchmarkAdd
+	bench_expand_test.go:20: Add=43
+	bench_expand_test.go:20: Add=43
+	bench_expand_test.go:20: Add=43
+	bench_expand_test.go:20: Add=43
+BenchmarkAddSelection	10000000	       204 ns/op
+--- BENCH: BenchmarkAddSelection
+	bench_expand_test.go:37: AddSelection=43
+	bench_expand_test.go:37: AddSelection=43
+	bench_expand_test.go:37: AddSelection=43
+	bench_expand_test.go:37: AddSelection=43
+	bench_expand_test.go:37: AddSelection=43
+BenchmarkAddNodes	10000000	       195 ns/op
+--- BENCH: BenchmarkAddNodes
+	bench_expand_test.go:55: AddNodes=43
+	bench_expand_test.go:55: AddNodes=43
+	bench_expand_test.go:55: AddNodes=43
+	bench_expand_test.go:55: AddNodes=43
+	bench_expand_test.go:55: AddNodes=43
+BenchmarkAndSelf	 1000000	      2611 ns/op
+--- BENCH: BenchmarkAndSelf
+	bench_expand_test.go:71: AndSelf=44
+	bench_expand_test.go:71: AndSelf=44
+	bench_expand_test.go:71: AndSelf=44
+	bench_expand_test.go:71: AndSelf=44
+BenchmarkFilter	  100000	     27571 ns/op
+--- BENCH: BenchmarkFilter
+	bench_filter_test.go:20: Filter=13
+	bench_filter_test.go:20: Filter=13
+	bench_filter_test.go:20: Filter=13
+	bench_filter_test.go:20: Filter=13
+BenchmarkNot	   50000	     32006 ns/op
+--- BENCH: BenchmarkNot
+	bench_filter_test.go:36: Not=371
+	bench_filter_test.go:36: Not=371
+	bench_filter_test.go:36: Not=371
+	bench_filter_test.go:36: Not=371
+BenchmarkFilterFunction	   50000	     61388 ns/op
+--- BENCH: BenchmarkFilterFunction
+	bench_filter_test.go:55: FilterFunction=112
+	bench_filter_test.go:55: FilterFunction=112
+	bench_filter_test.go:55: FilterFunction=112
+	bench_filter_test.go:55: FilterFunction=112
+BenchmarkNotFunction	   50000	     66702 ns/op
+--- BENCH: BenchmarkNotFunction
+	bench_filter_test.go:74: NotFunction=261
+	bench_filter_test.go:74: NotFunction=261
+	bench_filter_test.go:74: NotFunction=261
+	bench_filter_test.go:74: NotFunction=261
+BenchmarkFilterNodes	   50000	     59699 ns/op
+--- BENCH: BenchmarkFilterNodes
+	bench_filter_test.go:92: FilterNodes=2
+	bench_filter_test.go:92: FilterNodes=2
+	bench_filter_test.go:92: FilterNodes=2
+	bench_filter_test.go:92: FilterNodes=2
+BenchmarkNotNodes	   50000	     73248 ns/op
+--- BENCH: BenchmarkNotNodes
+	bench_filter_test.go:110: NotNodes=360
+	bench_filter_test.go:110: NotNodes=360
+	bench_filter_test.go:110: NotNodes=360
+	bench_filter_test.go:110: NotNodes=360
+BenchmarkFilterSelection	   50000	     59242 ns/op
+--- BENCH: BenchmarkFilterSelection
+	bench_filter_test.go:127: FilterSelection=2
+	bench_filter_test.go:127: FilterSelection=2
+	bench_filter_test.go:127: FilterSelection=2
+	bench_filter_test.go:127: FilterSelection=2
+BenchmarkNotSelection	   50000	     73211 ns/op
+--- BENCH: BenchmarkNotSelection
+	bench_filter_test.go:144: NotSelection=360
+	bench_filter_test.go:144: NotSelection=360
+	bench_filter_test.go:144: NotSelection=360
+	bench_filter_test.go:144: NotSelection=360
+BenchmarkHas	    5000	    395087 ns/op
+--- BENCH: BenchmarkHas
+	bench_filter_test.go:160: Has=13
+	bench_filter_test.go:160: Has=13
+	bench_filter_test.go:160: Has=13
+BenchmarkHasNodes	   10000	    215849 ns/op
+--- BENCH: BenchmarkHasNodes
+	bench_filter_test.go:178: HasNodes=15
+	bench_filter_test.go:178: HasNodes=15
+	bench_filter_test.go:178: HasNodes=15
+BenchmarkHasSelection	   10000	    215612 ns/op
+--- BENCH: BenchmarkHasSelection
+	bench_filter_test.go:195: HasSelection=15
+	bench_filter_test.go:195: HasSelection=15
+	bench_filter_test.go:195: HasSelection=15
+BenchmarkEnd	500000000	         4.59 ns/op
+--- BENCH: BenchmarkEnd
+	bench_filter_test.go:211: End=373
+	bench_filter_test.go:211: End=373
+	bench_filter_test.go:211: End=373
+	bench_filter_test.go:211: End=373
+	bench_filter_test.go:211: End=373
+	bench_filter_test.go:211: End=373
+BenchmarkEach	  200000	      8588 ns/op
+--- BENCH: BenchmarkEach
+	bench_iteration_test.go:22: Each=59
+	bench_iteration_test.go:22: Each=59
+	bench_iteration_test.go:22: Each=59
+	bench_iteration_test.go:22: Each=59
+BenchmarkMap	  200000	     14444 ns/op
+--- BENCH: BenchmarkMap
+	bench_iteration_test.go:41: Map=59
+	bench_iteration_test.go:41: Map=59
+	bench_iteration_test.go:41: Map=59
+	bench_iteration_test.go:41: Map=59
+BenchmarkEachWithBreak	 1000000	      1490 ns/op
+--- BENCH: BenchmarkEachWithBreak
+	bench_iteration_test.go:61: Each=10
+	bench_iteration_test.go:61: Each=10
+	bench_iteration_test.go:61: Each=10
+	bench_iteration_test.go:61: Each=10
+BenchmarkAttr	50000000	        30.9 ns/op
+--- BENCH: BenchmarkAttr
+	bench_property_test.go:16: Attr=firstHeading
+	bench_property_test.go:16: Attr=firstHeading
+	bench_property_test.go:16: Attr=firstHeading
+	bench_property_test.go:16: Attr=firstHeading
+	bench_property_test.go:16: Attr=firstHeading
+BenchmarkText	  200000	     14017 ns/op
+BenchmarkLength	2000000000	         0.31 ns/op
+--- BENCH: BenchmarkLength
+	bench_property_test.go:37: Length=14
+	bench_property_test.go:37: Length=14
+	bench_property_test.go:37: Length=14
+	bench_property_test.go:37: Length=14
+	bench_property_test.go:37: Length=14
+	bench_property_test.go:37: Length=14
+BenchmarkHtml	 5000000	       577 ns/op
+BenchmarkIs	   50000	     31936 ns/op
+--- BENCH: BenchmarkIs
+	bench_query_test.go:16: Is=true
+	bench_query_test.go:16: Is=true
+	bench_query_test.go:16: Is=true
+	bench_query_test.go:16: Is=true
+BenchmarkIsPositional	  100000	     23372 ns/op
+--- BENCH: BenchmarkIsPositional
+	bench_query_test.go:28: IsPositional=true
+	bench_query_test.go:28: IsPositional=true
+	bench_query_test.go:28: IsPositional=true
+	bench_query_test.go:28: IsPositional=true
+BenchmarkIsFunction	 1000000	      2170 ns/op
+--- BENCH: BenchmarkIsFunction
+	bench_query_test.go:43: IsFunction=true
+	bench_query_test.go:43: IsFunction=true
+	bench_query_test.go:43: IsFunction=true
+	bench_query_test.go:43: IsFunction=true
+BenchmarkIsSelection	   50000	     59814 ns/op
+--- BENCH: BenchmarkIsSelection
+	bench_query_test.go:56: IsSelection=true
+	bench_query_test.go:56: IsSelection=true
+	bench_query_test.go:56: IsSelection=true
+	bench_query_test.go:56: IsSelection=true
+BenchmarkIsNodes	   50000	     59629 ns/op
+--- BENCH: BenchmarkIsNodes
+	bench_query_test.go:70: IsNodes=true
+	bench_query_test.go:70: IsNodes=true
+	bench_query_test.go:70: IsNodes=true
+	bench_query_test.go:70: IsNodes=true
+BenchmarkHasClass	    5000	    384894 ns/op
+--- BENCH: BenchmarkHasClass
+	bench_query_test.go:82: HasClass=true
+	bench_query_test.go:82: HasClass=true
+	bench_query_test.go:82: HasClass=true
+BenchmarkContains	100000000	        11.4 ns/op
+--- BENCH: BenchmarkContains
+	bench_query_test.go:96: Contains=true
+	bench_query_test.go:96: Contains=true
+	bench_query_test.go:96: Contains=true
+	bench_query_test.go:96: Contains=true
+	bench_query_test.go:96: Contains=true
+BenchmarkFind	  100000	     23545 ns/op
+--- BENCH: BenchmarkFind
+	bench_traversal_test.go:18: Find=41
+	bench_traversal_test.go:18: Find=41
+	bench_traversal_test.go:18: Find=41
+	bench_traversal_test.go:18: Find=41
+BenchmarkFindWithinSelection	   50000	     63775 ns/op
+--- BENCH: BenchmarkFindWithinSelection
+	bench_traversal_test.go:34: FindWithinSelection=39
+	bench_traversal_test.go:34: FindWithinSelection=39
+	bench_traversal_test.go:34: FindWithinSelection=39
+	bench_traversal_test.go:34: FindWithinSelection=39
+BenchmarkFindSelection	    5000	    441958 ns/op
+--- BENCH: BenchmarkFindSelection
+	bench_traversal_test.go:51: FindSelection=73
+	bench_traversal_test.go:51: FindSelection=73
+	bench_traversal_test.go:51: FindSelection=73
+BenchmarkFindNodes	    5000	    437717 ns/op
+--- BENCH: BenchmarkFindNodes
+	bench_traversal_test.go:69: FindNodes=73
+	bench_traversal_test.go:69: FindNodes=73
+	bench_traversal_test.go:69: FindNodes=73
+BenchmarkContents	 1000000	      2799 ns/op
+--- BENCH: BenchmarkContents
+	bench_traversal_test.go:85: Contents=16
+	bench_traversal_test.go:85: Contents=16
+	bench_traversal_test.go:85: Contents=16
+	bench_traversal_test.go:85: Contents=16
+BenchmarkContentsFiltered	  500000	      4489 ns/op
+--- BENCH: BenchmarkContentsFiltered
+	bench_traversal_test.go:101: ContentsFiltered=1
+	bench_traversal_test.go:101: ContentsFiltered=1
+	bench_traversal_test.go:101: ContentsFiltered=1
+	bench_traversal_test.go:101: ContentsFiltered=1
+BenchmarkChildren	 5000000	       546 ns/op
+--- BENCH: BenchmarkChildren
+	bench_traversal_test.go:117: Children=2
+	bench_traversal_test.go:117: Children=2
+	bench_traversal_test.go:117: Children=2
+	bench_traversal_test.go:117: Children=2
+	bench_traversal_test.go:117: Children=2
+BenchmarkChildrenFiltered	  500000	      3472 ns/op
+--- BENCH: BenchmarkChildrenFiltered
+	bench_traversal_test.go:133: ChildrenFiltered=2
+	bench_traversal_test.go:133: ChildrenFiltered=2
+	bench_traversal_test.go:133: ChildrenFiltered=2
+	bench_traversal_test.go:133: ChildrenFiltered=2
+BenchmarkParent	   50000	     39067 ns/op
+--- BENCH: BenchmarkParent
+	bench_traversal_test.go:149: Parent=55
+	bench_traversal_test.go:149: Parent=55
+	bench_traversal_test.go:149: Parent=55
+	bench_traversal_test.go:149: Parent=55
+BenchmarkParentFiltered	   50000	     41450 ns/op
+--- BENCH: BenchmarkParentFiltered
+	bench_traversal_test.go:165: ParentFiltered=4
+	bench_traversal_test.go:165: ParentFiltered=4
+	bench_traversal_test.go:165: ParentFiltered=4
+	bench_traversal_test.go:165: ParentFiltered=4
+BenchmarkParents	   20000	     84864 ns/op
+--- BENCH: BenchmarkParents
+	bench_traversal_test.go:181: Parents=73
+	bench_traversal_test.go:181: Parents=73
+	bench_traversal_test.go:181: Parents=73
+	bench_traversal_test.go:181: Parents=73
+BenchmarkParentsFiltered	   20000	     87823 ns/op
+--- BENCH: BenchmarkParentsFiltered
+	bench_traversal_test.go:197: ParentsFiltered=18
+	bench_traversal_test.go:197: ParentsFiltered=18
+	bench_traversal_test.go:197: ParentsFiltered=18
+	bench_traversal_test.go:197: ParentsFiltered=18
+BenchmarkParentsUntil	   50000	     65986 ns/op
+--- BENCH: BenchmarkParentsUntil
+	bench_traversal_test.go:213: ParentsUntil=52
+	bench_traversal_test.go:213: ParentsUntil=52
+	bench_traversal_test.go:213: ParentsUntil=52
+	bench_traversal_test.go:213: ParentsUntil=52
+BenchmarkParentsUntilSelection	   10000	    149798 ns/op
+--- BENCH: BenchmarkParentsUntilSelection
+	bench_traversal_test.go:230: ParentsUntilSelection=70
+	bench_traversal_test.go:230: ParentsUntilSelection=70
+	bench_traversal_test.go:230: ParentsUntilSelection=70
+BenchmarkParentsUntilNodes	   10000	    148144 ns/op
+--- BENCH: BenchmarkParentsUntilNodes
+	bench_traversal_test.go:248: ParentsUntilNodes=70
+	bench_traversal_test.go:248: ParentsUntilNodes=70
+	bench_traversal_test.go:248: ParentsUntilNodes=70
+BenchmarkParentsFilteredUntil	  100000	     15579 ns/op
+--- BENCH: BenchmarkParentsFilteredUntil
+	bench_traversal_test.go:264: ParentsFilteredUntil=2
+	bench_traversal_test.go:264: ParentsFilteredUntil=2
+	bench_traversal_test.go:264: ParentsFilteredUntil=2
+	bench_traversal_test.go:264: ParentsFilteredUntil=2
+BenchmarkParentsFilteredUntilSelection	  100000	     19094 ns/op
+--- BENCH: BenchmarkParentsFilteredUntilSelection
+	bench_traversal_test.go:281: ParentsFilteredUntilSelection=2
+	bench_traversal_test.go:281: ParentsFilteredUntilSelection=2
+	bench_traversal_test.go:281: ParentsFilteredUntilSelection=2
+	bench_traversal_test.go:281: ParentsFilteredUntilSelection=2
+BenchmarkParentsFilteredUntilNodes	  100000	     19037 ns/op
+--- BENCH: BenchmarkParentsFilteredUntilNodes
+	bench_traversal_test.go:299: ParentsFilteredUntilNodes=2
+	bench_traversal_test.go:299: ParentsFilteredUntilNodes=2
+	bench_traversal_test.go:299: ParentsFilteredUntilNodes=2
+	bench_traversal_test.go:299: ParentsFilteredUntilNodes=2
+BenchmarkSiblings	   50000	     63891 ns/op
+--- BENCH: BenchmarkSiblings
+	bench_traversal_test.go:315: Siblings=293
+	bench_traversal_test.go:315: Siblings=293
+	bench_traversal_test.go:315: Siblings=293
+	bench_traversal_test.go:315: Siblings=293
+BenchmarkSiblingsFiltered	   50000	     70424 ns/op
+--- BENCH: BenchmarkSiblingsFiltered
+	bench_traversal_test.go:331: SiblingsFiltered=46
+	bench_traversal_test.go:331: SiblingsFiltered=46
+	bench_traversal_test.go:331: SiblingsFiltered=46
+	bench_traversal_test.go:331: SiblingsFiltered=46
+BenchmarkNext	  200000	      9350 ns/op
+--- BENCH: BenchmarkNext
+	bench_traversal_test.go:347: Next=49
+	bench_traversal_test.go:347: Next=49
+	bench_traversal_test.go:347: Next=49
+	bench_traversal_test.go:347: Next=49
+BenchmarkNextFiltered	  200000	     10929 ns/op
+--- BENCH: BenchmarkNextFiltered
+	bench_traversal_test.go:363: NextFiltered=6
+	bench_traversal_test.go:363: NextFiltered=6
+	bench_traversal_test.go:363: NextFiltered=6
+	bench_traversal_test.go:363: NextFiltered=6
+BenchmarkNextAll	   50000	     43398 ns/op
+--- BENCH: BenchmarkNextAll
+	bench_traversal_test.go:379: NextAll=234
+	bench_traversal_test.go:379: NextAll=234
+	bench_traversal_test.go:379: NextAll=234
+	bench_traversal_test.go:379: NextAll=234
+BenchmarkNextAllFiltered	   50000	     48519 ns/op
+--- BENCH: BenchmarkNextAllFiltered
+	bench_traversal_test.go:395: NextAllFiltered=33
+	bench_traversal_test.go:395: NextAllFiltered=33
+	bench_traversal_test.go:395: NextAllFiltered=33
+	bench_traversal_test.go:395: NextAllFiltered=33
+BenchmarkPrev	  200000	      9181 ns/op
+--- BENCH: BenchmarkPrev
+	bench_traversal_test.go:411: Prev=49
+	bench_traversal_test.go:411: Prev=49
+	bench_traversal_test.go:411: Prev=49
+	bench_traversal_test.go:411: Prev=49
+BenchmarkPrevFiltered	  200000	     10811 ns/op
+--- BENCH: BenchmarkPrevFiltered
+	bench_traversal_test.go:429: PrevFiltered=7
+	bench_traversal_test.go:429: PrevFiltered=7
+	bench_traversal_test.go:429: PrevFiltered=7
+	bench_traversal_test.go:429: PrevFiltered=7
+BenchmarkPrevAll	  100000	     15589 ns/op
+--- BENCH: BenchmarkPrevAll
+	bench_traversal_test.go:445: PrevAll=78
+	bench_traversal_test.go:445: PrevAll=78
+	bench_traversal_test.go:445: PrevAll=78
+	bench_traversal_test.go:445: PrevAll=78
+BenchmarkPrevAllFiltered	  100000	     17341 ns/op
+--- BENCH: BenchmarkPrevAllFiltered
+	bench_traversal_test.go:461: PrevAllFiltered=6
+	bench_traversal_test.go:461: PrevAllFiltered=6
+	bench_traversal_test.go:461: PrevAllFiltered=6
+	bench_traversal_test.go:461: PrevAllFiltered=6
+BenchmarkNextUntil	   20000	     80663 ns/op
+--- BENCH: BenchmarkNextUntil
+	bench_traversal_test.go:477: NextUntil=84
+	bench_traversal_test.go:477: NextUntil=84
+	bench_traversal_test.go:477: NextUntil=84
+	bench_traversal_test.go:477: NextUntil=84
+BenchmarkNextUntilSelection	   50000	     56496 ns/op
+--- BENCH: BenchmarkNextUntilSelection
+	bench_traversal_test.go:494: NextUntilSelection=42
+	bench_traversal_test.go:494: NextUntilSelection=42
+	bench_traversal_test.go:494: NextUntilSelection=42
+	bench_traversal_test.go:494: NextUntilSelection=42
+BenchmarkNextUntilNodes	  100000	     23729 ns/op
+--- BENCH: BenchmarkNextUntilNodes
+	bench_traversal_test.go:512: NextUntilNodes=12
+	bench_traversal_test.go:512: NextUntilNodes=12
+	bench_traversal_test.go:512: NextUntilNodes=12
+	bench_traversal_test.go:512: NextUntilNodes=12
+BenchmarkPrevUntil	   10000	    208267 ns/op
+--- BENCH: BenchmarkPrevUntil
+	bench_traversal_test.go:528: PrevUntil=238
+	bench_traversal_test.go:528: PrevUntil=238
+	bench_traversal_test.go:528: PrevUntil=238
+BenchmarkPrevUntilSelection	   50000	     72119 ns/op
+--- BENCH: BenchmarkPrevUntilSelection
+	bench_traversal_test.go:545: PrevUntilSelection=49
+	bench_traversal_test.go:545: PrevUntilSelection=49
+	bench_traversal_test.go:545: PrevUntilSelection=49
+	bench_traversal_test.go:545: PrevUntilSelection=49
+BenchmarkPrevUntilNodes	  100000	     18549 ns/op
+--- BENCH: BenchmarkPrevUntilNodes
+	bench_traversal_test.go:563: PrevUntilNodes=11
+	bench_traversal_test.go:563: PrevUntilNodes=11
+	bench_traversal_test.go:563: PrevUntilNodes=11
+	bench_traversal_test.go:563: PrevUntilNodes=11
+BenchmarkNextFilteredUntil	   50000	     42339 ns/op
+--- BENCH: BenchmarkNextFilteredUntil
+	bench_traversal_test.go:579: NextFilteredUntil=22
+	bench_traversal_test.go:579: NextFilteredUntil=22
+	bench_traversal_test.go:579: NextFilteredUntil=22
+	bench_traversal_test.go:579: NextFilteredUntil=22
+BenchmarkNextFilteredUntilSelection	   50000	     61916 ns/op
+--- BENCH: BenchmarkNextFilteredUntilSelection
+	bench_traversal_test.go:596: NextFilteredUntilSelection=22
+	bench_traversal_test.go:596: NextFilteredUntilSelection=22
+	bench_traversal_test.go:596: NextFilteredUntilSelection=22
+	bench_traversal_test.go:596: NextFilteredUntilSelection=22
+BenchmarkNextFilteredUntilNodes	   50000	     62139 ns/op
+--- BENCH: BenchmarkNextFilteredUntilNodes
+	bench_traversal_test.go:614: NextFilteredUntilNodes=22
+	bench_traversal_test.go:614: NextFilteredUntilNodes=22
+	bench_traversal_test.go:614: NextFilteredUntilNodes=22
+	bench_traversal_test.go:614: NextFilteredUntilNodes=22
+BenchmarkPrevFilteredUntil	   50000	     43409 ns/op
+--- BENCH: BenchmarkPrevFilteredUntil
+	bench_traversal_test.go:630: PrevFilteredUntil=20
+	bench_traversal_test.go:630: PrevFilteredUntil=20
+	bench_traversal_test.go:630: PrevFilteredUntil=20
+	bench_traversal_test.go:630: PrevFilteredUntil=20
+BenchmarkPrevFilteredUntilSelection	   50000	     63768 ns/op
+--- BENCH: BenchmarkPrevFilteredUntilSelection
+	bench_traversal_test.go:647: PrevFilteredUntilSelection=20
+	bench_traversal_test.go:647: PrevFilteredUntilSelection=20
+	bench_traversal_test.go:647: PrevFilteredUntilSelection=20
+	bench_traversal_test.go:647: PrevFilteredUntilSelection=20
+BenchmarkPrevFilteredUntilNodes	   50000	     63543 ns/op
+--- BENCH: BenchmarkPrevFilteredUntilNodes
+	bench_traversal_test.go:665: PrevFilteredUntilNodes=20
+	bench_traversal_test.go:665: PrevFilteredUntilNodes=20
+	bench_traversal_test.go:665: PrevFilteredUntilNodes=20
+	bench_traversal_test.go:665: PrevFilteredUntilNodes=20
+BenchmarkClosest	  500000	      5110 ns/op
+--- BENCH: BenchmarkClosest
+	bench_traversal_test.go:681: Closest=2
+	bench_traversal_test.go:681: Closest=2
+	bench_traversal_test.go:681: Closest=2
+	bench_traversal_test.go:681: Closest=2
+BenchmarkClosestSelection	 5000000	       629 ns/op
+--- BENCH: BenchmarkClosestSelection
+	bench_traversal_test.go:698: ClosestSelection=2
+	bench_traversal_test.go:698: ClosestSelection=2
+	bench_traversal_test.go:698: ClosestSelection=2
+	bench_traversal_test.go:698: ClosestSelection=2
+	bench_traversal_test.go:698: ClosestSelection=2
+BenchmarkClosestNodes	 5000000	       627 ns/op
+--- BENCH: BenchmarkClosestNodes
+	bench_traversal_test.go:715: ClosestNodes=2
+	bench_traversal_test.go:715: ClosestNodes=2
+	bench_traversal_test.go:715: ClosestNodes=2
+	bench_traversal_test.go:715: ClosestNodes=2
+	bench_traversal_test.go:715: ClosestNodes=2
+ok  	github.com/PuerkitoBio/goquery	215.785s
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench_array_test.go b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench_array_test.go
new file mode 100644
index 00000000..6d5581eb
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench_array_test.go
@@ -0,0 +1,112 @@
+package goquery
+
+import (
+	"testing"
+)
+
+func BenchmarkFirst(b *testing.B) {
+	b.StopTimer()
+	sel := DocB().Find("dd")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		sel.First()
+	}
+}
+
+func BenchmarkLast(b *testing.B) {
+	b.StopTimer()
+	sel := DocB().Find("dd")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		sel.Last()
+	}
+}
+
+func BenchmarkEq(b *testing.B) {
+	b.StopTimer()
+	sel := DocB().Find("dd")
+	j := 0
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		sel.Eq(j)
+		if j++; j >= sel.Length() {
+			j = 0
+		}
+	}
+}
+
+func BenchmarkSlice(b *testing.B) {
+	b.StopTimer()
+	sel := DocB().Find("dd")
+	j := 0
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		sel.Slice(j, j+4)
+		if j++; j >= (sel.Length() - 4) {
+			j = 0
+		}
+	}
+}
+
+func BenchmarkGet(b *testing.B) {
+	b.StopTimer()
+	sel := DocB().Find("dd")
+	j := 0
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		sel.Get(j)
+		if j++; j >= sel.Length() {
+			j = 0
+		}
+	}
+}
+
+func BenchmarkIndex(b *testing.B) {
+	var j int
+
+	b.StopTimer()
+	sel := DocB().Find("#Main")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		j = sel.Index()
+	}
+	b.Logf("Index=%d", j)
+}
+
+func BenchmarkIndexSelector(b *testing.B) {
+	var j int
+
+	b.StopTimer()
+	sel := DocB().Find("#manual-nav dl dd:nth-child(1)")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		j = sel.IndexSelector("dd")
+	}
+	b.Logf("IndexSelector=%d", j)
+}
+
+func BenchmarkIndexOfNode(b *testing.B) {
+	var j int
+
+	b.StopTimer()
+	sel := DocB().Find("span a")
+	sel2 := DocB().Find("span a:nth-child(3)")
+	n := sel2.Get(0)
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		j = sel.IndexOfNode(n)
+	}
+	b.Logf("IndexOfNode=%d", j)
+}
+
+func BenchmarkIndexOfSelection(b *testing.B) {
+	var j int
+	b.StopTimer()
+	sel := DocB().Find("span a")
+	sel2 := DocB().Find("span a:nth-child(3)")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		j = sel.IndexOfSelection(sel2)
+	}
+	b.Logf("IndexOfSelection=%d", j)
+}
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench_example_test.go b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench_example_test.go
new file mode 100644
index 00000000..a5474310
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench_example_test.go
@@ -0,0 +1,42 @@
+package goquery
+
+import (
+	"bytes"
+	"fmt"
+	"strconv"
+	"testing"
+)
+
+func BenchmarkMetalReviewExample(b *testing.B) {
+	var n int
+	var buf bytes.Buffer
+
+	b.StopTimer()
+	doc := loadDoc("metalreview.html")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		doc.Find(".slider-row:nth-child(1) .slider-item").Each(func(i int, s *Selection) {
+			var band, title string
+			var score float64
+			var e error
+
+			n++
+			// For each item found, get the band, title and score, and print it
+			band = s.Find("strong").Text()
+			title = s.Find("em").Text()
+			if score, e = strconv.ParseFloat(s.Find(".score").Text(), 64); e != nil {
+				// Not a valid float, ignore score
+				if n <= 4 {
+					buf.WriteString(fmt.Sprintf("Review %d: %s - %s.\n", i, band, title))
+				}
+			} else {
+				// Print all, including score
+				if n <= 4 {
+					buf.WriteString(fmt.Sprintf("Review %d: %s - %s (%2.1f).\n", i, band, title, score))
+				}
+			}
+		})
+	}
+	b.Log(buf.String())
+	b.Logf("MetalReviewExample=%d", n)
+}
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench_expand_test.go b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench_expand_test.go
new file mode 100644
index 00000000..aee7d81d
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench_expand_test.go
@@ -0,0 +1,72 @@
+package goquery
+
+import (
+	"testing"
+)
+
+func BenchmarkAdd(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocB().Find("dd")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.Add("h2[title]").Length()
+		} else {
+			sel.Add("h2[title]")
+		}
+	}
+	b.Logf("Add=%d", n)
+}
+
+func BenchmarkAddSelection(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocB().Find("dd")
+	sel2 := DocB().Find("h2[title]")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.AddSelection(sel2).Length()
+		} else {
+			sel.AddSelection(sel2)
+		}
+	}
+	b.Logf("AddSelection=%d", n)
+}
+
+func BenchmarkAddNodes(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocB().Find("dd")
+	sel2 := DocB().Find("h2[title]")
+	nodes := sel2.Nodes
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.AddNodes(nodes...).Length()
+		} else {
+			sel.AddNodes(nodes...)
+		}
+	}
+	b.Logf("AddNodes=%d", n)
+}
+
+func BenchmarkAndSelf(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocB().Find("dd").Parent()
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.AndSelf().Length()
+		} else {
+			sel.AndSelf()
+		}
+	}
+	b.Logf("AndSelf=%d", n)
+}
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench_filter_test.go b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench_filter_test.go
new file mode 100644
index 00000000..05ffaaa3
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench_filter_test.go
@@ -0,0 +1,212 @@
+package goquery
+
+import (
+	"testing"
+)
+
+func BenchmarkFilter(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("li")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.Filter(".toclevel-1").Length()
+		} else {
+			sel.Filter(".toclevel-1")
+		}
+	}
+	b.Logf("Filter=%d", n)
+}
+
+func BenchmarkNot(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("li")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.Not(".toclevel-2").Length()
+		} else {
+			sel.Filter(".toclevel-2")
+		}
+	}
+	b.Logf("Not=%d", n)
+}
+
+func BenchmarkFilterFunction(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("li")
+	f := func(i int, s *Selection) bool {
+		return len(s.Get(0).Attr) > 0
+	}
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.FilterFunction(f).Length()
+		} else {
+			sel.FilterFunction(f)
+		}
+	}
+	b.Logf("FilterFunction=%d", n)
+}
+
+func BenchmarkNotFunction(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("li")
+	f := func(i int, s *Selection) bool {
+		return len(s.Get(0).Attr) > 0
+	}
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.NotFunction(f).Length()
+		} else {
+			sel.NotFunction(f)
+		}
+	}
+	b.Logf("NotFunction=%d", n)
+}
+
+func BenchmarkFilterNodes(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("li")
+	sel2 := DocW().Find(".toclevel-2")
+	nodes := sel2.Nodes
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.FilterNodes(nodes...).Length()
+		} else {
+			sel.FilterNodes(nodes...)
+		}
+	}
+	b.Logf("FilterNodes=%d", n)
+}
+
+func BenchmarkNotNodes(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("li")
+	sel2 := DocW().Find(".toclevel-1")
+	nodes := sel2.Nodes
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.NotNodes(nodes...).Length()
+		} else {
+			sel.NotNodes(nodes...)
+		}
+	}
+	b.Logf("NotNodes=%d", n)
+}
+
+func BenchmarkFilterSelection(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("li")
+	sel2 := DocW().Find(".toclevel-2")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.FilterSelection(sel2).Length()
+		} else {
+			sel.FilterSelection(sel2)
+		}
+	}
+	b.Logf("FilterSelection=%d", n)
+}
+
+func BenchmarkNotSelection(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("li")
+	sel2 := DocW().Find(".toclevel-1")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.NotSelection(sel2).Length()
+		} else {
+			sel.NotSelection(sel2)
+		}
+	}
+	b.Logf("NotSelection=%d", n)
+}
+
+func BenchmarkHas(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("h2")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.Has(".editsection").Length()
+		} else {
+			sel.Has(".editsection")
+		}
+	}
+	b.Logf("Has=%d", n)
+}
+
+func BenchmarkHasNodes(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("li")
+	sel2 := DocW().Find(".tocnumber")
+	nodes := sel2.Nodes
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.HasNodes(nodes...).Length()
+		} else {
+			sel.HasNodes(nodes...)
+		}
+	}
+	b.Logf("HasNodes=%d", n)
+}
+
+func BenchmarkHasSelection(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("li")
+	sel2 := DocW().Find(".tocnumber")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.HasSelection(sel2).Length()
+		} else {
+			sel.HasSelection(sel2)
+		}
+	}
+	b.Logf("HasSelection=%d", n)
+}
+
+func BenchmarkEnd(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("li").Has(".tocnumber")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.End().Length()
+		} else {
+			sel.End()
+		}
+	}
+	b.Logf("End=%d", n)
+}
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench_iteration_test.go b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench_iteration_test.go
new file mode 100644
index 00000000..f1b55308
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench_iteration_test.go
@@ -0,0 +1,62 @@
+package goquery
+
+import (
+	"testing"
+)
+
+func BenchmarkEach(b *testing.B) {
+	var tmp, n int
+
+	b.StopTimer()
+	sel := DocW().Find("td")
+	f := func(i int, s *Selection) {
+		tmp++
+	}
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		sel.Each(f)
+		if n == 0 {
+			n = tmp
+		}
+	}
+	b.Logf("Each=%d", n)
+}
+
+func BenchmarkMap(b *testing.B) {
+	var tmp, n int
+
+	b.StopTimer()
+	sel := DocW().Find("td")
+	f := func(i int, s *Selection) string {
+		tmp++
+		return string(tmp)
+	}
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		sel.Map(f)
+		if n == 0 {
+			n = tmp
+		}
+	}
+	b.Logf("Map=%d", n)
+}
+
+func BenchmarkEachWithBreak(b *testing.B) {
+	var tmp, n int
+
+	b.StopTimer()
+	sel := DocW().Find("td")
+	f := func(i int, s *Selection) bool {
+		tmp++
+		return tmp < 10
+	}
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		tmp = 0
+		sel.EachWithBreak(f)
+		if n == 0 {
+			n = tmp
+		}
+	}
+	b.Logf("Each=%d", n)
+}
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench_property_test.go b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench_property_test.go
new file mode 100644
index 00000000..0e616036
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench_property_test.go
@@ -0,0 +1,47 @@
+package goquery
+
+import (
+	"testing"
+)
+
+func BenchmarkAttr(b *testing.B) {
+	var s string
+
+	b.StopTimer()
+	sel := DocW().Find("h1")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		s, _ = sel.Attr("id")
+	}
+	b.Logf("Attr=%s", s)
+}
+
+func BenchmarkText(b *testing.B) {
+	b.StopTimer()
+	sel := DocW().Find("h2")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		sel.Text()
+	}
+}
+
+func BenchmarkLength(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("h2")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		n = sel.Length()
+	}
+	b.Logf("Length=%d", n)
+}
+
+func BenchmarkHtml(b *testing.B) {
+	b.StopTimer()
+	sel := DocW().Find("h2")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		sel.Html()
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench_query_test.go b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench_query_test.go
new file mode 100644
index 00000000..3d3a98f8
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench_query_test.go
@@ -0,0 +1,97 @@
+package goquery
+
+import (
+	"testing"
+)
+
+func BenchmarkIs(b *testing.B) {
+	var y bool
+
+	b.StopTimer()
+	sel := DocW().Find("li")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		y = sel.Is(".toclevel-2")
+	}
+	b.Logf("Is=%v", y)
+}
+
+func BenchmarkIsPositional(b *testing.B) {
+	var y bool
+
+	b.StopTimer()
+	sel := DocW().Find("li")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		y = sel.Is("li:nth-child(2)")
+	}
+	b.Logf("IsPositional=%v", y)
+}
+
+func BenchmarkIsFunction(b *testing.B) {
+	var y bool
+
+	b.StopTimer()
+	sel := DocW().Find(".toclevel-1")
+	f := func(i int, s *Selection) bool {
+		return i == 8
+	}
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		y = sel.IsFunction(f)
+	}
+	b.Logf("IsFunction=%v", y)
+}
+
+func BenchmarkIsSelection(b *testing.B) {
+	var y bool
+
+	b.StopTimer()
+	sel := DocW().Find("li")
+	sel2 := DocW().Find(".toclevel-2")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		y = sel.IsSelection(sel2)
+	}
+	b.Logf("IsSelection=%v", y)
+}
+
+func BenchmarkIsNodes(b *testing.B) {
+	var y bool
+
+	b.StopTimer()
+	sel := DocW().Find("li")
+	sel2 := DocW().Find(".toclevel-2")
+	nodes := sel2.Nodes
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		y = sel.IsNodes(nodes...)
+	}
+	b.Logf("IsNodes=%v", y)
+}
+
+func BenchmarkHasClass(b *testing.B) {
+	var y bool
+
+	b.StopTimer()
+	sel := DocW().Find("span")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		y = sel.HasClass("official")
+	}
+	b.Logf("HasClass=%v", y)
+}
+
+func BenchmarkContains(b *testing.B) {
+	var y bool
+
+	b.StopTimer()
+	sel := DocW().Find("span.url")
+	sel2 := DocW().Find("a[rel=\"nofollow\"]")
+	node := sel2.Nodes[0]
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		y = sel.Contains(node)
+	}
+	b.Logf("Contains=%v", y)
+}
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench_traversal_test.go b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench_traversal_test.go
new file mode 100644
index 00000000..43610f6f
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/bench_traversal_test.go
@@ -0,0 +1,716 @@
+package goquery
+
+import (
+	"testing"
+)
+
+func BenchmarkFind(b *testing.B) {
+	var n int
+
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = DocB().Find("dd").Length()
+
+		} else {
+			DocB().Find("dd")
+		}
+	}
+	b.Logf("Find=%d", n)
+}
+
+func BenchmarkFindWithinSelection(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("ul")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.Find("a[class]").Length()
+		} else {
+			sel.Find("a[class]")
+		}
+	}
+	b.Logf("FindWithinSelection=%d", n)
+}
+
+func BenchmarkFindSelection(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("ul")
+	sel2 := DocW().Find("span")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.FindSelection(sel2).Length()
+		} else {
+			sel.FindSelection(sel2)
+		}
+	}
+	b.Logf("FindSelection=%d", n)
+}
+
+func BenchmarkFindNodes(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("ul")
+	sel2 := DocW().Find("span")
+	nodes := sel2.Nodes
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.FindNodes(nodes...).Length()
+		} else {
+			sel.FindNodes(nodes...)
+		}
+	}
+	b.Logf("FindNodes=%d", n)
+}
+
+func BenchmarkContents(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find(".toclevel-1")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.Contents().Length()
+		} else {
+			sel.Contents()
+		}
+	}
+	b.Logf("Contents=%d", n)
+}
+
+func BenchmarkContentsFiltered(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find(".toclevel-1")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.ContentsFiltered("a[href=\"#Examples\"]").Length()
+		} else {
+			sel.ContentsFiltered("a[href=\"#Examples\"]")
+		}
+	}
+	b.Logf("ContentsFiltered=%d", n)
+}
+
+func BenchmarkChildren(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find(".toclevel-2")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.Children().Length()
+		} else {
+			sel.Children()
+		}
+	}
+	b.Logf("Children=%d", n)
+}
+
+func BenchmarkChildrenFiltered(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("h3")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.ChildrenFiltered(".editsection").Length()
+		} else {
+			sel.ChildrenFiltered(".editsection")
+		}
+	}
+	b.Logf("ChildrenFiltered=%d", n)
+}
+
+func BenchmarkParent(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("li")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.Parent().Length()
+		} else {
+			sel.Parent()
+		}
+	}
+	b.Logf("Parent=%d", n)
+}
+
+func BenchmarkParentFiltered(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("li")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.ParentFiltered("ul[id]").Length()
+		} else {
+			sel.ParentFiltered("ul[id]")
+		}
+	}
+	b.Logf("ParentFiltered=%d", n)
+}
+
+func BenchmarkParents(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("th a")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.Parents().Length()
+		} else {
+			sel.Parents()
+		}
+	}
+	b.Logf("Parents=%d", n)
+}
+
+func BenchmarkParentsFiltered(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("th a")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.ParentsFiltered("tr").Length()
+		} else {
+			sel.ParentsFiltered("tr")
+		}
+	}
+	b.Logf("ParentsFiltered=%d", n)
+}
+
+func BenchmarkParentsUntil(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("th a")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.ParentsUntil("table").Length()
+		} else {
+			sel.ParentsUntil("table")
+		}
+	}
+	b.Logf("ParentsUntil=%d", n)
+}
+
+func BenchmarkParentsUntilSelection(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("th a")
+	sel2 := DocW().Find("#content")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.ParentsUntilSelection(sel2).Length()
+		} else {
+			sel.ParentsUntilSelection(sel2)
+		}
+	}
+	b.Logf("ParentsUntilSelection=%d", n)
+}
+
+func BenchmarkParentsUntilNodes(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("th a")
+	sel2 := DocW().Find("#content")
+	nodes := sel2.Nodes
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.ParentsUntilNodes(nodes...).Length()
+		} else {
+			sel.ParentsUntilNodes(nodes...)
+		}
+	}
+	b.Logf("ParentsUntilNodes=%d", n)
+}
+
+func BenchmarkParentsFilteredUntil(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find(".toclevel-1 a")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.ParentsFilteredUntil(":nth-child(1)", "ul").Length()
+		} else {
+			sel.ParentsFilteredUntil(":nth-child(1)", "ul")
+		}
+	}
+	b.Logf("ParentsFilteredUntil=%d", n)
+}
+
+func BenchmarkParentsFilteredUntilSelection(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find(".toclevel-1 a")
+	sel2 := DocW().Find("ul")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.ParentsFilteredUntilSelection(":nth-child(1)", sel2).Length()
+		} else {
+			sel.ParentsFilteredUntilSelection(":nth-child(1)", sel2)
+		}
+	}
+	b.Logf("ParentsFilteredUntilSelection=%d", n)
+}
+
+func BenchmarkParentsFilteredUntilNodes(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find(".toclevel-1 a")
+	sel2 := DocW().Find("ul")
+	nodes := sel2.Nodes
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.ParentsFilteredUntilNodes(":nth-child(1)", nodes...).Length()
+		} else {
+			sel.ParentsFilteredUntilNodes(":nth-child(1)", nodes...)
+		}
+	}
+	b.Logf("ParentsFilteredUntilNodes=%d", n)
+}
+
+func BenchmarkSiblings(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("ul li:nth-child(1)")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.Siblings().Length()
+		} else {
+			sel.Siblings()
+		}
+	}
+	b.Logf("Siblings=%d", n)
+}
+
+func BenchmarkSiblingsFiltered(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("ul li:nth-child(1)")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.SiblingsFiltered("[class]").Length()
+		} else {
+			sel.SiblingsFiltered("[class]")
+		}
+	}
+	b.Logf("SiblingsFiltered=%d", n)
+}
+
+func BenchmarkNext(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("li:nth-child(1)")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.Next().Length()
+		} else {
+			sel.Next()
+		}
+	}
+	b.Logf("Next=%d", n)
+}
+
+func BenchmarkNextFiltered(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("li:nth-child(1)")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.NextFiltered("[class]").Length()
+		} else {
+			sel.NextFiltered("[class]")
+		}
+	}
+	b.Logf("NextFiltered=%d", n)
+}
+
+func BenchmarkNextAll(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("li:nth-child(3)")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.NextAll().Length()
+		} else {
+			sel.NextAll()
+		}
+	}
+	b.Logf("NextAll=%d", n)
+}
+
+func BenchmarkNextAllFiltered(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("li:nth-child(3)")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.NextAllFiltered("[class]").Length()
+		} else {
+			sel.NextAllFiltered("[class]")
+		}
+	}
+	b.Logf("NextAllFiltered=%d", n)
+}
+
+func BenchmarkPrev(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("li:last-child")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.Prev().Length()
+		} else {
+			sel.Prev()
+		}
+	}
+	b.Logf("Prev=%d", n)
+}
+
+func BenchmarkPrevFiltered(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("li:last-child")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.PrevFiltered("[class]").Length()
+		} else {
+			sel.PrevFiltered("[class]")
+		}
+	}
+	// There is one more Prev li with a class, compared to Next li with a class
+	// (confirmed by looking at the HTML, this is ok)
+	b.Logf("PrevFiltered=%d", n)
+}
+
+func BenchmarkPrevAll(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("li:nth-child(4)")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.PrevAll().Length()
+		} else {
+			sel.PrevAll()
+		}
+	}
+	b.Logf("PrevAll=%d", n)
+}
+
+func BenchmarkPrevAllFiltered(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("li:nth-child(4)")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.PrevAllFiltered("[class]").Length()
+		} else {
+			sel.PrevAllFiltered("[class]")
+		}
+	}
+	b.Logf("PrevAllFiltered=%d", n)
+}
+
+func BenchmarkNextUntil(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("li:first-child")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.NextUntil(":nth-child(4)").Length()
+		} else {
+			sel.NextUntil(":nth-child(4)")
+		}
+	}
+	b.Logf("NextUntil=%d", n)
+}
+
+func BenchmarkNextUntilSelection(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("h2")
+	sel2 := DocW().Find("ul")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.NextUntilSelection(sel2).Length()
+		} else {
+			sel.NextUntilSelection(sel2)
+		}
+	}
+	b.Logf("NextUntilSelection=%d", n)
+}
+
+func BenchmarkNextUntilNodes(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("h2")
+	sel2 := DocW().Find("p")
+	nodes := sel2.Nodes
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.NextUntilNodes(nodes...).Length()
+		} else {
+			sel.NextUntilNodes(nodes...)
+		}
+	}
+	b.Logf("NextUntilNodes=%d", n)
+}
+
+func BenchmarkPrevUntil(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("li:last-child")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.PrevUntil(":nth-child(4)").Length()
+		} else {
+			sel.PrevUntil(":nth-child(4)")
+		}
+	}
+	b.Logf("PrevUntil=%d", n)
+}
+
+func BenchmarkPrevUntilSelection(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("h2")
+	sel2 := DocW().Find("ul")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.PrevUntilSelection(sel2).Length()
+		} else {
+			sel.PrevUntilSelection(sel2)
+		}
+	}
+	b.Logf("PrevUntilSelection=%d", n)
+}
+
+func BenchmarkPrevUntilNodes(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("h2")
+	sel2 := DocW().Find("p")
+	nodes := sel2.Nodes
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.PrevUntilNodes(nodes...).Length()
+		} else {
+			sel.PrevUntilNodes(nodes...)
+		}
+	}
+	b.Logf("PrevUntilNodes=%d", n)
+}
+
+func BenchmarkNextFilteredUntil(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("h2")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.NextFilteredUntil("p", "div").Length()
+		} else {
+			sel.NextFilteredUntil("p", "div")
+		}
+	}
+	b.Logf("NextFilteredUntil=%d", n)
+}
+
+func BenchmarkNextFilteredUntilSelection(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("h2")
+	sel2 := DocW().Find("div")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.NextFilteredUntilSelection("p", sel2).Length()
+		} else {
+			sel.NextFilteredUntilSelection("p", sel2)
+		}
+	}
+	b.Logf("NextFilteredUntilSelection=%d", n)
+}
+
+func BenchmarkNextFilteredUntilNodes(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("h2")
+	sel2 := DocW().Find("div")
+	nodes := sel2.Nodes
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.NextFilteredUntilNodes("p", nodes...).Length()
+		} else {
+			sel.NextFilteredUntilNodes("p", nodes...)
+		}
+	}
+	b.Logf("NextFilteredUntilNodes=%d", n)
+}
+
+func BenchmarkPrevFilteredUntil(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("h2")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.PrevFilteredUntil("p", "div").Length()
+		} else {
+			sel.PrevFilteredUntil("p", "div")
+		}
+	}
+	b.Logf("PrevFilteredUntil=%d", n)
+}
+
+func BenchmarkPrevFilteredUntilSelection(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("h2")
+	sel2 := DocW().Find("div")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.PrevFilteredUntilSelection("p", sel2).Length()
+		} else {
+			sel.PrevFilteredUntilSelection("p", sel2)
+		}
+	}
+	b.Logf("PrevFilteredUntilSelection=%d", n)
+}
+
+func BenchmarkPrevFilteredUntilNodes(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := DocW().Find("h2")
+	sel2 := DocW().Find("div")
+	nodes := sel2.Nodes
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.PrevFilteredUntilNodes("p", nodes...).Length()
+		} else {
+			sel.PrevFilteredUntilNodes("p", nodes...)
+		}
+	}
+	b.Logf("PrevFilteredUntilNodes=%d", n)
+}
+
+func BenchmarkClosest(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := Doc().Find(".container-fluid")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.Closest(".pvk-content").Length()
+		} else {
+			sel.Closest(".pvk-content")
+		}
+	}
+	b.Logf("Closest=%d", n)
+}
+
+func BenchmarkClosestSelection(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := Doc().Find(".container-fluid")
+	sel2 := Doc().Find(".pvk-content")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.ClosestSelection(sel2).Length()
+		} else {
+			sel.ClosestSelection(sel2)
+		}
+	}
+	b.Logf("ClosestSelection=%d", n)
+}
+
+func BenchmarkClosestNodes(b *testing.B) {
+	var n int
+
+	b.StopTimer()
+	sel := Doc().Find(".container-fluid")
+	nodes := Doc().Find(".pvk-content").Nodes
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if n == 0 {
+			n = sel.ClosestNodes(nodes...).Length()
+		} else {
+			sel.ClosestNodes(nodes...)
+		}
+	}
+	b.Logf("ClosestNodes=%d", n)
+}
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/doc.go b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/doc.go
new file mode 100644
index 00000000..4d167ddb
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/doc.go
@@ -0,0 +1,118 @@
+// Copyright (c) 2012-2014, Martin Angers & Contributors
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+// this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation and/or
+// other materials provided with the distribution.
+// * Neither the name of the author nor the names of its contributors may be used to
+// endorse or promote products derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+// WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+/*
+Package goquery implements features similar to jQuery, including the chainable
+syntax, to manipulate and query an HTML document.
+
+It brings a syntax and a set of features similar to jQuery to the Go language.
+It is based on Go's net/html package and the CSS Selector library cascadia.
+Since the net/html parser returns nodes, and not a full-featured DOM
+tree, jQuery's stateful manipulation functions (like height(), css(), detach())
+have been left off.
+
+Also, because the net/html parser requires UTF-8 encoding, so does goquery: it is
+the caller's responsibility to ensure that the source document provides UTF-8 encoded HTML.
+See the repository's wiki for various options on how to do this.
+
+Syntax-wise, it is as close as possible to jQuery, with the same function names when
+possible, and that warm and fuzzy chainable interface. jQuery being the
+ultra-popular library that it is, writing a similar HTML-manipulating
+library was better to follow its API than to start anew (in the same spirit as
+Go's fmt package), even though some of its methods are less than intuitive (looking
+at you, index()...).
+
+It is hosted on GitHub, along with additional documentation in the README.md
+file: https://github.com/puerkitobio/goquery
+
+Please note that because of the net/html dependency, goquery requires Go1.1+.
+
+The various methods are split into files based on the category of behavior.
+The three dots (...) indicate that various "overloads" are available.
+
+* array.go : array-like positional manipulation of the selection.
+    - Eq()
+    - First()
+    - Get()
+    - Index...()
+    - Last()
+    - Slice()
+
+* expand.go : methods that expand or augment the selection's set.
+    - Add...()
+    - AndSelf()
+    - Union(), which is an alias for AddSelection()
+
+* filter.go : filtering methods, that reduce the selection's set.
+    - End()
+    - Filter...()
+    - Has...()
+    - Intersection(), which is an alias of FilterSelection()
+    - Not...()
+
+* iteration.go : methods to loop over the selection's nodes.
+    - Each()
+    - EachWithBreak()
+    - Map()
+
+* manipulation.go : methods for modifying the document
+    - After...()
+    - Append...()
+    - Before...()
+    - Clone()
+    - Empty()
+    - Prepend...()
+    - Remove...()
+    - ReplaceWith...()
+    - Unwrap()
+    - Wrap...()
+    - WrapAll...()
+    - WrapInner...()
+
+* property.go : methods that inspect and get the node's properties values.
+    - Attr*(), RemoveAttr(), SetAttr()
+    - AddClass(), HasClass(), RemoveClass(), ToggleClass()
+    - Html()
+    - Length()
+    - Size(), which is an alias for Length()
+    - Text()
+
+* query.go : methods that query, or reflect, a node's identity.
+    - Contains()
+    - Is...()
+
+* traversal.go : methods to traverse the HTML document tree.
+    - Children...()
+    - Contents()
+    - Find...()
+    - Next...()
+    - Parent[s]...()
+    - Prev...()
+    - Siblings...()
+
+* type.go : definition of the types exposed by goquery.
+    - Document
+    - Selection
+    - Matcher
+*/
+package goquery
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/doc/tips.md b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/doc/tips.md
new file mode 100644
index 00000000..ec3979a9
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/doc/tips.md
@@ -0,0 +1,68 @@
+# Tips and tricks
+
+## Handle Non-UTF8 html Pages
+
+The `go.net/html` package used by `goquery` requires that the html document is UTF-8 encoded. When you know the encoding of the html page is not UTF-8, you can use the `iconv` package to convert it to UTF-8 (there are various implementation of the `iconv` API, see [godoc.org][iconv] for other options):
+
+```
+$ go get -u github.com/djimenez/iconv-go
+```
+
+and then:
+
+```
+// Load the URL
+res, err := http.Get(url)
+if e != nil {
+    // handle error
+}
+defer res.Body.Close()
+
+// Convert the designated charset HTML to utf-8 encoded HTML.
+// `charset` being one of the charsets known by the iconv package.
+utfBody, err := iconv.NewReader(res.Body, charset, "utf-8")
+if err != nil {
+    // handler error
+}
+
+// use utfBody using goquery
+doc, err := goquery.NewDocumentFromReader(utfBody)
+if err != nil {
+    // handler error
+}
+// use doc...
+```
+
+Thanks to github user @YuheiNakasaka.
+
+Actually, the official go.text repository covers this use case too, see its [godoc page][text] for the details.
+
+
+## Handle Javascript-based Pages
+
+`goquery` is great to handle normal html pages, but when most of the page is build dynamically using javascript, there's not much it can do. There are various options when faced with this problem:
+
+* Use a headless browser such as [webloop][].
+* Use a Go javascript parser package, such as [otto][].
+
+You can find a code example using `otto` [in this gist][exotto]. Thanks to github user @cryptix.
+
+## For Loop
+
+If all you need is a normal `for` loop over all nodes in the current selection, where `Map/Each`-style iteration is not necessary, you can use the following:
+
+```
+sel := Doc().Find(".selector")
+for i := range sel.Nodes {
+	single := sel.Eq(i)
+    // use `single` as a selection of 1 node
+}
+```
+
+Thanks to github user @jmoiron.
+
+[webloop]: https://github.com/sourcegraph/webloop
+[otto]: https://github.com/robertkrimen/otto
+[exotto]: https://gist.github.com/cryptix/87127f76a94183747b53
+[iconv]: http://godoc.org/?q=iconv
+[text]: http://godoc.org/code.google.com/p/go.text/encoding
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/example_test.go b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/example_test.go
new file mode 100644
index 00000000..9e8c3c54
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/example_test.go
@@ -0,0 +1,32 @@
+package goquery
+
+import (
+	"fmt"
+	"log"
+
+	// In real use, this import would be required (not in this example, since it
+	// is part of the goquery package)
+	//"github.com/PuerkitoBio/goquery"
+)
+
+// This example scrapes the reviews shown on the home page of metalsucks.net.
+func ExampleScrape_MetalSucks() {
+	// Load the HTML document (in real use, the type would be *goquery.Document)
+	doc, err := NewDocument("http://metalsucks.net")
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	// Find the review items (the type of the Selection would be *goquery.Selection)
+	doc.Find(".reviews-wrap article .review-rhs").Each(func(i int, s *Selection) {
+		// For each item found, get the band and title
+		band := s.Find("h3").Text()
+		title := s.Find("i").Text()
+		fmt.Printf("Review %d: %s - %s\n", i, band, title)
+	})
+	// To see the output of the Example while running the test suite (go test), simply
+	// remove the leading "x" before Output on the next line. This will cause the
+	// example to fail (all the "real" tests should pass).
+
+	// xOutput: voluntarily fail the Example output.
+}
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/expand.go b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/expand.go
new file mode 100644
index 00000000..c3cadfff
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/expand.go
@@ -0,0 +1,49 @@
+package goquery
+
+import (
+	"github.com/andybalholm/cascadia"
+	"golang.org/x/net/html"
+)
+
+// Add adds the selector string's matching nodes to those in the current
+// selection and returns a new Selection object.
+// The selector string is run in the context of the document of the current
+// Selection object.
+func (s *Selection) Add(selector string) *Selection {
+	return s.AddNodes(findWithMatcher([]*html.Node{s.document.rootNode}, cascadia.MustCompile(selector))...)
+}
+
+// AddMatcher adds the matcher's matching nodes to those in the current
+// selection and returns a new Selection object.
+// The matcher is run in the context of the document of the current
+// Selection object.
+func (s *Selection) AddMatcher(m Matcher) *Selection {
+	return s.AddNodes(findWithMatcher([]*html.Node{s.document.rootNode}, m)...)
+}
+
+// AddSelection adds the specified Selection object's nodes to those in the
+// current selection and returns a new Selection object.
+func (s *Selection) AddSelection(sel *Selection) *Selection {
+	if sel == nil {
+		return s.AddNodes()
+	}
+	return s.AddNodes(sel.Nodes...)
+}
+
+// Union is an alias for AddSelection.
+func (s *Selection) Union(sel *Selection) *Selection {
+	return s.AddSelection(sel)
+}
+
+// AddNodes adds the specified nodes to those in the
+// current selection and returns a new Selection object.
+func (s *Selection) AddNodes(nodes ...*html.Node) *Selection {
+	return pushStack(s, appendWithoutDuplicates(s.Nodes, nodes))
+}
+
+// AndSelf adds the previous set of elements on the stack to the current set.
+// It returns a new Selection object containing the current Selection combined
+// with the previous one.
+func (s *Selection) AndSelf() *Selection {
+	return s.AddSelection(s.prevSel)
+}
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/expand_test.go b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/expand_test.go
new file mode 100644
index 00000000..cff69968
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/expand_test.go
@@ -0,0 +1,68 @@
+package goquery
+
+import (
+	"testing"
+)
+
+func TestAdd(t *testing.T) {
+	sel := Doc().Find("div.row-fluid").Add("a")
+	assertLength(t, sel.Nodes, 19)
+}
+
+func TestAddRollback(t *testing.T) {
+	sel := Doc().Find(".pvk-content")
+	sel2 := sel.Add("a").End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestAddSelection(t *testing.T) {
+	sel := Doc().Find("div.row-fluid")
+	sel2 := Doc().Find("a")
+	sel = sel.AddSelection(sel2)
+	assertLength(t, sel.Nodes, 19)
+}
+
+func TestAddSelectionNil(t *testing.T) {
+	sel := Doc().Find("div.row-fluid")
+	assertLength(t, sel.Nodes, 9)
+
+	sel = sel.AddSelection(nil)
+	assertLength(t, sel.Nodes, 9)
+}
+
+func TestAddSelectionRollback(t *testing.T) {
+	sel := Doc().Find(".pvk-content")
+	sel2 := sel.Find("a")
+	sel2 = sel.AddSelection(sel2).End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestAddNodes(t *testing.T) {
+	sel := Doc().Find("div.pvk-gutter")
+	sel2 := Doc().Find(".pvk-content")
+	sel = sel.AddNodes(sel2.Nodes...)
+	assertLength(t, sel.Nodes, 9)
+}
+
+func TestAddNodesNone(t *testing.T) {
+	sel := Doc().Find("div.pvk-gutter").AddNodes()
+	assertLength(t, sel.Nodes, 6)
+}
+
+func TestAddNodesRollback(t *testing.T) {
+	sel := Doc().Find(".pvk-content")
+	sel2 := sel.Find("a")
+	sel2 = sel.AddNodes(sel2.Nodes...).End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestAndSelf(t *testing.T) {
+	sel := Doc().Find(".span12").Last().AndSelf()
+	assertLength(t, sel.Nodes, 2)
+}
+
+func TestAndSelfRollback(t *testing.T) {
+	sel := Doc().Find(".pvk-content")
+	sel2 := sel.Find("a").AndSelf().End().End()
+	assertEqual(t, sel, sel2)
+}
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/filter.go b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/filter.go
new file mode 100644
index 00000000..f7e0704c
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/filter.go
@@ -0,0 +1,156 @@
+package goquery
+
+import (
+	"github.com/andybalholm/cascadia"
+	"golang.org/x/net/html"
+)
+
+// Filter reduces the set of matched elements to those that match the selector string.
+// It returns a new Selection object for this subset of matching elements.
+func (s *Selection) Filter(selector string) *Selection {
+	return s.FilterMatcher(cascadia.MustCompile(selector))
+}
+
+// FilterMatcher reduces the set of matched elements to those that match
+// the given matcher.
+// It returns a new Selection object for this subset of matching elements.
+func (s *Selection) FilterMatcher(m Matcher) *Selection {
+	return pushStack(s, winnow(s, m, true))
+}
+
+// Not removes elements from the Selection that match the selector string.
+// It returns a new Selection object with the matching elements removed.
+func (s *Selection) Not(selector string) *Selection {
+	return s.NotMatcher(cascadia.MustCompile(selector))
+}
+
+// NotMatcher removes elements from the Selection that match the given matcher.
+// It returns a new Selection object with the matching elements removed.
+func (s *Selection) NotMatcher(m Matcher) *Selection {
+	return pushStack(s, winnow(s, m, false))
+}
+
+// FilterFunction reduces the set of matched elements to those that pass the function's test.
+// It returns a new Selection object for this subset of elements.
+func (s *Selection) FilterFunction(f func(int, *Selection) bool) *Selection {
+	return pushStack(s, winnowFunction(s, f, true))
+}
+
+// NotFunction removes elements from the Selection that pass the function's test.
+// It returns a new Selection object with the matching elements removed.
+func (s *Selection) NotFunction(f func(int, *Selection) bool) *Selection {
+	return pushStack(s, winnowFunction(s, f, false))
+}
+
+// FilterNodes reduces the set of matched elements to those that match the specified nodes.
+// It returns a new Selection object for this subset of elements.
+func (s *Selection) FilterNodes(nodes ...*html.Node) *Selection {
+	return pushStack(s, winnowNodes(s, nodes, true))
+}
+
+// NotNodes removes elements from the Selection that match the specified nodes.
+// It returns a new Selection object with the matching elements removed.
+func (s *Selection) NotNodes(nodes ...*html.Node) *Selection {
+	return pushStack(s, winnowNodes(s, nodes, false))
+}
+
+// FilterSelection reduces the set of matched elements to those that match a
+// node in the specified Selection object.
+// It returns a new Selection object for this subset of elements.
+func (s *Selection) FilterSelection(sel *Selection) *Selection {
+	if sel == nil {
+		return pushStack(s, winnowNodes(s, nil, true))
+	}
+	return pushStack(s, winnowNodes(s, sel.Nodes, true))
+}
+
+// NotSelection removes elements from the Selection that match a node in the specified
+// Selection object. It returns a new Selection object with the matching elements removed.
+func (s *Selection) NotSelection(sel *Selection) *Selection {
+	if sel == nil {
+		return pushStack(s, winnowNodes(s, nil, false))
+	}
+	return pushStack(s, winnowNodes(s, sel.Nodes, false))
+}
+
+// Intersection is an alias for FilterSelection.
+func (s *Selection) Intersection(sel *Selection) *Selection {
+	return s.FilterSelection(sel)
+}
+
+// Has reduces the set of matched elements to those that have a descendant
+// that matches the selector.
+// It returns a new Selection object with the matching elements.
+func (s *Selection) Has(selector string) *Selection {
+	return s.HasSelection(s.document.Find(selector))
+}
+
+// HasMatcher reduces the set of matched elements to those that have a descendant
+// that matches the matcher.
+// It returns a new Selection object with the matching elements.
+func (s *Selection) HasMatcher(m Matcher) *Selection {
+	return s.HasSelection(s.document.FindMatcher(m))
+}
+
+// HasNodes reduces the set of matched elements to those that have a
+// descendant that matches one of the nodes.
+// It returns a new Selection object with the matching elements.
+func (s *Selection) HasNodes(nodes ...*html.Node) *Selection {
+	return s.FilterFunction(func(_ int, sel *Selection) bool {
+		// Add all nodes that contain one of the specified nodes
+		for _, n := range nodes {
+			if sel.Contains(n) {
+				return true
+			}
+		}
+		return false
+	})
+}
+
+// HasSelection reduces the set of matched elements to those that have a
+// descendant that matches one of the nodes of the specified Selection object.
+// It returns a new Selection object with the matching elements.
+func (s *Selection) HasSelection(sel *Selection) *Selection {
+	if sel == nil {
+		return s.HasNodes()
+	}
+	return s.HasNodes(sel.Nodes...)
+}
+
+// End ends the most recent filtering operation in the current chain and
+// returns the set of matched elements to its previous state.
+func (s *Selection) End() *Selection {
+	if s.prevSel != nil {
+		return s.prevSel
+	}
+	return newEmptySelection(s.document)
+}
+
+// Filter based on the matcher, and the indicator to keep (Filter) or
+// to get rid of (Not) the matching elements.
+func winnow(sel *Selection, m Matcher, keep bool) []*html.Node {
+	// Optimize if keep is requested
+	if keep {
+		return m.Filter(sel.Nodes)
+	}
+	// Use grep
+	return grep(sel, func(i int, s *Selection) bool {
+		return !m.Match(s.Get(0))
+	})
+}
+
+// Filter based on an array of nodes, and the indicator to keep (Filter) or
+// to get rid of (Not) the matching elements.
+func winnowNodes(sel *Selection, nodes []*html.Node, keep bool) []*html.Node {
+	return grep(sel, func(i int, s *Selection) bool {
+		return isInSlice(nodes, s.Get(0)) == keep
+	})
+}
+
+// Filter based on a function test, and the indicator to keep (Filter) or
+// to get rid of (Not) the matching elements.
+func winnowFunction(sel *Selection, f func(int, *Selection) bool, keep bool) []*html.Node {
+	return grep(sel, func(i int, s *Selection) bool {
+		return f(i, s) == keep
+	})
+}
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/filter_test.go b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/filter_test.go
new file mode 100644
index 00000000..d5978b5c
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/filter_test.go
@@ -0,0 +1,191 @@
+package goquery
+
+import (
+	"testing"
+)
+
+func TestFilter(t *testing.T) {
+	sel := Doc().Find(".span12").Filter(".alert")
+	assertLength(t, sel.Nodes, 1)
+}
+
+func TestFilterNone(t *testing.T) {
+	sel := Doc().Find(".span12").Filter(".zzalert")
+	assertLength(t, sel.Nodes, 0)
+}
+
+func TestFilterRollback(t *testing.T) {
+	sel := Doc().Find(".pvk-content")
+	sel2 := sel.Filter(".alert").End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestFilterFunction(t *testing.T) {
+	sel := Doc().Find(".pvk-content").FilterFunction(func(i int, s *Selection) bool {
+		return i > 0
+	})
+	assertLength(t, sel.Nodes, 2)
+}
+
+func TestFilterFunctionRollback(t *testing.T) {
+	sel := Doc().Find(".pvk-content")
+	sel2 := sel.FilterFunction(func(i int, s *Selection) bool {
+		return i > 0
+	}).End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestFilterNode(t *testing.T) {
+	sel := Doc().Find(".pvk-content")
+	sel2 := sel.FilterNodes(sel.Nodes[2])
+	assertLength(t, sel2.Nodes, 1)
+}
+
+func TestFilterNodeRollback(t *testing.T) {
+	sel := Doc().Find(".pvk-content")
+	sel2 := sel.FilterNodes(sel.Nodes[2]).End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestFilterSelection(t *testing.T) {
+	sel := Doc().Find(".link")
+	sel2 := Doc().Find("a[ng-click]")
+	sel3 := sel.FilterSelection(sel2)
+	assertLength(t, sel3.Nodes, 1)
+}
+
+func TestFilterSelectionRollback(t *testing.T) {
+	sel := Doc().Find(".link")
+	sel2 := Doc().Find("a[ng-click]")
+	sel2 = sel.FilterSelection(sel2).End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestFilterSelectionNil(t *testing.T) {
+	var sel2 *Selection
+
+	sel := Doc().Find(".link")
+	sel3 := sel.FilterSelection(sel2)
+	assertLength(t, sel3.Nodes, 0)
+}
+
+func TestNot(t *testing.T) {
+	sel := Doc().Find(".span12").Not(".alert")
+	assertLength(t, sel.Nodes, 1)
+}
+
+func TestNotRollback(t *testing.T) {
+	sel := Doc().Find(".span12")
+	sel2 := sel.Not(".alert").End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestNotNone(t *testing.T) {
+	sel := Doc().Find(".span12").Not(".zzalert")
+	assertLength(t, sel.Nodes, 2)
+}
+
+func TestNotFunction(t *testing.T) {
+	sel := Doc().Find(".pvk-content").NotFunction(func(i int, s *Selection) bool {
+		return i > 0
+	})
+	assertLength(t, sel.Nodes, 1)
+}
+
+func TestNotFunctionRollback(t *testing.T) {
+	sel := Doc().Find(".pvk-content")
+	sel2 := sel.NotFunction(func(i int, s *Selection) bool {
+		return i > 0
+	}).End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestNotNode(t *testing.T) {
+	sel := Doc().Find(".pvk-content")
+	sel2 := sel.NotNodes(sel.Nodes[2])
+	assertLength(t, sel2.Nodes, 2)
+}
+
+func TestNotNodeRollback(t *testing.T) {
+	sel := Doc().Find(".pvk-content")
+	sel2 := sel.NotNodes(sel.Nodes[2]).End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestNotSelection(t *testing.T) {
+	sel := Doc().Find(".link")
+	sel2 := Doc().Find("a[ng-click]")
+	sel3 := sel.NotSelection(sel2)
+	assertLength(t, sel3.Nodes, 6)
+}
+
+func TestNotSelectionRollback(t *testing.T) {
+	sel := Doc().Find(".link")
+	sel2 := Doc().Find("a[ng-click]")
+	sel2 = sel.NotSelection(sel2).End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestIntersection(t *testing.T) {
+	sel := Doc().Find(".pvk-gutter")
+	sel2 := Doc().Find("div").Intersection(sel)
+	assertLength(t, sel2.Nodes, 6)
+}
+
+func TestIntersectionRollback(t *testing.T) {
+	sel := Doc().Find(".pvk-gutter")
+	sel2 := Doc().Find("div")
+	sel2 = sel.Intersection(sel2).End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestHas(t *testing.T) {
+	sel := Doc().Find(".container-fluid").Has(".center-content")
+	assertLength(t, sel.Nodes, 2)
+	// Has() returns the high-level .container-fluid div, and the one that is the immediate parent of center-content
+}
+
+func TestHasRollback(t *testing.T) {
+	sel := Doc().Find(".container-fluid")
+	sel2 := sel.Has(".center-content").End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestHasNodes(t *testing.T) {
+	sel := Doc().Find(".container-fluid")
+	sel2 := Doc().Find(".center-content")
+	sel = sel.HasNodes(sel2.Nodes...)
+	assertLength(t, sel.Nodes, 2)
+	// Has() returns the high-level .container-fluid div, and the one that is the immediate parent of center-content
+}
+
+func TestHasNodesRollback(t *testing.T) {
+	sel := Doc().Find(".container-fluid")
+	sel2 := Doc().Find(".center-content")
+	sel2 = sel.HasNodes(sel2.Nodes...).End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestHasSelection(t *testing.T) {
+	sel := Doc().Find("p")
+	sel2 := Doc().Find("small")
+	sel = sel.HasSelection(sel2)
+	assertLength(t, sel.Nodes, 1)
+}
+
+func TestHasSelectionRollback(t *testing.T) {
+	sel := Doc().Find("p")
+	sel2 := Doc().Find("small")
+	sel2 = sel.HasSelection(sel2).End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestEnd(t *testing.T) {
+	sel := Doc().Find("p").Has("small").End()
+	assertLength(t, sel.Nodes, 4)
+}
+
+func TestEndToTop(t *testing.T) {
+	sel := Doc().Find("p").Has("small").End().End().End()
+	assertLength(t, sel.Nodes, 0)
+}
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/iteration.go b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/iteration.go
new file mode 100644
index 00000000..6b680186
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/iteration.go
@@ -0,0 +1,33 @@
+package goquery
+
+// Each iterates over a Selection object, executing a function for each
+// matched element. It returns the current Selection object.
+func (s *Selection) Each(f func(int, *Selection)) *Selection {
+	for i, n := range s.Nodes {
+		f(i, newSingleSelection(n, s.document))
+	}
+	return s
+}
+
+// EachWithBreak iterates over a Selection object, executing a function for each
+// matched element. It is identical to Each except that it is possible to break
+// out of the loop by returning false in the callback function. It returns the
+// current Selection object.
+func (s *Selection) EachWithBreak(f func(int, *Selection) bool) *Selection {
+	for i, n := range s.Nodes {
+		if !f(i, newSingleSelection(n, s.document)) {
+			return s
+		}
+	}
+	return s
+}
+
+// Map passes each element in the current matched set through a function,
+// producing a slice of string holding the returned values.
+func (s *Selection) Map(f func(int, *Selection) string) (result []string) {
+	for i, n := range s.Nodes {
+		result = append(result, f(i, newSingleSelection(n, s.document)))
+	}
+
+	return result
+}
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/iteration_test.go b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/iteration_test.go
new file mode 100644
index 00000000..9b6aafb7
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/iteration_test.go
@@ -0,0 +1,88 @@
+package goquery
+
+import (
+	"testing"
+
+	"golang.org/x/net/html"
+)
+
+func TestEach(t *testing.T) {
+	var cnt int
+
+	sel := Doc().Find(".hero-unit .row-fluid").Each(func(i int, n *Selection) {
+		cnt++
+		t.Logf("At index %v, node %v", i, n.Nodes[0].Data)
+	}).Find("a")
+
+	if cnt != 4 {
+		t.Errorf("Expected Each() to call function 4 times, got %v times.", cnt)
+	}
+	assertLength(t, sel.Nodes, 6)
+}
+
+func TestEachWithBreak(t *testing.T) {
+	var cnt int
+
+	sel := Doc().Find(".hero-unit .row-fluid").EachWithBreak(func(i int, n *Selection) bool {
+		cnt++
+		t.Logf("At index %v, node %v", i, n.Nodes[0].Data)
+		return false
+	}).Find("a")
+
+	if cnt != 1 {
+		t.Errorf("Expected Each() to call function 1 time, got %v times.", cnt)
+	}
+	assertLength(t, sel.Nodes, 6)
+}
+
+func TestEachEmptySelection(t *testing.T) {
+	var cnt int
+
+	sel := Doc().Find("zzzz")
+	sel.Each(func(i int, n *Selection) {
+		cnt++
+	})
+	if cnt > 0 {
+		t.Error("Expected Each() to not be called on empty Selection.")
+	}
+	sel2 := sel.Find("div")
+	assertLength(t, sel2.Nodes, 0)
+}
+
+func TestMap(t *testing.T) {
+	sel := Doc().Find(".pvk-content")
+	vals := sel.Map(func(i int, s *Selection) string {
+		n := s.Get(0)
+		if n.Type == html.ElementNode {
+			return n.Data
+		}
+		return ""
+	})
+	for _, v := range vals {
+		if v != "div" {
+			t.Error("Expected Map array result to be all 'div's.")
+		}
+	}
+	if len(vals) != 3 {
+		t.Errorf("Expected Map array result to have a length of 3, found %v.", len(vals))
+	}
+}
+
+func TestForRange(t *testing.T) {
+	sel := Doc().Find(".pvk-content")
+	initLen := sel.Length()
+	for i := range sel.Nodes {
+		single := sel.Eq(i)
+		//h, err := single.Html()
+		//if err != nil {
+		//	t.Fatal(err)
+		//}
+		//fmt.Println(i, h)
+		if single.Length() != 1 {
+			t.Errorf("%d: expected length of 1, got %d", i, single.Length())
+		}
+	}
+	if sel.Length() != initLen {
+		t.Errorf("expected initial selection to still have length %d, got %d", initLen, sel.Length())
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/manipulation.go b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/manipulation.go
new file mode 100644
index 00000000..9f150f6a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/manipulation.go
@@ -0,0 +1,551 @@
+package goquery
+
+import (
+	"strings"
+
+	"github.com/andybalholm/cascadia"
+	"golang.org/x/net/html"
+)
+
+// After applies the selector from the root document and inserts the matched elements
+// after the elements in the set of matched elements.
+//
+// If one of the matched elements in the selection is not currently in the
+// document, it's impossible to insert nodes after it, so it will be ignored.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) After(selector string) *Selection {
+	return s.AfterMatcher(cascadia.MustCompile(selector))
+}
+
+// AfterMatcher applies the matcher from the root document and inserts the matched elements
+// after the elements in the set of matched elements.
+//
+// If one of the matched elements in the selection is not currently in the
+// document, it's impossible to insert nodes after it, so it will be ignored.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) AfterMatcher(m Matcher) *Selection {
+	return s.AfterNodes(m.MatchAll(s.document.rootNode)...)
+}
+
+// AfterSelection inserts the elements in the selection after each element in the set of matched
+// elements.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) AfterSelection(sel *Selection) *Selection {
+	return s.AfterNodes(sel.Nodes...)
+}
+
+// AfterHtml parses the html and inserts it after the set of matched elements.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) AfterHtml(html string) *Selection {
+	return s.AfterNodes(parseHtml(html)...)
+}
+
+// AfterNodes inserts the nodes after each element in the set of matched elements.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) AfterNodes(ns ...*html.Node) *Selection {
+	return s.manipulateNodes(ns, true, func(sn *html.Node, n *html.Node) {
+		if sn.Parent != nil {
+			sn.Parent.InsertBefore(n, sn.NextSibling)
+		}
+	})
+}
+
+// Append appends the elements specified by the selector to the end of each element
+// in the set of matched elements, following those rules:
+//
+// 1) The selector is applied to the root document.
+//
+// 2) Elements that are part of the document will be moved to the new location.
+//
+// 3) If there are multiple locations to append to, cloned nodes will be
+// appended to all target locations except the last one, which will be moved
+// as noted in (2).
+func (s *Selection) Append(selector string) *Selection {
+	return s.AppendMatcher(cascadia.MustCompile(selector))
+}
+
+// AppendMatcher appends the elements specified by the matcher to the end of each element
+// in the set of matched elements.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) AppendMatcher(m Matcher) *Selection {
+	return s.AppendNodes(m.MatchAll(s.document.rootNode)...)
+}
+
+// AppendSelection appends the elements in the selection to the end of each element
+// in the set of matched elements.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) AppendSelection(sel *Selection) *Selection {
+	return s.AppendNodes(sel.Nodes...)
+}
+
+// AppendHtml parses the html and appends it to the set of matched elements.
+func (s *Selection) AppendHtml(html string) *Selection {
+	return s.AppendNodes(parseHtml(html)...)
+}
+
+// AppendNodes appends the specified nodes to each node in the set of matched elements.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) AppendNodes(ns ...*html.Node) *Selection {
+	return s.manipulateNodes(ns, false, func(sn *html.Node, n *html.Node) {
+		sn.AppendChild(n)
+	})
+}
+
+// Before inserts the matched elements before each element in the set of matched elements.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) Before(selector string) *Selection {
+	return s.BeforeMatcher(cascadia.MustCompile(selector))
+}
+
+// BeforeMatcher inserts the matched elements before each element in the set of matched elements.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) BeforeMatcher(m Matcher) *Selection {
+	return s.BeforeNodes(m.MatchAll(s.document.rootNode)...)
+}
+
+// BeforeSelection inserts the elements in the selection before each element in the set of matched
+// elements.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) BeforeSelection(sel *Selection) *Selection {
+	return s.BeforeNodes(sel.Nodes...)
+}
+
+// BeforeHtml parses the html and inserts it before the set of matched elements.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) BeforeHtml(html string) *Selection {
+	return s.BeforeNodes(parseHtml(html)...)
+}
+
+// BeforeNodes inserts the nodes before each element in the set of matched elements.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) BeforeNodes(ns ...*html.Node) *Selection {
+	return s.manipulateNodes(ns, false, func(sn *html.Node, n *html.Node) {
+		if sn.Parent != nil {
+			sn.Parent.InsertBefore(n, sn)
+		}
+	})
+}
+
+// Clone creates a deep copy of the set of matched nodes. The new nodes will not be
+// attached to the document.
+func (s *Selection) Clone() *Selection {
+	ns := newEmptySelection(s.document)
+	ns.Nodes = cloneNodes(s.Nodes)
+	return ns
+}
+
+// Empty removes all children nodes from the set of matched elements.
+// It returns the children nodes in a new Selection.
+func (s *Selection) Empty() *Selection {
+	var nodes []*html.Node
+
+	for _, n := range s.Nodes {
+		for c := n.FirstChild; c != nil; c = n.FirstChild {
+			n.RemoveChild(c)
+			nodes = append(nodes, c)
+		}
+	}
+
+	return pushStack(s, nodes)
+}
+
+// Prepend prepends the elements specified by the selector to each element in
+// the set of matched elements, following the same rules as Append.
+func (s *Selection) Prepend(selector string) *Selection {
+	return s.PrependMatcher(cascadia.MustCompile(selector))
+}
+
+// PrependMatcher prepends the elements specified by the matcher to each
+// element in the set of matched elements.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) PrependMatcher(m Matcher) *Selection {
+	return s.PrependNodes(m.MatchAll(s.document.rootNode)...)
+}
+
+// PrependSelection prepends the elements in the selection to each element in
+// the set of matched elements.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) PrependSelection(sel *Selection) *Selection {
+	return s.PrependNodes(sel.Nodes...)
+}
+
+// PrependHtml parses the html and prepends it to the set of matched elements.
+func (s *Selection) PrependHtml(html string) *Selection {
+	return s.PrependNodes(parseHtml(html)...)
+}
+
+// PrependNodes prepends the specified nodes to each node in the set of
+// matched elements.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) PrependNodes(ns ...*html.Node) *Selection {
+	return s.manipulateNodes(ns, true, func(sn *html.Node, n *html.Node) {
+		// sn.FirstChild may be nil, in which case this functions like
+		// sn.AppendChild()
+		sn.InsertBefore(n, sn.FirstChild)
+	})
+}
+
+// Remove removes the set of matched elements from the document.
+// It returns the same selection, now consisting of nodes not in the document.
+func (s *Selection) Remove() *Selection {
+	for _, n := range s.Nodes {
+		if n.Parent != nil {
+			n.Parent.RemoveChild(n)
+		}
+	}
+
+	return s
+}
+
+// RemoveFiltered removes the set of matched elements by selector.
+// It returns the Selection of removed nodes.
+func (s *Selection) RemoveFiltered(selector string) *Selection {
+	return s.RemoveMatcher(cascadia.MustCompile(selector))
+}
+
+// RemoveMatcher removes the set of matched elements.
+// It returns the Selection of removed nodes.
+func (s *Selection) RemoveMatcher(m Matcher) *Selection {
+	return s.FilterMatcher(m).Remove()
+}
+
+// ReplaceWith replaces each element in the set of matched elements with the
+// nodes matched by the given selector.
+// It returns the removed elements.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) ReplaceWith(selector string) *Selection {
+	return s.ReplaceWithMatcher(cascadia.MustCompile(selector))
+}
+
+// ReplaceWithMatcher replaces each element in the set of matched elements with
+// the nodes matched by the given Matcher.
+// It returns the removed elements.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) ReplaceWithMatcher(m Matcher) *Selection {
+	return s.ReplaceWithNodes(m.MatchAll(s.document.rootNode)...)
+}
+
+// ReplaceWithSelection replaces each element in the set of matched elements with
+// the nodes from the given Selection.
+// It returns the removed elements.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) ReplaceWithSelection(sel *Selection) *Selection {
+	return s.ReplaceWithNodes(sel.Nodes...)
+}
+
+// ReplaceWithHtml replaces each element in the set of matched elements with
+// the parsed HTML.
+// It returns the removed elements.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) ReplaceWithHtml(html string) *Selection {
+	return s.ReplaceWithNodes(parseHtml(html)...)
+}
+
+// ReplaceWithNodes replaces each element in the set of matched elements with
+// the given nodes.
+// It returns the removed elements.
+//
+// This follows the same rules as Selection.Append.
+func (s *Selection) ReplaceWithNodes(ns ...*html.Node) *Selection {
+	s.AfterNodes(ns...)
+	return s.Remove()
+}
+
+// Unwrap removes the parents of the set of matched elements, leaving the matched
+// elements (and their siblings, if any) in their place.
+// It returns the original selection.
+func (s *Selection) Unwrap() *Selection {
+	s.Parent().Each(func(i int, ss *Selection) {
+		// For some reason, jquery allows unwrap to remove the <head> element, so
+		// allowing it here too. Same for <html>. Why it allows those elements to
+		// be unwrapped while not allowing body is a mystery to me.
+		if ss.Nodes[0].Data != "body" {
+			ss.ReplaceWithSelection(ss.Contents())
+		}
+	})
+
+	return s
+}
+
+// Wrap wraps each element in the set of matched elements inside the first
+// element matched by the given selector. The matched child is cloned before
+// being inserted into the document.
+//
+// It returns the original set of elements.
+func (s *Selection) Wrap(selector string) *Selection {
+	return s.WrapMatcher(cascadia.MustCompile(selector))
+}
+
+// WrapMatcher wraps each element in the set of matched elements inside the
+// first element matched by the given matcher. The matched child is cloned
+// before being inserted into the document.
+//
+// It returns the original set of elements.
+func (s *Selection) WrapMatcher(m Matcher) *Selection {
+	return s.wrapNodes(m.MatchAll(s.document.rootNode)...)
+}
+
+// WrapSelection wraps each element in the set of matched elements inside the
+// first element in the given Selection. The element is cloned before being
+// inserted into the document.
+//
+// It returns the original set of elements.
+func (s *Selection) WrapSelection(sel *Selection) *Selection {
+	return s.wrapNodes(sel.Nodes...)
+}
+
+// WrapHtml wraps each element in the set of matched elements inside the inner-
+// most child of the given HTML.
+//
+// It returns the original set of elements.
+func (s *Selection) WrapHtml(html string) *Selection {
+	return s.wrapNodes(parseHtml(html)...)
+}
+
+// WrapNode wraps each element in the set of matched elements inside the inner-
+// most child of the given node. The given node is copied before being inserted
+// into the document.
+//
+// It returns the original set of elements.
+func (s *Selection) WrapNode(n *html.Node) *Selection {
+	return s.wrapNodes(n)
+}
+
+func (s *Selection) wrapNodes(ns ...*html.Node) *Selection {
+	s.Each(func(i int, ss *Selection) {
+		ss.wrapAllNodes(ns...)
+	})
+
+	return s
+}
+
+// WrapAll wraps a single HTML structure, matched by the given selector, around
+// all elements in the set of matched elements. The matched child is cloned
+// before being inserted into the document.
+//
+// It returns the original set of elements.
+func (s *Selection) WrapAll(selector string) *Selection {
+	return s.WrapAllMatcher(cascadia.MustCompile(selector))
+}
+
+// WrapAllMatcher wraps a single HTML structure, matched by the given Matcher,
+// around all elements in the set of matched elements. The matched child is
+// cloned before being inserted into the document.
+//
+// It returns the original set of elements.
+func (s *Selection) WrapAllMatcher(m Matcher) *Selection {
+	return s.wrapAllNodes(m.MatchAll(s.document.rootNode)...)
+}
+
+// WrapAllSelection wraps a single HTML structure, the first node of the given
+// Selection, around all elements in the set of matched elements. The matched
+// child is cloned before being inserted into the document.
+//
+// It returns the original set of elements.
+func (s *Selection) WrapAllSelection(sel *Selection) *Selection {
+	return s.wrapAllNodes(sel.Nodes...)
+}
+
+// WrapAllHtml wraps the given HTML structure around all elements in the set of
+// matched elements. The matched child is cloned before being inserted into the
+// document.
+//
+// It returns the original set of elements.
+func (s *Selection) WrapAllHtml(html string) *Selection {
+	return s.wrapAllNodes(parseHtml(html)...)
+}
+
+func (s *Selection) wrapAllNodes(ns ...*html.Node) *Selection {
+	if len(ns) > 0 {
+		return s.WrapAllNode(ns[0])
+	}
+	return s
+}
+
+// WrapAllNode wraps the given node around the first element in the Selection,
+// making all other nodes in the Selection children of the given node. The node
+// is cloned before being inserted into the document.
+//
+// It returns the original set of elements.
+func (s *Selection) WrapAllNode(n *html.Node) *Selection {
+	if s.Size() == 0 {
+		return s
+	}
+
+	wrap := cloneNode(n)
+
+	first := s.Nodes[0]
+	if first.Parent != nil {
+		first.Parent.InsertBefore(wrap, first)
+		first.Parent.RemoveChild(first)
+	}
+
+	for c := getFirstChildEl(wrap); c != nil; c = getFirstChildEl(wrap) {
+		wrap = c
+	}
+
+	newSingleSelection(wrap, s.document).AppendSelection(s)
+
+	return s
+}
+
+// WrapInner wraps an HTML structure, matched by the given selector, around the
+// content of element in the set of matched elements. The matched child is
+// cloned before being inserted into the document.
+//
+// It returns the original set of elements.
+func (s *Selection) WrapInner(selector string) *Selection {
+	return s.WrapInnerMatcher(cascadia.MustCompile(selector))
+}
+
+// WrapInnerMatcher wraps an HTML structure, matched by the given selector,
+// around the content of element in the set of matched elements. The matched
+// child is cloned before being inserted into the document.
+//
+// It returns the original set of elements.
+func (s *Selection) WrapInnerMatcher(m Matcher) *Selection {
+	return s.wrapInnerNodes(m.MatchAll(s.document.rootNode)...)
+}
+
+// WrapInnerSelection wraps an HTML structure, matched by the given selector,
+// around the content of element in the set of matched elements. The matched
+// child is cloned before being inserted into the document.
+//
+// It returns the original set of elements.
+func (s *Selection) WrapInnerSelection(sel *Selection) *Selection {
+	return s.wrapInnerNodes(sel.Nodes...)
+}
+
+// WrapInnerHtml wraps an HTML structure, matched by the given selector, around
+// the content of element in the set of matched elements. The matched child is
+// cloned before being inserted into the document.
+//
+// It returns the original set of elements.
+func (s *Selection) WrapInnerHtml(html string) *Selection {
+	return s.wrapInnerNodes(parseHtml(html)...)
+}
+
+// WrapInnerNode wraps an HTML structure, matched by the given selector, around
+// the content of element in the set of matched elements. The matched child is
+// cloned before being inserted into the document.
+//
+// It returns the original set of elements.
+func (s *Selection) WrapInnerNode(n *html.Node) *Selection {
+	return s.wrapInnerNodes(n)
+}
+
+func (s *Selection) wrapInnerNodes(ns ...*html.Node) *Selection {
+	if len(ns) == 0 {
+		return s
+	}
+
+	s.Each(func(i int, s *Selection) {
+		contents := s.Contents()
+
+		if contents.Size() > 0 {
+			contents.wrapAllNodes(ns...)
+		} else {
+			s.AppendNodes(cloneNode(ns[0]))
+		}
+	})
+
+	return s
+}
+
+func parseHtml(h string) []*html.Node {
+	// Errors are only returned when the io.Reader returns any error besides
+	// EOF, but strings.Reader never will
+	nodes, err := html.ParseFragment(strings.NewReader(h), &html.Node{Type: html.ElementNode})
+	if err != nil {
+		panic("goquery: failed to parse HTML: " + err.Error())
+	}
+	return nodes
+}
+
+// Get the first child that is an ElementNode
+func getFirstChildEl(n *html.Node) *html.Node {
+	c := n.FirstChild
+	for c != nil && c.Type != html.ElementNode {
+		c = c.NextSibling
+	}
+	return c
+}
+
+// Deep copy a slice of nodes.
+func cloneNodes(ns []*html.Node) []*html.Node {
+	cns := make([]*html.Node, 0, len(ns))
+
+	for _, n := range ns {
+		cns = append(cns, cloneNode(n))
+	}
+
+	return cns
+}
+
+// Deep copy a node. The new node has clones of all the original node's
+// children but none of its parents or siblings.
+func cloneNode(n *html.Node) *html.Node {
+	nn := &html.Node{
+		Type:     n.Type,
+		DataAtom: n.DataAtom,
+		Data:     n.Data,
+		Attr:     make([]html.Attribute, len(n.Attr)),
+	}
+
+	copy(nn.Attr, n.Attr)
+	for c := n.FirstChild; c != nil; c = c.NextSibling {
+		nn.AppendChild(cloneNode(c))
+	}
+
+	return nn
+}
+
+func (s *Selection) manipulateNodes(ns []*html.Node, reverse bool,
+	f func(sn *html.Node, n *html.Node)) *Selection {
+
+	lasti := s.Size() - 1
+
+	// net.Html doesn't provide document fragments for insertion, so to get
+	// things in the correct order with After() and Prepend(), the callback
+	// needs to be called on the reverse of the nodes.
+	if reverse {
+		for i, j := 0, len(ns)-1; i < j; i, j = i+1, j-1 {
+			ns[i], ns[j] = ns[j], ns[i]
+		}
+	}
+
+	for i, sn := range s.Nodes {
+		for _, n := range ns {
+			if i != lasti {
+				f(sn, cloneNode(n))
+			} else {
+				if n.Parent != nil {
+					n.Parent.RemoveChild(n)
+				}
+				f(sn, n)
+			}
+		}
+	}
+
+	return s
+}
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/manipulation_test.go b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/manipulation_test.go
new file mode 100644
index 00000000..f1c6e3ef
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/manipulation_test.go
@@ -0,0 +1,453 @@
+package goquery
+
+import (
+	"testing"
+)
+
+const (
+	wrapHtml = "<div id=\"ins\">test string<div><p><em><b></b></em></p></div></div>"
+)
+
+func TestAfter(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#main").After("#nf6")
+
+	assertLength(t, doc.Find("#main #nf6").Nodes, 0)
+	assertLength(t, doc.Find("#foot #nf6").Nodes, 0)
+	assertLength(t, doc.Find("#main + #nf6").Nodes, 1)
+	printSel(t, doc.Selection)
+}
+
+func TestAfterMany(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find(".one").After("#nf6")
+
+	assertLength(t, doc.Find("#foot #nf6").Nodes, 1)
+	assertLength(t, doc.Find("#main #nf6").Nodes, 1)
+	assertLength(t, doc.Find(".one + #nf6").Nodes, 2)
+	printSel(t, doc.Selection)
+}
+
+func TestAfterWithRemoved(t *testing.T) {
+	doc := Doc2Clone()
+	s := doc.Find("#main").Remove()
+	s.After("#nf6")
+
+	assertLength(t, s.Find("#nf6").Nodes, 0)
+	assertLength(t, doc.Find("#nf6").Nodes, 0)
+	printSel(t, doc.Selection)
+}
+
+func TestAfterSelection(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#main").AfterSelection(doc.Find("#nf1, #nf2"))
+
+	assertLength(t, doc.Find("#main #nf1, #main #nf2").Nodes, 0)
+	assertLength(t, doc.Find("#foot #nf1, #foot #nf2").Nodes, 0)
+	assertLength(t, doc.Find("#main + #nf1, #nf1 + #nf2").Nodes, 2)
+	printSel(t, doc.Selection)
+}
+
+func TestAfterHtml(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#main").AfterHtml("<strong>new node</strong>")
+
+	assertLength(t, doc.Find("#main + strong").Nodes, 1)
+	printSel(t, doc.Selection)
+}
+
+func TestAppend(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#main").Append("#nf6")
+
+	assertLength(t, doc.Find("#foot #nf6").Nodes, 0)
+	assertLength(t, doc.Find("#main #nf6").Nodes, 1)
+	printSel(t, doc.Selection)
+}
+
+func TestAppendBody(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("body").Append("#nf6")
+
+	assertLength(t, doc.Find("#foot #nf6").Nodes, 0)
+	assertLength(t, doc.Find("#main #nf6").Nodes, 0)
+	assertLength(t, doc.Find("body > #nf6").Nodes, 1)
+	printSel(t, doc.Selection)
+}
+
+func TestAppendSelection(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#main").AppendSelection(doc.Find("#nf1, #nf2"))
+
+	assertLength(t, doc.Find("#foot #nf1").Nodes, 0)
+	assertLength(t, doc.Find("#foot #nf2").Nodes, 0)
+	assertLength(t, doc.Find("#main #nf1").Nodes, 1)
+	assertLength(t, doc.Find("#main #nf2").Nodes, 1)
+	printSel(t, doc.Selection)
+}
+
+func TestAppendSelectionExisting(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#main").AppendSelection(doc.Find("#n1, #n2"))
+
+	assertClass(t, doc.Find("#main :nth-child(1)"), "three")
+	assertClass(t, doc.Find("#main :nth-child(5)"), "one")
+	assertClass(t, doc.Find("#main :nth-child(6)"), "two")
+	printSel(t, doc.Selection)
+}
+
+func TestAppendClone(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#n1").AppendSelection(doc.Find("#nf1").Clone())
+
+	assertLength(t, doc.Find("#foot #nf1").Nodes, 1)
+	assertLength(t, doc.Find("#main #nf1").Nodes, 1)
+	printSel(t, doc.Selection)
+}
+
+func TestAppendHtml(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("div").AppendHtml("<strong>new node</strong>")
+
+	assertLength(t, doc.Find("strong").Nodes, 14)
+	printSel(t, doc.Selection)
+}
+
+func TestBefore(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#main").Before("#nf6")
+
+	assertLength(t, doc.Find("#main #nf6").Nodes, 0)
+	assertLength(t, doc.Find("#foot #nf6").Nodes, 0)
+	assertLength(t, doc.Find("body > #nf6:first-child").Nodes, 1)
+	printSel(t, doc.Selection)
+}
+
+func TestBeforeWithRemoved(t *testing.T) {
+	doc := Doc2Clone()
+	s := doc.Find("#main").Remove()
+	s.Before("#nf6")
+
+	assertLength(t, s.Find("#nf6").Nodes, 0)
+	assertLength(t, doc.Find("#nf6").Nodes, 0)
+	printSel(t, doc.Selection)
+}
+
+func TestBeforeSelection(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#main").BeforeSelection(doc.Find("#nf1, #nf2"))
+
+	assertLength(t, doc.Find("#main #nf1, #main #nf2").Nodes, 0)
+	assertLength(t, doc.Find("#foot #nf1, #foot #nf2").Nodes, 0)
+	assertLength(t, doc.Find("body > #nf1:first-child, #nf1 + #nf2").Nodes, 2)
+	printSel(t, doc.Selection)
+}
+
+func TestBeforeHtml(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#main").BeforeHtml("<strong>new node</strong>")
+
+	assertLength(t, doc.Find("body > strong:first-child").Nodes, 1)
+	printSel(t, doc.Selection)
+}
+
+func TestEmpty(t *testing.T) {
+	doc := Doc2Clone()
+	s := doc.Find("#main").Empty()
+
+	assertLength(t, doc.Find("#main").Children().Nodes, 0)
+	assertLength(t, s.Filter("div").Nodes, 6)
+	printSel(t, doc.Selection)
+}
+
+func TestPrepend(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#main").Prepend("#nf6")
+
+	assertLength(t, doc.Find("#foot #nf6").Nodes, 0)
+	assertLength(t, doc.Find("#main #nf6:first-child").Nodes, 1)
+	printSel(t, doc.Selection)
+}
+
+func TestPrependBody(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("body").Prepend("#nf6")
+
+	assertLength(t, doc.Find("#foot #nf6").Nodes, 0)
+	assertLength(t, doc.Find("#main #nf6").Nodes, 0)
+	assertLength(t, doc.Find("body > #nf6:first-child").Nodes, 1)
+	printSel(t, doc.Selection)
+}
+
+func TestPrependSelection(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#main").PrependSelection(doc.Find("#nf1, #nf2"))
+
+	assertLength(t, doc.Find("#foot #nf1").Nodes, 0)
+	assertLength(t, doc.Find("#foot #nf2").Nodes, 0)
+	assertLength(t, doc.Find("#main #nf1:first-child").Nodes, 1)
+	assertLength(t, doc.Find("#main #nf2:nth-child(2)").Nodes, 1)
+	printSel(t, doc.Selection)
+}
+
+func TestPrependSelectionExisting(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#main").PrependSelection(doc.Find("#n5, #n6"))
+
+	assertClass(t, doc.Find("#main :nth-child(1)"), "five")
+	assertClass(t, doc.Find("#main :nth-child(2)"), "six")
+	assertClass(t, doc.Find("#main :nth-child(5)"), "three")
+	assertClass(t, doc.Find("#main :nth-child(6)"), "four")
+	printSel(t, doc.Selection)
+}
+
+func TestPrependClone(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#n1").PrependSelection(doc.Find("#nf1").Clone())
+
+	assertLength(t, doc.Find("#foot #nf1:first-child").Nodes, 1)
+	assertLength(t, doc.Find("#main #nf1:first-child").Nodes, 1)
+	printSel(t, doc.Selection)
+}
+
+func TestPrependHtml(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("div").PrependHtml("<strong>new node</strong>")
+
+	assertLength(t, doc.Find("strong:first-child").Nodes, 14)
+	printSel(t, doc.Selection)
+}
+
+func TestRemove(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#nf1").Remove()
+
+	assertLength(t, doc.Find("#foot #nf1").Nodes, 0)
+	printSel(t, doc.Selection)
+}
+
+func TestRemoveAll(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("*").Remove()
+
+	assertLength(t, doc.Find("*").Nodes, 0)
+	printSel(t, doc.Selection)
+}
+
+func TestRemoveRoot(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("html").Remove()
+
+	assertLength(t, doc.Find("html").Nodes, 0)
+	printSel(t, doc.Selection)
+}
+
+func TestRemoveFiltered(t *testing.T) {
+	doc := Doc2Clone()
+	nf6 := doc.Find("#nf6")
+	s := doc.Find("div").RemoveFiltered("#nf6")
+
+	assertLength(t, doc.Find("#nf6").Nodes, 0)
+	assertLength(t, s.Nodes, 1)
+	if nf6.Nodes[0] != s.Nodes[0] {
+		t.Error("Removed node does not match original")
+	}
+	printSel(t, doc.Selection)
+}
+
+func TestReplaceWith(t *testing.T) {
+	doc := Doc2Clone()
+
+	doc.Find("#nf6").ReplaceWith("#main")
+	assertLength(t, doc.Find("#foot #main:last-child").Nodes, 1)
+	printSel(t, doc.Selection)
+
+	doc.Find("#foot").ReplaceWith("#main")
+	assertLength(t, doc.Find("#foot").Nodes, 0)
+	assertLength(t, doc.Find("#main").Nodes, 1)
+
+	printSel(t, doc.Selection)
+}
+
+func TestReplaceWithHtml(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#main, #foot").ReplaceWithHtml("<div id=\"replace\"></div>")
+
+	assertLength(t, doc.Find("#replace").Nodes, 2)
+
+	printSel(t, doc.Selection)
+}
+
+func TestReplaceWithSelection(t *testing.T) {
+	doc := Doc2Clone()
+	sel := doc.Find("#nf6").ReplaceWithSelection(doc.Find("#nf5"))
+
+	assertSelectionIs(t, sel, "#nf6")
+	assertLength(t, doc.Find("#nf6").Nodes, 0)
+	assertLength(t, doc.Find("#nf5").Nodes, 1)
+
+	printSel(t, doc.Selection)
+}
+
+func TestUnwrap(t *testing.T) {
+	doc := Doc2Clone()
+
+	doc.Find("#nf5").Unwrap()
+	assertLength(t, doc.Find("#foot").Nodes, 0)
+	assertLength(t, doc.Find("body > #nf1").Nodes, 1)
+	assertLength(t, doc.Find("body > #nf5").Nodes, 1)
+
+	printSel(t, doc.Selection)
+
+	doc = Doc2Clone()
+
+	doc.Find("#nf5, #n1").Unwrap()
+	assertLength(t, doc.Find("#foot").Nodes, 0)
+	assertLength(t, doc.Find("#main").Nodes, 0)
+	assertLength(t, doc.Find("body > #n1").Nodes, 1)
+	assertLength(t, doc.Find("body > #nf5").Nodes, 1)
+
+	printSel(t, doc.Selection)
+}
+
+func TestUnwrapBody(t *testing.T) {
+	doc := Doc2Clone()
+
+	doc.Find("#main").Unwrap()
+	assertLength(t, doc.Find("body").Nodes, 1)
+	assertLength(t, doc.Find("body > #main").Nodes, 1)
+
+	printSel(t, doc.Selection)
+}
+
+func TestUnwrapHead(t *testing.T) {
+	doc := Doc2Clone()
+
+	doc.Find("title").Unwrap()
+	assertLength(t, doc.Find("head").Nodes, 0)
+	assertLength(t, doc.Find("head > title").Nodes, 0)
+	assertLength(t, doc.Find("title").Nodes, 1)
+
+	printSel(t, doc.Selection)
+}
+
+func TestUnwrapHtml(t *testing.T) {
+	doc := Doc2Clone()
+
+	doc.Find("head").Unwrap()
+	assertLength(t, doc.Find("html").Nodes, 0)
+	assertLength(t, doc.Find("html head").Nodes, 0)
+	assertLength(t, doc.Find("head").Nodes, 1)
+
+	printSel(t, doc.Selection)
+}
+
+func TestWrap(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#nf1").Wrap("#nf2")
+	nf1 := doc.Find("#foot #nf2 #nf1")
+	assertLength(t, nf1.Nodes, 1)
+
+	nf2 := doc.Find("#nf2")
+	assertLength(t, nf2.Nodes, 2)
+
+	printSel(t, doc.Selection)
+}
+
+func TestWrapEmpty(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#nf1").Wrap("#doesnt-exist")
+
+	origHtml, _ := Doc2().Html()
+	newHtml, _ := doc.Html()
+
+	if origHtml != newHtml {
+		t.Error("Expected the two documents to be identical.")
+	}
+
+	printSel(t, doc.Selection)
+}
+
+func TestWrapHtml(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find(".odd").WrapHtml(wrapHtml)
+	nf2 := doc.Find("#ins #nf2")
+	assertLength(t, nf2.Nodes, 1)
+	printSel(t, doc.Selection)
+}
+
+func TestWrapSelection(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#nf1").WrapSelection(doc.Find("#nf2"))
+	nf1 := doc.Find("#foot #nf2 #nf1")
+	assertLength(t, nf1.Nodes, 1)
+
+	nf2 := doc.Find("#nf2")
+	assertLength(t, nf2.Nodes, 2)
+
+	printSel(t, doc.Selection)
+}
+
+func TestWrapAll(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find(".odd").WrapAll("#nf1")
+	nf1 := doc.Find("#main #nf1")
+	assertLength(t, nf1.Nodes, 1)
+
+	sel := nf1.Find("#n2 ~ #n4 ~ #n6 ~ #nf2 ~ #nf4 ~ #nf6")
+	assertLength(t, sel.Nodes, 1)
+
+	printSel(t, doc.Selection)
+}
+
+func TestWrapAllHtml(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find(".odd").WrapAllHtml(wrapHtml)
+	nf1 := doc.Find("#main div#ins div p em b #n2 ~ #n4 ~ #n6 ~ #nf2 ~ #nf4 ~ #nf6")
+	assertLength(t, nf1.Nodes, 1)
+	printSel(t, doc.Selection)
+}
+
+func TestWrapInnerNoContent(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find(".one").WrapInner(".two")
+
+	twos := doc.Find(".two")
+	assertLength(t, twos.Nodes, 4)
+	assertLength(t, doc.Find(".one .two").Nodes, 2)
+
+	printSel(t, doc.Selection)
+}
+
+func TestWrapInnerWithContent(t *testing.T) {
+	doc := Doc3Clone()
+	doc.Find(".one").WrapInner(".two")
+
+	twos := doc.Find(".two")
+	assertLength(t, twos.Nodes, 4)
+	assertLength(t, doc.Find(".one .two").Nodes, 2)
+
+	printSel(t, doc.Selection)
+}
+
+func TestWrapInnerNoWrapper(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find(".one").WrapInner(".not-exist")
+
+	twos := doc.Find(".two")
+	assertLength(t, twos.Nodes, 2)
+	assertLength(t, doc.Find(".one").Nodes, 2)
+	assertLength(t, doc.Find(".one .two").Nodes, 0)
+
+	printSel(t, doc.Selection)
+}
+
+func TestWrapInnerHtml(t *testing.T) {
+	doc := Doc2Clone()
+	doc.Find("#foot").WrapInnerHtml(wrapHtml)
+
+	foot := doc.Find("#foot div#ins div p em b #nf1 ~ #nf2 ~ #nf3")
+	assertLength(t, foot.Nodes, 1)
+
+	printSel(t, doc.Selection)
+}
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/misc/git/pre-commit b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/misc/git/pre-commit
new file mode 100644
index 00000000..58e5e86c
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/misc/git/pre-commit
@@ -0,0 +1,37 @@
+#!/bin/sh
+# Copyright 2012 The Go Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+# git gofmt pre-commit hook
+#
+# To use, store as .git/hooks/pre-commit inside your repository and make sure
+# it has execute permissions.
+#
+# This script does not handle file names that contain spaces.
+
+# golint is purely informational, it doesn't fail with exit code != 0 if it finds something,
+# because it may find a lot of false positives. Just print out its result for information.
+echo "lint result (informational only):"
+golint .
+
+# go vet returns 1 if an error was found. Exit the hook with this exit code.
+go vet ./...
+vetres=$?
+
+# Check for gofmt problems and report if any.
+gofiles=$(git diff --cached --name-only --diff-filter=ACM | grep '.go$')
+[ -z "$gofiles" ] && echo "EXIT $vetres" && exit $vetres
+
+unformatted=$(gofmt -l $gofiles)
+[ -z "$unformatted" ] && echo "EXIT $vetres" && exit $vetres
+
+# Some files are not gofmt'd. Print message and fail.
+
+echo >&2 "Go files must be formatted with gofmt. Please run:"
+for fn in $unformatted; do
+    echo >&2 "  gofmt -w $PWD/$fn"
+done
+
+echo "EXIT 1"
+exit 1
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/property.go b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/property.go
new file mode 100644
index 00000000..af3a9eac
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/property.go
@@ -0,0 +1,278 @@
+package goquery
+
+import (
+	"bytes"
+	"regexp"
+	"strings"
+
+	"golang.org/x/net/html"
+)
+
+var rxClassTrim = regexp.MustCompile("[\t\r\n]")
+
+// Attr gets the specified attribute's value for the first element in the
+// Selection. To get the value for each element individually, use a looping
+// construct such as Each or Map method.
+func (s *Selection) Attr(attrName string) (val string, exists bool) {
+	if len(s.Nodes) == 0 {
+		return
+	}
+	return getAttributeValue(attrName, s.Nodes[0])
+}
+
+// AttrOr works like Attr but returns default value if attribute is not present.
+func (s *Selection) AttrOr(attrName, defaultValue string) string {
+	if len(s.Nodes) == 0 {
+		return defaultValue
+	}
+
+	val, exists := getAttributeValue(attrName, s.Nodes[0])
+	if !exists {
+		return defaultValue
+	}
+
+	return val
+}
+
+// RemoveAttr removes the named attribute from each element in the set of matched elements.
+func (s *Selection) RemoveAttr(attrName string) *Selection {
+	for _, n := range s.Nodes {
+		removeAttr(n, attrName)
+	}
+
+	return s
+}
+
+// SetAttr sets the given attribute on each element in the set of matched elements.
+func (s *Selection) SetAttr(attrName, val string) *Selection {
+	for _, n := range s.Nodes {
+		attr := getAttributePtr(attrName, n)
+		if attr == nil {
+			n.Attr = append(n.Attr, html.Attribute{Key: attrName, Val: val})
+		} else {
+			attr.Val = val
+		}
+	}
+
+	return s
+}
+
+// Text gets the combined text contents of each element in the set of matched
+// elements, including their descendants.
+func (s *Selection) Text() string {
+	var buf bytes.Buffer
+
+	// Slightly optimized vs calling Each: no single selection object created
+	for _, n := range s.Nodes {
+		buf.WriteString(getNodeText(n))
+	}
+	return buf.String()
+}
+
+// Size is an alias for Length.
+func (s *Selection) Size() int {
+	return s.Length()
+}
+
+// Length returns the number of elements in the Selection object.
+func (s *Selection) Length() int {
+	return len(s.Nodes)
+}
+
+// Html gets the HTML contents of the first element in the set of matched
+// elements. It includes text and comment nodes.
+func (s *Selection) Html() (ret string, e error) {
+	// Since there is no .innerHtml, the HTML content must be re-created from
+	// the nodes using html.Render.
+	var buf bytes.Buffer
+
+	if len(s.Nodes) > 0 {
+		for c := s.Nodes[0].FirstChild; c != nil; c = c.NextSibling {
+			e = html.Render(&buf, c)
+			if e != nil {
+				return
+			}
+		}
+		ret = buf.String()
+	}
+
+	return
+}
+
+// AddClass adds the given class(es) to each element in the set of matched elements.
+// Multiple class names can be specified, separated by a space or via multiple arguments.
+func (s *Selection) AddClass(class ...string) *Selection {
+	classStr := strings.TrimSpace(strings.Join(class, " "))
+
+	if classStr == "" {
+		return s
+	}
+
+	tcls := getClassesSlice(classStr)
+	for _, n := range s.Nodes {
+		curClasses, attr := getClassesAndAttr(n, true)
+		for _, newClass := range tcls {
+			if strings.Index(curClasses, " "+newClass+" ") == -1 {
+				curClasses += newClass + " "
+			}
+		}
+
+		setClasses(n, attr, curClasses)
+	}
+
+	return s
+}
+
+// HasClass determines whether any of the matched elements are assigned the
+// given class.
+func (s *Selection) HasClass(class string) bool {
+	class = " " + class + " "
+	for _, n := range s.Nodes {
+		classes, _ := getClassesAndAttr(n, false)
+		if strings.Index(classes, class) > -1 {
+			return true
+		}
+	}
+	return false
+}
+
+// RemoveClass removes the given class(es) from each element in the set of matched elements.
+// Multiple class names can be specified, separated by a space or via multiple arguments.
+// If no class name is provided, all classes are removed.
+func (s *Selection) RemoveClass(class ...string) *Selection {
+	var rclasses []string
+
+	classStr := strings.TrimSpace(strings.Join(class, " "))
+	remove := classStr == ""
+
+	if !remove {
+		rclasses = getClassesSlice(classStr)
+	}
+
+	for _, n := range s.Nodes {
+		if remove {
+			removeAttr(n, "class")
+		} else {
+			classes, attr := getClassesAndAttr(n, true)
+			for _, rcl := range rclasses {
+				classes = strings.Replace(classes, " "+rcl+" ", " ", -1)
+			}
+
+			setClasses(n, attr, classes)
+		}
+	}
+
+	return s
+}
+
+// ToggleClass adds or removes the given class(es) for each element in the set of matched elements.
+// Multiple class names can be specified, separated by a space or via multiple arguments.
+func (s *Selection) ToggleClass(class ...string) *Selection {
+	classStr := strings.TrimSpace(strings.Join(class, " "))
+
+	if classStr == "" {
+		return s
+	}
+
+	tcls := getClassesSlice(classStr)
+
+	for _, n := range s.Nodes {
+		classes, attr := getClassesAndAttr(n, true)
+		for _, tcl := range tcls {
+			if strings.Index(classes, " "+tcl+" ") != -1 {
+				classes = strings.Replace(classes, " "+tcl+" ", " ", -1)
+			} else {
+				classes += tcl + " "
+			}
+		}
+
+		setClasses(n, attr, classes)
+	}
+
+	return s
+}
+
+// Get the specified node's text content.
+func getNodeText(node *html.Node) string {
+	if node.Type == html.TextNode {
+		// Keep newlines and spaces, like jQuery
+		return node.Data
+	} else if node.FirstChild != nil {
+		var buf bytes.Buffer
+		for c := node.FirstChild; c != nil; c = c.NextSibling {
+			buf.WriteString(getNodeText(c))
+		}
+		return buf.String()
+	}
+
+	return ""
+}
+
+func getAttributePtr(attrName string, n *html.Node) *html.Attribute {
+	if n == nil {
+		return nil
+	}
+
+	for i, a := range n.Attr {
+		if a.Key == attrName {
+			return &n.Attr[i]
+		}
+	}
+	return nil
+}
+
+// Private function to get the specified attribute's value from a node.
+func getAttributeValue(attrName string, n *html.Node) (val string, exists bool) {
+	if a := getAttributePtr(attrName, n); a != nil {
+		val = a.Val
+		exists = true
+	}
+	return
+}
+
+// Get and normalize the "class" attribute from the node.
+func getClassesAndAttr(n *html.Node, create bool) (classes string, attr *html.Attribute) {
+	// Applies only to element nodes
+	if n.Type == html.ElementNode {
+		attr = getAttributePtr("class", n)
+		if attr == nil && create {
+			n.Attr = append(n.Attr, html.Attribute{
+				Key: "class",
+				Val: "",
+			})
+			attr = &n.Attr[len(n.Attr)-1]
+		}
+	}
+
+	if attr == nil {
+		classes = " "
+	} else {
+		classes = rxClassTrim.ReplaceAllString(" "+attr.Val+" ", " ")
+	}
+
+	return
+}
+
+func getClassesSlice(classes string) []string {
+	return strings.Split(rxClassTrim.ReplaceAllString(" "+classes+" ", " "), " ")
+}
+
+func removeAttr(n *html.Node, attrName string) {
+	for i, a := range n.Attr {
+		if a.Key == attrName {
+			n.Attr[i], n.Attr[len(n.Attr)-1], n.Attr =
+				n.Attr[len(n.Attr)-1], html.Attribute{}, n.Attr[:len(n.Attr)-1]
+			return
+		}
+	}
+}
+
+func setClasses(n *html.Node, attr *html.Attribute, classes string) {
+	classes = strings.TrimSpace(classes)
+	if classes == "" {
+		removeAttr(n, "class")
+		return
+	}
+
+	attr.Val = classes
+}
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/property_test.go b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/property_test.go
new file mode 100644
index 00000000..1095dcc8
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/property_test.go
@@ -0,0 +1,252 @@
+package goquery
+
+import (
+	"regexp"
+	"strings"
+	"testing"
+)
+
+func TestAttrExists(t *testing.T) {
+	if val, ok := Doc().Find("a").Attr("href"); !ok {
+		t.Error("Expected a value for the href attribute.")
+	} else {
+		t.Logf("Href of first anchor: %v.", val)
+	}
+}
+
+func TestAttrOr(t *testing.T) {
+	if val := Doc().Find("a").AttrOr("fake-attribute", "alternative"); val != "alternative" {
+		t.Error("Expected an alternative value for 'fake-attribute' attribute.")
+	} else {
+		t.Logf("Value returned for not existing attribute: %v.", val)
+	}
+	if val := Doc().Find("zz").AttrOr("fake-attribute", "alternative"); val != "alternative" {
+		t.Error("Expected an alternative value for 'fake-attribute' on an empty selection.")
+	} else {
+		t.Logf("Value returned for empty selection: %v.", val)
+	}
+}
+
+func TestAttrNotExist(t *testing.T) {
+	if val, ok := Doc().Find("div.row-fluid").Attr("href"); ok {
+		t.Errorf("Expected no value for the href attribute, got %v.", val)
+	}
+}
+
+func TestRemoveAttr(t *testing.T) {
+	sel := Doc2Clone().Find("div")
+
+	sel.RemoveAttr("id")
+
+	_, ok := sel.Attr("id")
+	if ok {
+		t.Error("Expected there to be no id attributes set")
+	}
+}
+
+func TestSetAttr(t *testing.T) {
+	sel := Doc2Clone().Find("#main")
+
+	sel.SetAttr("id", "not-main")
+
+	val, ok := sel.Attr("id")
+	if !ok {
+		t.Error("Expected an id attribute on main")
+	}
+
+	if val != "not-main" {
+		t.Errorf("Expected an attribute id to be not-main, got %s", val)
+	}
+}
+
+func TestSetAttr2(t *testing.T) {
+	sel := Doc2Clone().Find("#main")
+
+	sel.SetAttr("foo", "bar")
+
+	val, ok := sel.Attr("foo")
+	if !ok {
+		t.Error("Expected an 'foo' attribute on main")
+	}
+
+	if val != "bar" {
+		t.Errorf("Expected an attribute 'foo' to be 'bar', got '%s'", val)
+	}
+}
+
+func TestText(t *testing.T) {
+	txt := Doc().Find("h1").Text()
+	if strings.Trim(txt, " \n\r\t") != "Provok.in" {
+		t.Errorf("Expected text to be Provok.in, found %s.", txt)
+	}
+}
+
+func TestText2(t *testing.T) {
+	txt := Doc().Find(".hero-unit .container-fluid .row-fluid:nth-child(1)").Text()
+	if ok, e := regexp.MatchString(`^\s+Provok\.in\s+Prove your point.\s+$`, txt); !ok || e != nil {
+		t.Errorf("Expected text to be Provok.in Prove your point., found %s.", txt)
+		if e != nil {
+			t.Logf("Error: %s.", e.Error())
+		}
+	}
+}
+
+func TestText3(t *testing.T) {
+	txt := Doc().Find(".pvk-gutter").First().Text()
+	// There's an &nbsp; character in there...
+	if ok, e := regexp.MatchString(`^[\s\x{00A0}]+$`, txt); !ok || e != nil {
+		t.Errorf("Expected spaces, found <%v>.", txt)
+		if e != nil {
+			t.Logf("Error: %s.", e.Error())
+		}
+	}
+}
+
+func TestHtml(t *testing.T) {
+	txt, e := Doc().Find("h1").Html()
+	if e != nil {
+		t.Errorf("Error: %s.", e)
+	}
+
+	if ok, e := regexp.MatchString(`^\s*<a href="/">Provok<span class="green">\.</span><span class="red">i</span>n</a>\s*$`, txt); !ok || e != nil {
+		t.Errorf("Unexpected HTML content, found %s.", txt)
+		if e != nil {
+			t.Logf("Error: %s.", e.Error())
+		}
+	}
+}
+
+func TestNbsp(t *testing.T) {
+	src := `<p>Some&nbsp;text</p>`
+	d, err := NewDocumentFromReader(strings.NewReader(src))
+	if err != nil {
+		t.Fatal(err)
+	}
+	txt := d.Find("p").Text()
+	ix := strings.Index(txt, "\u00a0")
+	if ix != 4 {
+		t.Errorf("Text: expected a non-breaking space at index 4, got %d", ix)
+	}
+
+	h, err := d.Find("p").Html()
+	if err != nil {
+		t.Fatal(err)
+	}
+	ix = strings.Index(h, "\u00a0")
+	if ix != 4 {
+		t.Errorf("Html: expected a non-breaking space at index 4, got %d", ix)
+	}
+}
+
+func TestAddClass(t *testing.T) {
+	sel := Doc2Clone().Find("#main")
+	sel.AddClass("main main main")
+
+	// Make sure that class was only added once
+	if a, ok := sel.Attr("class"); !ok || a != "main" {
+		t.Error("Expected #main to have class main")
+	}
+}
+
+func TestAddClassSimilar(t *testing.T) {
+	sel := Doc2Clone().Find("#nf5")
+	sel.AddClass("odd")
+
+	assertClass(t, sel, "odd")
+	assertClass(t, sel, "odder")
+	printSel(t, sel.Parent())
+}
+
+func TestAddEmptyClass(t *testing.T) {
+	sel := Doc2Clone().Find("#main")
+	sel.AddClass("")
+
+	// Make sure that class was only added once
+	if a, ok := sel.Attr("class"); ok {
+		t.Errorf("Expected #main to not to have a class, have: %s", a)
+	}
+}
+
+func TestAddClasses(t *testing.T) {
+	sel := Doc2Clone().Find("#main")
+	sel.AddClass("a b")
+
+	// Make sure that class was only added once
+	if !sel.HasClass("a") || !sel.HasClass("b") {
+		t.Errorf("#main does not have classes")
+	}
+}
+
+func TestHasClass(t *testing.T) {
+	sel := Doc().Find("div")
+	if !sel.HasClass("span12") {
+		t.Error("Expected at least one div to have class span12.")
+	}
+}
+
+func TestHasClassNone(t *testing.T) {
+	sel := Doc().Find("h2")
+	if sel.HasClass("toto") {
+		t.Error("Expected h1 to have no class.")
+	}
+}
+
+func TestHasClassNotFirst(t *testing.T) {
+	sel := Doc().Find(".alert")
+	if !sel.HasClass("alert-error") {
+		t.Error("Expected .alert to also have class .alert-error.")
+	}
+}
+
+func TestRemoveClass(t *testing.T) {
+	sel := Doc2Clone().Find("#nf1")
+	sel.RemoveClass("one row")
+
+	if !sel.HasClass("even") || sel.HasClass("one") || sel.HasClass("row") {
+		classes, _ := sel.Attr("class")
+		t.Error("Expected #nf1 to have class even, has ", classes)
+	}
+}
+
+func TestRemoveClassSimilar(t *testing.T) {
+	sel := Doc2Clone().Find("#nf5, #nf6")
+	assertLength(t, sel.Nodes, 2)
+
+	sel.RemoveClass("odd")
+	assertClass(t, sel.Eq(0), "odder")
+	printSel(t, sel)
+}
+
+func TestRemoveAllClasses(t *testing.T) {
+	sel := Doc2Clone().Find("#nf1")
+	sel.RemoveClass()
+
+	if a, ok := sel.Attr("class"); ok {
+		t.Error("All classes were not removed, has ", a)
+	}
+
+	sel = Doc2Clone().Find("#main")
+	sel.RemoveClass()
+	if a, ok := sel.Attr("class"); ok {
+		t.Error("All classes were not removed, has ", a)
+	}
+}
+
+func TestToggleClass(t *testing.T) {
+	sel := Doc2Clone().Find("#nf1")
+
+	sel.ToggleClass("one")
+	if sel.HasClass("one") {
+		t.Error("Expected #nf1 to not have class one")
+	}
+
+	sel.ToggleClass("one")
+	if !sel.HasClass("one") {
+		t.Error("Expected #nf1 to have class one")
+	}
+
+	sel.ToggleClass("one even row")
+	if a, ok := sel.Attr("class"); ok {
+		t.Errorf("Expected #nf1 to have no classes, have %q", a)
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/query.go b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/query.go
new file mode 100644
index 00000000..8a0ffcff
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/query.go
@@ -0,0 +1,56 @@
+package goquery
+
+import (
+	"github.com/andybalholm/cascadia"
+	"golang.org/x/net/html"
+)
+
+// Is checks the current matched set of elements against a selector and
+// returns true if at least one of these elements matches.
+func (s *Selection) Is(selector string) bool {
+	if len(s.Nodes) > 0 {
+		return s.IsMatcher(cascadia.MustCompile(selector))
+	}
+
+	return false
+}
+
+// IsMatcher checks the current matched set of elements against a matcher and
+// returns true if at least one of these elements matches.
+func (s *Selection) IsMatcher(m Matcher) bool {
+	if len(s.Nodes) > 0 {
+		if len(s.Nodes) == 1 {
+			return m.Match(s.Nodes[0])
+		}
+		return len(m.Filter(s.Nodes)) > 0
+	}
+
+	return false
+}
+
+// IsFunction checks the current matched set of elements against a predicate and
+// returns true if at least one of these elements matches.
+func (s *Selection) IsFunction(f func(int, *Selection) bool) bool {
+	return s.FilterFunction(f).Length() > 0
+}
+
+// IsSelection checks the current matched set of elements against a Selection object
+// and returns true if at least one of these elements matches.
+func (s *Selection) IsSelection(sel *Selection) bool {
+	return s.FilterSelection(sel).Length() > 0
+}
+
+// IsNodes checks the current matched set of elements against the specified nodes
+// and returns true if at least one of these elements matches.
+func (s *Selection) IsNodes(nodes ...*html.Node) bool {
+	return s.FilterNodes(nodes...).Length() > 0
+}
+
+// Contains returns true if the specified Node is within,
+// at any depth, one of the nodes in the Selection object.
+// It is NOT inclusive, to behave like jQuery's implementation, and
+// unlike Javascript's .contains, so if the contained
+// node is itself in the selection, it returns false.
+func (s *Selection) Contains(n *html.Node) bool {
+	return sliceContains(s.Nodes, n)
+}
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/query_test.go b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/query_test.go
new file mode 100644
index 00000000..2f40f424
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/query_test.go
@@ -0,0 +1,96 @@
+package goquery
+
+import (
+	"testing"
+)
+
+func TestIs(t *testing.T) {
+	sel := Doc().Find(".footer p:nth-child(1)")
+	if !sel.Is("p") {
+		t.Error("Expected .footer p:nth-child(1) to be p.")
+	}
+}
+
+func TestIsPositional(t *testing.T) {
+	sel := Doc().Find(".footer p:nth-child(2)")
+	if !sel.Is("p:nth-child(2)") {
+		t.Error("Expected .footer p:nth-child(2) to be p:nth-child(2).")
+	}
+}
+
+func TestIsPositionalNot(t *testing.T) {
+	sel := Doc().Find(".footer p:nth-child(1)")
+	if sel.Is("p:nth-child(2)") {
+		t.Error("Expected .footer p:nth-child(1) NOT to be p:nth-child(2).")
+	}
+}
+
+func TestIsFunction(t *testing.T) {
+	ok := Doc().Find("div").IsFunction(func(i int, s *Selection) bool {
+		return s.HasClass("container-fluid")
+	})
+
+	if !ok {
+		t.Error("Expected some div to have a container-fluid class.")
+	}
+}
+
+func TestIsFunctionRollback(t *testing.T) {
+	ok := Doc().Find("div").IsFunction(func(i int, s *Selection) bool {
+		return s.HasClass("container-fluid")
+	})
+
+	if !ok {
+		t.Error("Expected some div to have a container-fluid class.")
+	}
+}
+
+func TestIsSelection(t *testing.T) {
+	sel := Doc().Find("div")
+	sel2 := Doc().Find(".pvk-gutter")
+
+	if !sel.IsSelection(sel2) {
+		t.Error("Expected some div to have a pvk-gutter class.")
+	}
+}
+
+func TestIsSelectionNot(t *testing.T) {
+	sel := Doc().Find("div")
+	sel2 := Doc().Find("a")
+
+	if sel.IsSelection(sel2) {
+		t.Error("Expected some div NOT to be an anchor.")
+	}
+}
+
+func TestIsNodes(t *testing.T) {
+	sel := Doc().Find("div")
+	sel2 := Doc().Find(".footer")
+
+	if !sel.IsNodes(sel2.Nodes[0]) {
+		t.Error("Expected some div to have a footer class.")
+	}
+}
+
+func TestDocContains(t *testing.T) {
+	sel := Doc().Find("h1")
+	if !Doc().Contains(sel.Nodes[0]) {
+		t.Error("Expected document to contain H1 tag.")
+	}
+}
+
+func TestSelContains(t *testing.T) {
+	sel := Doc().Find(".row-fluid")
+	sel2 := Doc().Find("a[ng-click]")
+	if !sel.Contains(sel2.Nodes[0]) {
+		t.Error("Expected .row-fluid to contain a[ng-click] tag.")
+	}
+}
+
+func TestSelNotContains(t *testing.T) {
+	sel := Doc().Find("a.link")
+	sel2 := Doc().Find("span")
+	if sel.Contains(sel2.Nodes[0]) {
+		t.Error("Expected a.link to NOT contain span tag.")
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/testdata/gotesting.html b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/testdata/gotesting.html
new file mode 100644
index 00000000..ba5348fd
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/testdata/gotesting.html
@@ -0,0 +1,855 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+
+  <title>testing - The Go Programming Language</title>
+
+<link type="text/css" rel="stylesheet" href="/doc/style.css">
+<script type="text/javascript" src="/doc/godocs.js"></script>
+
+<link rel="search" type="application/opensearchdescription+xml" title="godoc" href="/opensearch.xml" />
+
+<script type="text/javascript">
+var _gaq = _gaq || [];
+_gaq.push(["_setAccount", "UA-11222381-2"]);
+_gaq.push(["_trackPageview"]);
+</script>
+</head>
+<body>
+
+<div id="topbar"><div class="container wide">
+
+<form method="GET" action="/search">
+<div id="menu">
+<a href="/doc/">Documents</a>
+<a href="/ref/">References</a>
+<a href="/pkg/">Packages</a>
+<a href="/project/">The Project</a>
+<a href="/help/">Help</a>
+<input type="text" id="search" name="q" class="inactive" value="Search">
+</div>
+<div id="heading"><a href="/">The Go Programming Language</a></div>
+</form>
+
+</div></div>
+
+<div id="page" class="wide">
+
+
+  <div id="plusone"><g:plusone size="small" annotation="none"></g:plusone></div>
+  <h1>Package testing</h1>
+
+
+
+
+<div id="nav"></div>
+
+
+<!--
+	Copyright 2009 The Go Authors. All rights reserved.
+	Use of this source code is governed by a BSD-style
+	license that can be found in the LICENSE file.
+-->
+
+	
+		<div id="short-nav">
+			<dl>
+			<dd><code>import "testing"</code></dd>
+			</dl>
+			<dl>
+			<dd><a href="#overview" class="overviewLink">Overview</a></dd>
+			<dd><a href="#index">Index</a></dd>
+			
+			
+				<dd><a href="#subdirectories">Subdirectories</a></dd>
+			
+			</dl>
+		</div>
+		<!-- The package's Name is printed as title by the top-level template -->
+		<div id="overview" class="toggleVisible">
+			<div class="collapsed">
+				<h2 class="toggleButton" title="Click to show Overview section">Overview ▹</h2>
+			</div>
+			<div class="expanded">
+				<h2 class="toggleButton" title="Click to hide Overview section">Overview ▾</h2>
+				<p>
+Package testing provides support for automated testing of Go packages.
+It is intended to be used in concert with the &ldquo;go test&rdquo; command, which automates
+execution of any function of the form
+</p>
+<pre>func TestXxx(*testing.T)
+</pre>
+<p>
+where Xxx can be any alphanumeric string (but the first letter must not be in
+[a-z]) and serves to identify the test routine.
+These TestXxx routines should be declared within the package they are testing.
+</p>
+<p>
+Functions of the form
+</p>
+<pre>func BenchmarkXxx(*testing.B)
+</pre>
+<p>
+are considered benchmarks, and are executed by the &#34;go test&#34; command when
+the -test.bench flag is provided.
+</p>
+<p>
+A sample benchmark function looks like this:
+</p>
+<pre>func BenchmarkHello(b *testing.B) {
+    for i := 0; i &lt; b.N; i++ {
+        fmt.Sprintf(&#34;hello&#34;)
+    }
+}
+</pre>
+<p>
+The benchmark package will vary b.N until the benchmark function lasts
+long enough to be timed reliably.  The output
+</p>
+<pre>testing.BenchmarkHello    10000000    282 ns/op
+</pre>
+<p>
+means that the loop ran 10000000 times at a speed of 282 ns per loop.
+</p>
+<p>
+If a benchmark needs some expensive setup before running, the timer
+may be stopped:
+</p>
+<pre>func BenchmarkBigLen(b *testing.B) {
+    b.StopTimer()
+    big := NewBig()
+    b.StartTimer()
+    for i := 0; i &lt; b.N; i++ {
+        big.Len()
+    }
+}
+</pre>
+<p>
+The package also runs and verifies example code. Example functions may
+include a concluding comment that begins with &#34;Output:&#34; and is compared with
+the standard output of the function when the tests are run, as in these
+examples of an example:
+</p>
+<pre>func ExampleHello() {
+        fmt.Println(&#34;hello&#34;)
+        // Output: hello
+}
+
+func ExampleSalutations() {
+        fmt.Println(&#34;hello, and&#34;)
+        fmt.Println(&#34;goodbye&#34;)
+        // Output:
+        // hello, and
+        // goodbye
+}
+</pre>
+<p>
+Example functions without output comments are compiled but not executed.
+</p>
+<p>
+The naming convention to declare examples for a function F, a type T and
+method M on type T are:
+</p>
+<pre>func ExampleF() { ... }
+func ExampleT() { ... }
+func ExampleT_M() { ... }
+</pre>
+<p>
+Multiple example functions for a type/function/method may be provided by
+appending a distinct suffix to the name. The suffix must start with a
+lower-case letter.
+</p>
+<pre>func ExampleF_suffix() { ... }
+func ExampleT_suffix() { ... }
+func ExampleT_M_suffix() { ... }
+</pre>
+<p>
+The entire test file is presented as the example when it contains a single
+example function, at least one other function, type, variable, or constant
+declaration, and no test or benchmark functions.
+</p>
+
+			</div>
+		</div>
+		
+	
+		<h2 id="index">Index</h2>
+		<!-- Table of contents for API; must be named manual-nav to turn off auto nav. -->
+		<div id="manual-nav">
+			<dl>
+			
+			
+			
+				
+				<dd><a href="#Main">func Main(matchString func(pat, str string) (bool, error), tests []InternalTest, benchmarks []InternalBenchmark, examples []InternalExample)</a></dd>
+			
+				
+				<dd><a href="#RunBenchmarks">func RunBenchmarks(matchString func(pat, str string) (bool, error), benchmarks []InternalBenchmark)</a></dd>
+			
+				
+				<dd><a href="#RunExamples">func RunExamples(matchString func(pat, str string) (bool, error), examples []InternalExample) (ok bool)</a></dd>
+			
+				
+				<dd><a href="#RunTests">func RunTests(matchString func(pat, str string) (bool, error), tests []InternalTest) (ok bool)</a></dd>
+			
+				
+				<dd><a href="#Short">func Short() bool</a></dd>
+			
+			
+				
+				<dd><a href="#B">type B</a></dd>
+				
+				
+					
+					<dd>&nbsp; &nbsp; <a href="#B.Error">func (c *B) Error(args ...interface{})</a></dd>
+				
+					
+					<dd>&nbsp; &nbsp; <a href="#B.Errorf">func (c *B) Errorf(format string, args ...interface{})</a></dd>
+				
+					
+					<dd>&nbsp; &nbsp; <a href="#B.Fail">func (c *B) Fail()</a></dd>
+				
+					
+					<dd>&nbsp; &nbsp; <a href="#B.FailNow">func (c *B) FailNow()</a></dd>
+				
+					
+					<dd>&nbsp; &nbsp; <a href="#B.Failed">func (c *B) Failed() bool</a></dd>
+				
+					
+					<dd>&nbsp; &nbsp; <a href="#B.Fatal">func (c *B) Fatal(args ...interface{})</a></dd>
+				
+					
+					<dd>&nbsp; &nbsp; <a href="#B.Fatalf">func (c *B) Fatalf(format string, args ...interface{})</a></dd>
+				
+					
+					<dd>&nbsp; &nbsp; <a href="#B.Log">func (c *B) Log(args ...interface{})</a></dd>
+				
+					
+					<dd>&nbsp; &nbsp; <a href="#B.Logf">func (c *B) Logf(format string, args ...interface{})</a></dd>
+				
+					
+					<dd>&nbsp; &nbsp; <a href="#B.ResetTimer">func (b *B) ResetTimer()</a></dd>
+				
+					
+					<dd>&nbsp; &nbsp; <a href="#B.SetBytes">func (b *B) SetBytes(n int64)</a></dd>
+				
+					
+					<dd>&nbsp; &nbsp; <a href="#B.StartTimer">func (b *B) StartTimer()</a></dd>
+				
+					
+					<dd>&nbsp; &nbsp; <a href="#B.StopTimer">func (b *B) StopTimer()</a></dd>
+				
+			
+				
+				<dd><a href="#BenchmarkResult">type BenchmarkResult</a></dd>
+				
+					
+					<dd>&nbsp; &nbsp; <a href="#Benchmark">func Benchmark(f func(b *B)) BenchmarkResult</a></dd>
+				
+				
+					
+					<dd>&nbsp; &nbsp; <a href="#BenchmarkResult.NsPerOp">func (r BenchmarkResult) NsPerOp() int64</a></dd>
+				
+					
+					<dd>&nbsp; &nbsp; <a href="#BenchmarkResult.String">func (r BenchmarkResult) String() string</a></dd>
+				
+			
+				
+				<dd><a href="#InternalBenchmark">type InternalBenchmark</a></dd>
+				
+				
+			
+				
+				<dd><a href="#InternalExample">type InternalExample</a></dd>
+				
+				
+			
+				
+				<dd><a href="#InternalTest">type InternalTest</a></dd>
+				
+				
+			
+				
+				<dd><a href="#T">type T</a></dd>
+				
+				
+					
+					<dd>&nbsp; &nbsp; <a href="#T.Error">func (c *T) Error(args ...interface{})</a></dd>
+				
+					
+					<dd>&nbsp; &nbsp; <a href="#T.Errorf">func (c *T) Errorf(format string, args ...interface{})</a></dd>
+				
+					
+					<dd>&nbsp; &nbsp; <a href="#T.Fail">func (c *T) Fail()</a></dd>
+				
+					
+					<dd>&nbsp; &nbsp; <a href="#T.FailNow">func (c *T) FailNow()</a></dd>
+				
+					
+					<dd>&nbsp; &nbsp; <a href="#T.Failed">func (c *T) Failed() bool</a></dd>
+				
+					
+					<dd>&nbsp; &nbsp; <a href="#T.Fatal">func (c *T) Fatal(args ...interface{})</a></dd>
+				
+					
+					<dd>&nbsp; &nbsp; <a href="#T.Fatalf">func (c *T) Fatalf(format string, args ...interface{})</a></dd>
+				
+					
+					<dd>&nbsp; &nbsp; <a href="#T.Log">func (c *T) Log(args ...interface{})</a></dd>
+				
+					
+					<dd>&nbsp; &nbsp; <a href="#T.Logf">func (c *T) Logf(format string, args ...interface{})</a></dd>
+				
+					
+					<dd>&nbsp; &nbsp; <a href="#T.Parallel">func (t *T) Parallel()</a></dd>
+				
+			
+			
+		</dl>
+
+		
+
+		
+			<h4>Package files</h4>
+			<p>
+			<span style="font-size:90%">
+			
+				<a href="/src/pkg/testing/benchmark.go">benchmark.go</a>
+			
+				<a href="/src/pkg/testing/example.go">example.go</a>
+			
+				<a href="/src/pkg/testing/testing.go">testing.go</a>
+			
+			</span>
+			</p>
+		
+	
+		
+		
+		
+			
+			
+			<h2 id="Main">func <a href="/src/pkg/testing/testing.go?s=9750:9890#L268">Main</a></h2>
+			<pre>func Main(matchString func(pat, str string) (bool, error), tests []InternalTest, benchmarks []InternalBenchmark, examples []InternalExample)</pre>
+			<p>
+An internal function but exported because it is cross-package; part of the implementation
+of the &#34;go test&#34; command.
+</p>
+
+			
+		
+			
+			
+			<h2 id="RunBenchmarks">func <a href="/src/pkg/testing/benchmark.go?s=5365:5464#L207">RunBenchmarks</a></h2>
+			<pre>func RunBenchmarks(matchString func(pat, str string) (bool, error), benchmarks []InternalBenchmark)</pre>
+			<p>
+An internal function but exported because it is cross-package; part of the implementation
+of the &#34;go test&#34; command.
+</p>
+
+			
+		
+			
+			
+			<h2 id="RunExamples">func <a href="/src/pkg/testing/example.go?s=314:417#L12">RunExamples</a></h2>
+			<pre>func RunExamples(matchString func(pat, str string) (bool, error), examples []InternalExample) (ok bool)</pre>
+			
+			
+		
+			
+			
+			<h2 id="RunTests">func <a href="/src/pkg/testing/testing.go?s=10486:10580#L297">RunTests</a></h2>
+			<pre>func RunTests(matchString func(pat, str string) (bool, error), tests []InternalTest) (ok bool)</pre>
+			
+			
+		
+			
+			
+			<h2 id="Short">func <a href="/src/pkg/testing/testing.go?s=4859:4876#L117">Short</a></h2>
+			<pre>func Short() bool</pre>
+			<p>
+Short reports whether the -test.short flag is set.
+</p>
+
+			
+		
+		
+			
+			
+			<h2 id="B">type <a href="/src/pkg/testing/benchmark.go?s=743:872#L17">B</a></h2>
+			<pre>type B struct {
+    N int
+    <span class="comment">// contains filtered or unexported fields</span>
+}</pre>
+			<p>
+B is a type passed to Benchmark functions to manage benchmark
+timing and to specify the number of iterations to run.
+</p>
+
+
+			
+
+			
+
+			
+
+			
+
+			
+				
+				<h3 id="B.Error">func (*B) <a href="/src/pkg/testing/testing.go?s=8110:8153#L209">Error</a></h3>
+				<pre>func (c *B) Error(args ...interface{})</pre>
+				<p>
+Error is equivalent to Log() followed by Fail().
+</p>
+
+				
+				
+			
+				
+				<h3 id="B.Errorf">func (*B) <a href="/src/pkg/testing/testing.go?s=8253:8312#L215">Errorf</a></h3>
+				<pre>func (c *B) Errorf(format string, args ...interface{})</pre>
+				<p>
+Errorf is equivalent to Logf() followed by Fail().
+</p>
+
+				
+				
+			
+				
+				<h3 id="B.Fail">func (*B) <a href="/src/pkg/testing/testing.go?s=6270:6293#L163">Fail</a></h3>
+				<pre>func (c *B) Fail()</pre>
+				<p>
+Fail marks the function as having failed but continues execution.
+</p>
+
+				
+				
+			
+				
+				<h3 id="B.FailNow">func (*B) <a href="/src/pkg/testing/testing.go?s=6548:6574#L170">FailNow</a></h3>
+				<pre>func (c *B) FailNow()</pre>
+				<p>
+FailNow marks the function as having failed and stops its execution.
+Execution will continue at the next test or benchmark.
+</p>
+
+				
+				
+			
+				
+				<h3 id="B.Failed">func (*B) <a href="/src/pkg/testing/testing.go?s=6366:6396#L166">Failed</a></h3>
+				<pre>func (c *B) Failed() bool</pre>
+				<p>
+Failed returns whether the function has failed.
+</p>
+
+				
+				
+			
+				
+				<h3 id="B.Fatal">func (*B) <a href="/src/pkg/testing/testing.go?s=8420:8463#L221">Fatal</a></h3>
+				<pre>func (c *B) Fatal(args ...interface{})</pre>
+				<p>
+Fatal is equivalent to Log() followed by FailNow().
+</p>
+
+				
+				
+			
+				
+				<h3 id="B.Fatalf">func (*B) <a href="/src/pkg/testing/testing.go?s=8569:8628#L227">Fatalf</a></h3>
+				<pre>func (c *B) Fatalf(format string, args ...interface{})</pre>
+				<p>
+Fatalf is equivalent to Logf() followed by FailNow().
+</p>
+
+				
+				
+			
+				
+				<h3 id="B.Log">func (*B) <a href="/src/pkg/testing/testing.go?s=7763:7804#L202">Log</a></h3>
+				<pre>func (c *B) Log(args ...interface{})</pre>
+				<p>
+Log formats its arguments using default formatting, analogous to Println(),
+and records the text in the error log.
+</p>
+
+				
+				
+			
+				
+				<h3 id="B.Logf">func (*B) <a href="/src/pkg/testing/testing.go?s=7959:8016#L206">Logf</a></h3>
+				<pre>func (c *B) Logf(format string, args ...interface{})</pre>
+				<p>
+Logf formats its arguments according to the format, analogous to Printf(),
+and records the text in the error log.
+</p>
+
+				
+				
+			
+				
+				<h3 id="B.ResetTimer">func (*B) <a href="/src/pkg/testing/benchmark.go?s=1503:1527#L48">ResetTimer</a></h3>
+				<pre>func (b *B) ResetTimer()</pre>
+				<p>
+ResetTimer sets the elapsed benchmark time to zero.
+It does not affect whether the timer is running.
+</p>
+
+				
+				
+			
+				
+				<h3 id="B.SetBytes">func (*B) <a href="/src/pkg/testing/benchmark.go?s=1728:1757#L57">SetBytes</a></h3>
+				<pre>func (b *B) SetBytes(n int64)</pre>
+				<p>
+SetBytes records the number of bytes processed in a single operation.
+If this is called, the benchmark will report ns/op and MB/s.
+</p>
+
+				
+				
+			
+				
+				<h3 id="B.StartTimer">func (*B) <a href="/src/pkg/testing/benchmark.go?s=1047:1071#L29">StartTimer</a></h3>
+				<pre>func (b *B) StartTimer()</pre>
+				<p>
+StartTimer starts timing a test.  This function is called automatically
+before a benchmark starts, but it can also used to resume timing after
+a call to StopTimer.
+</p>
+
+				
+				
+			
+				
+				<h3 id="B.StopTimer">func (*B) <a href="/src/pkg/testing/benchmark.go?s=1288:1311#L39">StopTimer</a></h3>
+				<pre>func (b *B) StopTimer()</pre>
+				<p>
+StopTimer stops timing a test.  This can be used to pause the timer
+while performing complex initialization that you don&#39;t
+want to measure.
+</p>
+
+				
+				
+			
+		
+			
+			
+			<h2 id="BenchmarkResult">type <a href="/src/pkg/testing/benchmark.go?s=4206:4391#L165">BenchmarkResult</a></h2>
+			<pre>type BenchmarkResult struct {
+    N     int           <span class="comment">// The number of iterations.</span>
+    T     time.Duration <span class="comment">// The total time taken.</span>
+    Bytes int64         <span class="comment">// Bytes processed in one iteration.</span>
+}</pre>
+			<p>
+The results of a benchmark run.
+</p>
+
+
+			
+
+			
+
+			
+
+			
+				
+				<h3 id="Benchmark">func <a href="/src/pkg/testing/benchmark.go?s=7545:7589#L275">Benchmark</a></h3>
+				<pre>func Benchmark(f func(b *B)) BenchmarkResult</pre>
+				<p>
+Benchmark benchmarks a single function. Useful for creating
+custom benchmarks that do not use the &#34;go test&#34; command.
+</p>
+
+				
+			
+
+			
+				
+				<h3 id="BenchmarkResult.NsPerOp">func (BenchmarkResult) <a href="/src/pkg/testing/benchmark.go?s=4393:4433#L171">NsPerOp</a></h3>
+				<pre>func (r BenchmarkResult) NsPerOp() int64</pre>
+				
+				
+				
+			
+				
+				<h3 id="BenchmarkResult.String">func (BenchmarkResult) <a href="/src/pkg/testing/benchmark.go?s=4677:4717#L185">String</a></h3>
+				<pre>func (r BenchmarkResult) String() string</pre>
+				
+				
+				
+			
+		
+			
+			
+			<h2 id="InternalBenchmark">type <a href="/src/pkg/testing/benchmark.go?s=555:618#L10">InternalBenchmark</a></h2>
+			<pre>type InternalBenchmark struct {
+    Name string
+    F    func(b *B)
+}</pre>
+			<p>
+An internal type but exported because it is cross-package; part of the implementation
+of the &#34;go test&#34; command.
+</p>
+
+
+			
+
+			
+
+			
+
+			
+
+			
+		
+			
+			
+			<h2 id="InternalExample">type <a href="/src/pkg/testing/example.go?s=236:312#L6">InternalExample</a></h2>
+			<pre>type InternalExample struct {
+    Name   string
+    F      func()
+    Output string
+}</pre>
+			
+
+			
+
+			
+
+			
+
+			
+
+			
+		
+			
+			
+			<h2 id="InternalTest">type <a href="/src/pkg/testing/testing.go?s=9065:9121#L241">InternalTest</a></h2>
+			<pre>type InternalTest struct {
+    Name string
+    F    func(*T)
+}</pre>
+			<p>
+An internal type but exported because it is cross-package; part of the implementation
+of the &#34;go test&#34; command.
+</p>
+
+
+			
+
+			
+
+			
+
+			
+
+			
+		
+			
+			
+			<h2 id="T">type <a href="/src/pkg/testing/testing.go?s=6070:6199#L156">T</a></h2>
+			<pre>type T struct {
+    <span class="comment">// contains filtered or unexported fields</span>
+}</pre>
+			<p>
+T is a type passed to Test functions to manage test state and support formatted test logs.
+Logs are accumulated during execution and dumped to standard error when done.
+</p>
+
+
+			
+
+			
+
+			
+
+			
+
+			
+				
+				<h3 id="T.Error">func (*T) <a href="/src/pkg/testing/testing.go?s=8110:8153#L209">Error</a></h3>
+				<pre>func (c *T) Error(args ...interface{})</pre>
+				<p>
+Error is equivalent to Log() followed by Fail().
+</p>
+
+				
+				
+			
+				
+				<h3 id="T.Errorf">func (*T) <a href="/src/pkg/testing/testing.go?s=8253:8312#L215">Errorf</a></h3>
+				<pre>func (c *T) Errorf(format string, args ...interface{})</pre>
+				<p>
+Errorf is equivalent to Logf() followed by Fail().
+</p>
+
+				
+				
+			
+				
+				<h3 id="T.Fail">func (*T) <a href="/src/pkg/testing/testing.go?s=6270:6293#L163">Fail</a></h3>
+				<pre>func (c *T) Fail()</pre>
+				<p>
+Fail marks the function as having failed but continues execution.
+</p>
+
+				
+				
+			
+				
+				<h3 id="T.FailNow">func (*T) <a href="/src/pkg/testing/testing.go?s=6548:6574#L170">FailNow</a></h3>
+				<pre>func (c *T) FailNow()</pre>
+				<p>
+FailNow marks the function as having failed and stops its execution.
+Execution will continue at the next test or benchmark.
+</p>
+
+				
+				
+			
+				
+				<h3 id="T.Failed">func (*T) <a href="/src/pkg/testing/testing.go?s=6366:6396#L166">Failed</a></h3>
+				<pre>func (c *T) Failed() bool</pre>
+				<p>
+Failed returns whether the function has failed.
+</p>
+
+				
+				
+			
+				
+				<h3 id="T.Fatal">func (*T) <a href="/src/pkg/testing/testing.go?s=8420:8463#L221">Fatal</a></h3>
+				<pre>func (c *T) Fatal(args ...interface{})</pre>
+				<p>
+Fatal is equivalent to Log() followed by FailNow().
+</p>
+
+				
+				
+			
+				
+				<h3 id="T.Fatalf">func (*T) <a href="/src/pkg/testing/testing.go?s=8569:8628#L227">Fatalf</a></h3>
+				<pre>func (c *T) Fatalf(format string, args ...interface{})</pre>
+				<p>
+Fatalf is equivalent to Logf() followed by FailNow().
+</p>
+
+				
+				
+			
+				
+				<h3 id="T.Log">func (*T) <a href="/src/pkg/testing/testing.go?s=7763:7804#L202">Log</a></h3>
+				<pre>func (c *T) Log(args ...interface{})</pre>
+				<p>
+Log formats its arguments using default formatting, analogous to Println(),
+and records the text in the error log.
+</p>
+
+				
+				
+			
+				
+				<h3 id="T.Logf">func (*T) <a href="/src/pkg/testing/testing.go?s=7959:8016#L206">Logf</a></h3>
+				<pre>func (c *T) Logf(format string, args ...interface{})</pre>
+				<p>
+Logf formats its arguments according to the format, analogous to Printf(),
+and records the text in the error log.
+</p>
+
+				
+				
+			
+				
+				<h3 id="T.Parallel">func (*T) <a href="/src/pkg/testing/testing.go?s=8809:8831#L234">Parallel</a></h3>
+				<pre>func (t *T) Parallel()</pre>
+				<p>
+Parallel signals that this test is to be run in parallel with (and only with)
+other parallel tests in this CPU group.
+</p>
+
+				
+				
+			
+		
+		</div>
+	
+
+	
+
+
+
+
+
+
+
+	
+	
+		<h2 id="subdirectories">Subdirectories</h2>
+	
+	<table class="dir">
+	<tr>
+	<th>Name</th>
+	<th>&nbsp;&nbsp;&nbsp;&nbsp;</th>
+	<th style="text-align: left; width: auto">Synopsis</th>
+	</tr>
+	
+		<tr>
+		<td><a href="..">..</a></td>
+		</tr>
+	
+	
+		
+			<tr>
+			<td class="name"><a href="iotest">iotest</a></td>
+			<td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
+			<td style="width: auto">Package iotest implements Readers and Writers useful mainly for testing.</td>
+			</tr>
+		
+	
+		
+			<tr>
+			<td class="name"><a href="quick">quick</a></td>
+			<td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
+			<td style="width: auto">Package quick implements utility functions to help with black box testing.</td>
+			</tr>
+		
+	
+	</table>
+	
+
+
+
+</div>
+
+<div id="footer">
+Build version go1.0.2.<br>
+Except as <a href="http://code.google.com/policies.html#restrictions">noted</a>,
+the content of this page is licensed under the
+Creative Commons Attribution 3.0 License,
+and code is licensed under a <a href="/LICENSE">BSD license</a>.<br>
+<a href="/doc/tos.html">Terms of Service</a> | 
+<a href="http://www.google.com/intl/en/privacy/privacy-policy.html">Privacy Policy</a>
+</div>
+
+<script type="text/javascript">
+(function() {
+  var ga = document.createElement("script"); ga.type = "text/javascript"; ga.async = true;
+  ga.src = ("https:" == document.location.protocol ? "https://ssl" : "http://www") + ".google-analytics.com/ga.js";
+  var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(ga, s);
+})();
+</script>
+</body>
+<script type="text/javascript">
+  (function() {
+    var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
+    po.src = 'https://apis.google.com/js/plusone.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
+  })();
+</script>
+</html>
+
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/testdata/gowiki.html b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/testdata/gowiki.html
new file mode 100644
index 00000000..2ed6bb71
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/testdata/gowiki.html
@@ -0,0 +1,1214 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html lang="en" dir="ltr" class="client-nojs" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Go (programming language) - Wikipedia, the free encyclopedia</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="generator" content="MediaWiki 1.20wmf10" />
+<link rel="canonical" href="/wiki/Go_(programming_language)" />
+<link rel="alternate" type="application/x-wiki" title="Edit this page" href="/w/index.php?title=Go_(programming_language)&amp;action=edit" />
+<link rel="edit" title="Edit this page" href="/w/index.php?title=Go_(programming_language)&amp;action=edit" />
+<link rel="apple-touch-icon" href="//en.wikipedia.org/apple-touch-icon.png" />
+<link rel="shortcut icon" href="/favicon.ico" />
+<link rel="search" type="application/opensearchdescription+xml" href="/w/opensearch_desc.php" title="Wikipedia (en)" />
+<link rel="EditURI" type="application/rsd+xml" href="//en.wikipedia.org/w/api.php?action=rsd" />
+<link rel="copyright" href="//creativecommons.org/licenses/by-sa/3.0/" />
+<link rel="alternate" type="application/atom+xml" title="Wikipedia Atom feed" href="/w/index.php?title=Special:RecentChanges&amp;feed=atom" />
+<link rel="stylesheet" href="//bits.wikimedia.org/en.wikipedia.org/load.php?debug=false&amp;lang=en&amp;modules=ext.gadget.ReferenceTooltips%2Cteahouse%7Cext.geshi.local%7Cext.wikihiero%7Cmediawiki.legacy.commonPrint%2Cshared%7Cskins.vector&amp;only=styles&amp;skin=vector&amp;*" type="text/css" media="all" />
+<meta name="ResourceLoaderDynamicStyles" content="" />
+<link rel="stylesheet" href="//bits.wikimedia.org/en.wikipedia.org/load.php?debug=false&amp;lang=en&amp;modules=site&amp;only=styles&amp;skin=vector&amp;*" type="text/css" media="all" />
+<style type="text/css" media="all">a:lang(ar),a:lang(ckb),a:lang(fa),a:lang(kk-arab),a:lang(mzn),a:lang(ps),a:lang(ur){text-decoration:none}
+
+/* cache key: enwiki:resourceloader:filter:minify-css:7:8d95de22da3b74bdc8517ef8752d1bee */
+</style>
+
+<script src="//bits.wikimedia.org/en.wikipedia.org/load.php?debug=false&amp;lang=en&amp;modules=startup&amp;only=scripts&amp;skin=vector&amp;*" type="text/javascript"></script>
+<script type="text/javascript">if(window.mw){
+mw.config.set({"wgCanonicalNamespace":"","wgCanonicalSpecialPageName":false,"wgNamespaceNumber":0,"wgPageName":"Go_(programming_language)","wgTitle":"Go (programming language)","wgCurRevisionId":508833010,"wgArticleId":25039021,"wgIsArticle":true,"wgAction":"view","wgUserName":null,"wgUserGroups":["*"],"wgCategories":["Wikipedia introduction cleanup from March 2012","All pages needing cleanup","Articles covered by WikiProject Wikify from March 2012","All articles covered by WikiProject Wikify","All articles with unsourced statements","Articles with unsourced statements from May 2012","Articles containing potentially dated statements from March 2012","All articles containing potentially dated statements","Use dmy dates from August 2011","C programming language family","Concurrent programming languages","Google software","Procedural programming languages","Systems programming languages","Cross-platform software","Programming languages created in 2009","American inventions"],"wgBreakFrames":false,"wgPageContentLanguage":"en","wgSeparatorTransformTable":["",""],"wgDigitTransformTable":["",""],"wgDefaultDateFormat":"dmy","wgMonthNames":["","January","February","March","April","May","June","July","August","September","October","November","December"],"wgMonthNamesShort":["","Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],"wgRelevantPageName":"Go_(programming_language)","wgRestrictionEdit":[],"wgRestrictionMove":[],"wgSearchNamespaces":[0],"wgRedirectedFrom":"Golang","wgVectorEnabledModules":{"collapsiblenav":true,"collapsibletabs":true,"editwarning":true,"expandablesearch":false,"footercleanup":false,"sectioneditlinks":false,"simplesearch":true,"experiments":true},"wgWikiEditorEnabledModules":{"toolbar":true,"dialogs":true,"hidesig":true,"templateEditor":false,"templates":false,"preview":false,"previewDialog":false,"publish":false,"toc":false},"wgTrackingToken":"729ec9a203fdeb630fabc00c6350e6c9","wgArticleFeedbackv5Permissions":{"aft-reader":true,"aft-member":false,"aft-editor":false,"aft-monitor":false,"aft-administrator":false,"aft-oversighter":false},"wikilove-recipient":"","wikilove-anon":0,"mbEmailEnabled":true,"mbUserEmail":false,"mbIsEmailConfirmationPending":false,"wgFlaggedRevsParams":{"tags":{"status":{"levels":1,"quality":2,"pristine":3}}},"wgStableRevisionId":null,"wgCategoryTreePageCategoryOptions":"{\"mode\":0,\"hideprefix\":20,\"showcount\":true,\"namespaces\":false}","Geo":{"city":"","country":""},"wgNoticeProject":"wikipedia","aftv5Whitelist":false});
+}</script><script type="text/javascript">if(window.mw){
+mw.loader.implement("user.options",function(){mw.user.options.set({"ccmeonemails":0,"cols":80,"date":"default","diffonly":0,"disablemail":0,"disablesuggest":0,"editfont":"default","editondblclick":0,"editsection":1,"editsectiononrightclick":0,"enotifminoredits":0,"enotifrevealaddr":0,"enotifusertalkpages":1,"enotifwatchlistpages":0,"extendwatchlist":0,"externaldiff":0,"externaleditor":0,"fancysig":0,"forceeditsummary":0,"gender":"unknown","hideminor":0,"hidepatrolled":0,"imagesize":2,"justify":0,"math":0,"minordefault":0,"newpageshidepatrolled":0,"nocache":0,"noconvertlink":0,"norollbackdiff":0,"numberheadings":0,"previewonfirst":0,"previewontop":1,"quickbar":5,"rcdays":7,"rclimit":50,"rememberpassword":0,"rows":25,"searchlimit":20,"showhiddencats":false,"showjumplinks":1,"shownumberswatching":1,"showtoc":1,"showtoolbar":1,"skin":"vector","stubthreshold":0,"thumbsize":4,"underline":2,"uselivepreview":0,"usenewrc":0,"watchcreations":1,"watchdefault":0,"watchdeletion":0,"watchlistdays":3
+,"watchlisthideanons":0,"watchlisthidebots":0,"watchlisthideliu":0,"watchlisthideminor":0,"watchlisthideown":0,"watchlisthidepatrolled":0,"watchmoves":0,"wllimit":250,"flaggedrevssimpleui":1,"flaggedrevsstable":0,"flaggedrevseditdiffs":true,"flaggedrevsviewdiffs":false,"vector-simplesearch":1,"useeditwarning":1,"vector-collapsiblenav":1,"usebetatoolbar":1,"usebetatoolbar-cgd":1,"wikilove-enabled":1,"variant":"en","language":"en","searchNs0":true,"searchNs1":false,"searchNs2":false,"searchNs3":false,"searchNs4":false,"searchNs5":false,"searchNs6":false,"searchNs7":false,"searchNs8":false,"searchNs9":false,"searchNs10":false,"searchNs11":false,"searchNs12":false,"searchNs13":false,"searchNs14":false,"searchNs15":false,"searchNs100":false,"searchNs101":false,"searchNs108":false,"searchNs109":false,"gadget-teahouse":1,"gadget-ReferenceTooltips":1,"gadget-DRN-wizard":1,"gadget-mySandbox":1});;},{},{});mw.loader.implement("user.tokens",function(){mw.user.tokens.set({"editToken":"+\\",
+"watchToken":false});;},{},{});
+
+/* cache key: enwiki:resourceloader:filter:minify-js:7:81f7c0502e347822f14be81f96ff03ab */
+}</script>
+<script type="text/javascript">if(window.mw){
+mw.loader.load(["mediawiki.page.startup","mediawiki.legacy.wikibits","mediawiki.legacy.ajax","ext.wikimediaShopLink.core","ext.centralNotice.bannerController"]);
+}</script>
+<style type="text/css">/*<![CDATA[*/
+.source-go {line-height: normal;}
+.source-go li, .source-go pre {
+	line-height: normal; border: 0px none white;
+}
+/**
+ * GeSHi Dynamically Generated Stylesheet
+ * --------------------------------------
+ * Dynamically generated stylesheet for go
+ * CSS class: source-go, CSS id: 
+ * GeSHi (C) 2004 - 2007 Nigel McNie, 2007 - 2008 Benny Baumann
+ * (http://qbnz.com/highlighter/ and http://geshi.org/)
+ * --------------------------------------
+ */
+.go.source-go .de1, .go.source-go .de2 {font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;}
+.go.source-go  {font-family:monospace;}
+.go.source-go .imp {font-weight: bold; color: red;}
+.go.source-go li, .go.source-go .li1 {font-weight: normal; vertical-align:top;}
+.go.source-go .ln {width:1px;text-align:right;margin:0;padding:0 2px;vertical-align:top;}
+.go.source-go .li2 {font-weight: bold; vertical-align:top;}
+.go.source-go .kw1 {color: #b1b100; font-weight: bold;}
+.go.source-go .kw2 {color: #000000; font-weight: bold;}
+.go.source-go .kw3 {color: #000066;}
+.go.source-go .kw4 {color: #993333;}
+.go.source-go .kw5 {color: #003399;}
+.go.source-go .co1 {color: #666666; font-style: italic;}
+.go.source-go .co2 {color: #0000ff;}
+.go.source-go .coMULTI {color: #666666; font-style: italic;}
+.go.source-go .es1 {color: #000099; font-weight: bold;}
+.go.source-go .es2 {color: #000099;}
+.go.source-go .es3 {color: #000099;}
+.go.source-go .es4 {color: #000099;}
+.go.source-go .es5 {color: #000099;}
+.go.source-go .sy1 {color: #339933;}
+.go.source-go .sy2 {color: #339933;}
+.go.source-go .sy3 {color: #339933;}
+.go.source-go .sy4 {color: #000000; font-weight: bold;}
+.go.source-go .st0 {color: #cc66cc;}
+.go.source-go .nu0 {color: #cc66cc;}
+.go.source-go .me0 {color: #004000;}
+.go.source-go .ln-xtra, .go.source-go li.ln-xtra, .go.source-go div.ln-xtra {background-color: #ffc;}
+.go.source-go span.xtra { display:block; }
+
+/*]]>*/
+</style><script src="//bits.wikimedia.org/geoiplookup"></script><!--[if lt IE 7]><style type="text/css">body{behavior:url("/w/skins-1.20wmf10/vector/csshover.min.htc")}</style><![endif]--></head>
+<body class="mediawiki ltr sitedir-ltr ns-0 ns-subject page-Go_programming_language skin-vector action-view vector-animateLayout">
+		<div id="mw-page-base" class="noprint"></div>
+		<div id="mw-head-base" class="noprint"></div>
+		<!-- content -->
+		<div id="content" class="mw-body">
+			<a id="top"></a>
+			<div id="mw-js-message" style="display:none;"></div>
+						<!-- sitenotice -->
+			<div id="siteNotice"><!-- CentralNotice --><script>mw.centralNotice.initialize();</script></div>
+			<!-- /sitenotice -->
+						<!-- firstHeading -->
+			<h1 id="firstHeading" class="firstHeading"><span dir="auto">Go (programming language)</span></h1>
+			<!-- /firstHeading -->
+			<!-- bodyContent -->
+			<div id="bodyContent">
+								<!-- tagline -->
+				<div id="siteSub">From Wikipedia, the free encyclopedia</div>
+				<!-- /tagline -->
+								<!-- subtitle -->
+				<div id="contentSub">  (Redirected from <a href="/w/index.php?title=Golang&amp;redirect=no" title="Golang">Golang</a>)</div>
+				<!-- /subtitle -->
+																<!-- jumpto -->
+				<div id="jump-to-nav" class="mw-jump">
+					Jump to:					<a href="#mw-head">navigation</a>, 					<a href="#p-search">search</a>
+				</div>
+				<!-- /jumpto -->
+								<!-- bodycontent -->
+				<div id="mw-content-text" lang="en" dir="ltr" class="mw-content-ltr"><div style="display:none;" class="pef-notification-container">
+	<div class="pef-notification">
+		<div class="pef-notification-checkmark">&nbsp;</div>
+		<span></span>
+	</div>
+</div><div class="dablink">Not to be confused with <a href="/wiki/Go!_(programming_language)" title="Go! (programming language)">Go! (programming language)</a>, an agent-based language released in 2003.</div>
+<table class="metadata plainlinks ambox ambox-style ambox-lead_too_short" style="">
+<tr>
+<td class="mbox-image">
+<div style="width: 52px;"><img alt="" src="//upload.wikimedia.org/wikipedia/en/thumb/f/f2/Edit-clear.svg/40px-Edit-clear.svg.png" width="40" height="40" /></div>
+</td>
+<td class="mbox-text" style=""><span class="mbox-text-span">This article's <b><a href="/wiki/Wikipedia:Manual_of_Style/Lead_section" title="Wikipedia:Manual of Style/Lead section">lead section</a> may not adequately <a href="/wiki/Wikipedia:Summary_style" title="Wikipedia:Summary style">summarize</a> all of its contents</b>. <span class="hide-when-compact">Please consider expanding the lead to <a href="/wiki/Wikipedia:Manual_of_Style/Lead_section#Provide_an_accessible_overview" title="Wikipedia:Manual of Style/Lead section">provide an accessible overview</a> of <i>all</i> of the article's key points.</span> <small><i>(March 2012)</i></small> </span></td>
+</tr>
+</table>
+<table class="infobox vevent" cellspacing="5" style="width:22em;">
+<caption class="summary" style="">Go</caption>
+<tr class="">
+<td colspan="2" class="" style="text-align:center;"><a href="/wiki/File:Golang.png" class="image"><img alt="Golang.png" src="//upload.wikimedia.org/wikipedia/en/2/23/Golang.png" width="153" height="55" /></a></td>
+</tr>
+<tr class="">
+<th scope="row" style="text-align:left;"><a href="/wiki/Programming_paradigm" title="Programming paradigm">Paradigm(s)</a></th>
+<td class="" style=""><a href="/wiki/Compiled_language" title="Compiled language">compiled</a>, <a href="/wiki/Concurrent_programming" title="Concurrent programming" class="mw-redirect">concurrent</a>, <a href="/wiki/Imperative_programming" title="Imperative programming">imperative</a>, <a href="/wiki/Structured_programming" title="Structured programming">structured</a></td>
+</tr>
+<tr class="">
+<th scope="row" style="text-align:left;">Appeared in</th>
+<td class="" style="">2009</td>
+</tr>
+<tr class="">
+<th scope="row" style="text-align:left;">Designed by</th>
+<td class="organiser" style="">Robert Griesemer<br />
+<a href="/wiki/Rob_Pike" title="Rob Pike">Rob Pike</a><br />
+<a href="/wiki/Ken_Thompson" title="Ken Thompson">Ken Thompson</a></td>
+</tr>
+<tr class="">
+<th scope="row" style="text-align:left;"><a href="/wiki/Software_developer" title="Software developer">Developer</a></th>
+<td class="" style=""><a href="/wiki/Google" title="Google">Google Inc.</a></td>
+</tr>
+<tr class="">
+<th scope="row" style="text-align:left;"><a href="/wiki/Software_release_life_cycle" title="Software release life cycle">Stable release</a></th>
+<td class="" style="">version 1.0.2<sup id="cite_ref-0" class="reference"><a href="#cite_note-0"><span>[</span>1<span>]</span></a></sup> (14 June 2012<span class="noprint">; 2 months ago</span><span style="display:none">&#160;(<span class="bday dtstart published updated">2012-06-14</span>)</span>)</td>
+</tr>
+<tr class="">
+<th scope="row" style="text-align:left;"><a href="/wiki/Type_system" title="Type system">Typing discipline</a></th>
+<td class="" style=""><a href="/wiki/Strong_typing" title="Strong typing">strong</a>, <a href="/wiki/Static_typing" title="Static typing" class="mw-redirect">static</a></td>
+</tr>
+<tr class="">
+<th scope="row" style="text-align:left;"><a href="/wiki/Programming_language_implementation" title="Programming language implementation">Major implementations</a></th>
+<td class="" style="">gc (8g, 6g, 5g), gccgo</td>
+</tr>
+<tr class="">
+<th scope="row" style="text-align:left;">Influenced by</th>
+<td class="" style=""><a href="/wiki/C_(programming_language)" title="C (programming language)">C</a>, <a href="/wiki/Limbo_(programming_language)" title="Limbo (programming language)">Limbo</a>, <a href="/wiki/Modula" title="Modula">Modula</a>, <a href="/wiki/Newsqueak" title="Newsqueak">Newsqueak</a>, <a href="/wiki/Oberon_(programming_language)" title="Oberon (programming language)">Oberon</a>, <a href="/wiki/Pascal_(programming_language)" title="Pascal (programming language)">Pascal</a>,<sup id="cite_ref-langfaq_1-0" class="reference"><a href="#cite_note-langfaq-1"><span>[</span>2<span>]</span></a></sup> <a href="/wiki/Python_(programming_language)" title="Python (programming language)">Python</a></td>
+</tr>
+<tr class="">
+<th scope="row" style="text-align:left;"><a href="/wiki/Operating_system" title="Operating system">OS</a></th>
+<td class="" style=""><a href="/wiki/Linux" title="Linux">Linux</a>, <a href="/wiki/Mac_OS_X" title="Mac OS X" class="mw-redirect">Mac OS X</a>, <a href="/wiki/FreeBSD" title="FreeBSD">FreeBSD</a>, <a href="/wiki/OpenBSD" title="OpenBSD">OpenBSD</a>, <a href="/wiki/Microsoft_Windows" title="Microsoft Windows">MS Windows</a>, <a href="/wiki/Plan_9_from_Bell_Labs" title="Plan 9 from Bell Labs">Plan 9</a><sup id="cite_ref-2" class="reference"><a href="#cite_note-2"><span>[</span>3<span>]</span></a></sup></td>
+</tr>
+<tr class="">
+<th scope="row" style="text-align:left;"><a href="/wiki/Software_license" title="Software license">License</a></th>
+<td class="" style=""><a href="/wiki/BSD_licenses" title="BSD licenses">BSD</a>-style<sup id="cite_ref-3" class="reference"><a href="#cite_note-3"><span>[</span>4<span>]</span></a></sup> + Patent grant<sup id="cite_ref-4" class="reference"><a href="#cite_note-4"><span>[</span>5<span>]</span></a></sup></td>
+</tr>
+<tr class="">
+<th scope="row" style="text-align:left;">Usual <a href="/wiki/Filename_extension" title="Filename extension">filename extensions</a></th>
+<td class="" style="">.go</td>
+</tr>
+<tr class="">
+<th scope="row" style="text-align:left;">Website</th>
+<td class="" style=""><span class="url"><a rel="nofollow" class="external text" href="http://golang.org">golang.org</a></span></td>
+</tr>
+</table>
+<p><b>Go</b> is a <a href="/wiki/Compiled_language" title="Compiled language">compiled</a>, <a href="/wiki/Garbage_collection_(computer_science)" title="Garbage collection (computer science)">garbage-collected</a>, <a href="/wiki/Concurrent_programming_language" title="Concurrent programming language" class="mw-redirect">concurrent</a> <a href="/wiki/Programming_language" title="Programming language">programming language</a> developed by <a href="/wiki/Google" title="Google">Google Inc.</a><sup id="cite_ref-5" class="reference"><a href="#cite_note-5"><span>[</span>6<span>]</span></a></sup></p>
+<p>The initial design of Go was started in September 2007 by <a href="/w/index.php?title=Robert_Griesemer&amp;action=edit&amp;redlink=1" class="new" title="Robert Griesemer (page does not exist)">Robert Griesemer</a>, <a href="/wiki/Rob_Pike" title="Rob Pike">Rob Pike</a>, and <a href="/wiki/Ken_Thompson" title="Ken Thompson">Ken Thompson</a>.<sup id="cite_ref-langfaq_1-1" class="reference"><a href="#cite_note-langfaq-1"><span>[</span>2<span>]</span></a></sup> Go was officially announced in November 2009. In May 2010, Rob Pike publicly stated that Go was being used "for real stuff" at Google.<sup id="cite_ref-register_6-0" class="reference"><a href="#cite_note-register-6"><span>[</span>7<span>]</span></a></sup> Go's "gc" compiler targets the <a href="/wiki/Linux" title="Linux">Linux</a>, <a href="/wiki/Mac_OS_X" title="Mac OS X" class="mw-redirect">Mac OS X</a>, <a href="/wiki/FreeBSD" title="FreeBSD">FreeBSD</a>, <a href="/wiki/OpenBSD" title="OpenBSD">OpenBSD</a>, <a href="/wiki/Plan_9_from_Bell_Labs" title="Plan 9 from Bell Labs">Plan 9</a>, and <a href="/wiki/Microsoft_Windows" title="Microsoft Windows">Microsoft Windows</a> operating systems and the <a href="/wiki/I386" title="I386" class="mw-redirect">i386</a>, <a href="/wiki/Amd64" title="Amd64" class="mw-redirect">amd64</a>, and <a href="/wiki/ARM" title="ARM" class="mw-redirect">ARM</a> processor architectures.<sup id="cite_ref-7" class="reference"><a href="#cite_note-7"><span>[</span>8<span>]</span></a></sup></p>
+<table id="toc" class="toc">
+<tr>
+<td>
+<div id="toctitle">
+<h2>Contents</h2>
+</div>
+<ul>
+<li class="toclevel-1 tocsection-1"><a href="#Goals"><span class="tocnumber">1</span> <span class="toctext">Goals</span></a></li>
+<li class="toclevel-1 tocsection-2"><a href="#Description"><span class="tocnumber">2</span> <span class="toctext">Description</span></a></li>
+<li class="toclevel-1 tocsection-3"><a href="#Type_system"><span class="tocnumber">3</span> <span class="toctext">Type system</span></a></li>
+<li class="toclevel-1 tocsection-4"><a href="#Name_visibility"><span class="tocnumber">4</span> <span class="toctext">Name visibility</span></a></li>
+<li class="toclevel-1 tocsection-5"><a href="#Concurrency"><span class="tocnumber">5</span> <span class="toctext">Concurrency</span></a></li>
+<li class="toclevel-1 tocsection-6"><a href="#Implementations"><span class="tocnumber">6</span> <span class="toctext">Implementations</span></a></li>
+<li class="toclevel-1 tocsection-7"><a href="#Examples"><span class="tocnumber">7</span> <span class="toctext">Examples</span></a>
+<ul>
+<li class="toclevel-2 tocsection-8"><a href="#Hello_world"><span class="tocnumber">7.1</span> <span class="toctext">Hello world</span></a></li>
+<li class="toclevel-2 tocsection-9"><a href="#Echo"><span class="tocnumber">7.2</span> <span class="toctext">Echo</span></a></li>
+</ul>
+</li>
+<li class="toclevel-1 tocsection-10"><a href="#Reception"><span class="tocnumber">8</span> <span class="toctext">Reception</span></a></li>
+<li class="toclevel-1 tocsection-11"><a href="#Naming_dispute"><span class="tocnumber">9</span> <span class="toctext">Naming dispute</span></a></li>
+<li class="toclevel-1 tocsection-12"><a href="#See_also"><span class="tocnumber">10</span> <span class="toctext">See also</span></a></li>
+<li class="toclevel-1 tocsection-13"><a href="#References"><span class="tocnumber">11</span> <span class="toctext">References</span></a></li>
+<li class="toclevel-1 tocsection-14"><a href="#Further_reading"><span class="tocnumber">12</span> <span class="toctext">Further reading</span></a></li>
+<li class="toclevel-1 tocsection-15"><a href="#External_links"><span class="tocnumber">13</span> <span class="toctext">External links</span></a></li>
+</ul>
+</td>
+</tr>
+</table>
+<h2><span class="editsection">[<a href="/w/index.php?title=Go_(programming_language)&amp;action=edit&amp;section=1" title="Edit section: Goals">edit</a>]</span> <span class="mw-headline" id="Goals">Goals</span></h2>
+<p>Go aims to provide the efficiency of a <a href="/wiki/Statically_typed" title="Statically typed" class="mw-redirect">statically typed</a> compiled language with the ease of programming of a <a href="/wiki/Dynamic_programming_language" title="Dynamic programming language">dynamic language</a>.<sup id="cite_ref-go_lang_video_2009_8-0" class="reference"><a href="#cite_note-go_lang_video_2009-8"><span>[</span>9<span>]</span></a></sup> Other goals include:</p>
+<ul>
+<li>Safety: <a href="/wiki/Type-safe" title="Type-safe" class="mw-redirect">Type-safe</a> and <a href="/wiki/Memory_safety" title="Memory safety">memory-safe</a>.</li>
+<li>Good support for concurrency and communication.</li>
+<li>Efficient, latency-free garbage collection.</li>
+<li>High-speed compilation.</li>
+</ul>
+<h2><span class="editsection">[<a href="/w/index.php?title=Go_(programming_language)&amp;action=edit&amp;section=2" title="Edit section: Description">edit</a>]</span> <span class="mw-headline" id="Description">Description</span></h2>
+<p>The <a href="/wiki/Syntax_(programming_languages)" title="Syntax (programming languages)">syntax</a> of Go is broadly similar to that of <a href="/wiki/C_(programming_language)" title="C (programming language)">C</a>: blocks of code are surrounded with <a href="/wiki/Curly_brace" title="Curly brace" class="mw-redirect">curly braces</a>; common <a href="/wiki/Control_flow" title="Control flow">control flow</a> structures include <code><a href="/wiki/For_loop" title="For loop">for</a></code>, <code><a href="/wiki/Switch_statement" title="Switch statement">switch</a></code>, and <code><a href="/wiki/Conditional_(programming)" title="Conditional (programming)">if</a></code>. Unlike C, line-ending semicolons are optional, variable declarations are written differently and are usually optional, type conversions must be made explicit, and new <code>go</code> and <code>select</code> control keywords have been introduced to support concurrent programming. New built-in types include maps, Unicode strings, array slices, and channels for inter-thread communication.</p>
+<p>Go is designed for exceptionally fast compiling times, even on modest hardware.<sup id="cite_ref-techtalk-compiling_9-0" class="reference"><a href="#cite_note-techtalk-compiling-9"><span>[</span>10<span>]</span></a></sup> The language requires <a href="/wiki/Garbage_collection_(computer_science)" title="Garbage collection (computer science)">garbage collection</a>. Certain concurrency-related structural conventions of Go (<a href="/wiki/Channel_(programming)" title="Channel (programming)">channels</a> and alternative channel inputs) are borrowed from <a href="/wiki/C._A._R._Hoare" title="C. A. R. Hoare" class="mw-redirect">Tony Hoare's</a> <a href="/wiki/Communicating_sequential_processes" title="Communicating sequential processes">CSP</a>. Unlike previous concurrent programming languages such as <a href="/wiki/Occam_(programming_language)" title="Occam (programming language)">occam</a> or <a href="/wiki/Limbo_(programming_language)" title="Limbo (programming language)">Limbo</a>, Go does not provide any built-in notion of safe or verifiable concurrency.<sup id="cite_ref-memmodel_10-0" class="reference"><a href="#cite_note-memmodel-10"><span>[</span>11<span>]</span></a></sup></p>
+<p>Of features found in C++ or Java, Go does not include <a href="/wiki/Inheritance_(object-oriented_programming)" title="Inheritance (object-oriented programming)">type inheritance</a>, <a href="/wiki/Generic_programming" title="Generic programming">generic programming</a>, <a href="/wiki/Assertion_(computing)" title="Assertion (computing)">assertions</a>, <a href="/wiki/Method_overloading" title="Method overloading" class="mw-redirect">method overloading</a>, or <a href="/wiki/Pointer_arithmetic" title="Pointer arithmetic" class="mw-redirect">pointer arithmetic</a>.<sup id="cite_ref-langfaq_1-2" class="reference"><a href="#cite_note-langfaq-1"><span>[</span>2<span>]</span></a></sup> Of these, the Go authors express an openness to generic programming, explicitly argue against assertions and pointer arithmetic, while defending the choice to omit type inheritance as giving a more useful language, encouraging heavy use of <a href="/wiki/Protocol_(object-oriented_programming)" title="Protocol (object-oriented programming)">interfaces</a> instead.<sup id="cite_ref-langfaq_1-3" class="reference"><a href="#cite_note-langfaq-1"><span>[</span>2<span>]</span></a></sup> Initially, the language did not include <a href="/wiki/Exception_handling" title="Exception handling">exception handling</a>, but in March 2010 a mechanism known as <code>panic</code>/<code>recover</code> was implemented to handle exceptional errors while avoiding some of the problems the Go authors find with exceptions.<sup id="cite_ref-11" class="reference"><a href="#cite_note-11"><span>[</span>12<span>]</span></a></sup><sup id="cite_ref-12" class="reference"><a href="#cite_note-12"><span>[</span>13<span>]</span></a></sup></p>
+<h2><span class="editsection">[<a href="/w/index.php?title=Go_(programming_language)&amp;action=edit&amp;section=3" title="Edit section: Type system">edit</a>]</span> <span class="mw-headline" id="Type_system">Type system</span></h2>
+<p>Go allows a programmer to write functions that can operate on inputs of arbitrary type, provided that the type implements the functions defined by a given interface.</p>
+<p>Unlike <a href="/wiki/Java_(programming_language)" title="Java (programming language)">Java</a>, the interfaces a type supports do not need to be specified at the point at which the type is defined, and Go interfaces do not participate in a type hierarchy. A Go interface is best described as a set of methods, each identified by a name and signature. A type is considered to implement an interface if all the required methods have been defined for that type. An interface can be declared to "embed" other interfaces, meaning the declared interface includes the methods defined in the other interfaces.<sup id="cite_ref-memmodel_10-1" class="reference"><a href="#cite_note-memmodel-10"><span>[</span>11<span>]</span></a></sup></p>
+<p>Unlike Java, the in-memory representation of an object does not contain a pointer to a <a href="/wiki/Virtual_method_table" title="Virtual method table">virtual method table</a>. Instead a value of interface type is implemented as a pair of a pointer to the object, and a pointer to a dictionary containing implementations of the interface methods for that type.</p>
+<p>Consider the following example:</p>
+<div dir="ltr" class="mw-geshi mw-code mw-content-ltr">
+<div class="go source-go">
+<pre class="de1">
+<span class="kw1">type</span> Sequence <span class="sy1">[]</span><span class="kw4">int</span>
+ 
+<span class="kw4">func</span> <span class="sy1">(</span>s Sequence<span class="sy1">)</span> Len<span class="sy1">()</span> <span class="kw4">int</span> <span class="sy1">{</span>
+    <span class="kw1">return</span> <span class="kw3">len</span><span class="sy1">(</span>s<span class="sy1">)</span>
+<span class="sy1">}</span>
+ 
+<span class="kw1">type</span> HasLength <span class="kw4">interface</span> <span class="sy1">{</span>
+    Len<span class="sy1">()</span> <span class="kw4">int</span>
+<span class="sy1">}</span>
+ 
+<span class="kw4">func</span> Foo <span class="sy1">(</span>o HasLength<span class="sy1">)</span> <span class="sy1">{</span>
+    <span class="sy4">...</span>
+<span class="sy1">}</span>
+</pre></div>
+</div>
+<p>These four definitions could have been placed in separate files, in different parts of the program. Notably, the programmer who defined the <code>Sequence</code> type did not need to declare that the type implemented <code>HasLength</code>, and the person who implemented the <code>Len</code> method for <code>Sequence</code> did not need to specify that this method was part of <code>HasLength</code>.</p>
+<h2><span class="editsection">[<a href="/w/index.php?title=Go_(programming_language)&amp;action=edit&amp;section=4" title="Edit section: Name visibility">edit</a>]</span> <span class="mw-headline" id="Name_visibility">Name visibility</span></h2>
+<p><a href="/wiki/Linkage_(software)" title="Linkage (software)">Visibility</a> of structures, structure fields, variables, constants, methods, top-level types and functions outside their defining package is defined implicitly according to the capitalization of their identifier.<sup id="cite_ref-13" class="reference"><a href="#cite_note-13"><span>[</span>14<span>]</span></a></sup></p>
+<h2><span class="editsection">[<a href="/w/index.php?title=Go_(programming_language)&amp;action=edit&amp;section=5" title="Edit section: Concurrency">edit</a>]</span> <span class="mw-headline" id="Concurrency">Concurrency</span></h2>
+<p>Go provides <i>goroutines</i>, small lightweight threads; the name alludes to <a href="/wiki/Coroutine" title="Coroutine">coroutines</a>. Goroutines are created with the <code>go</code> statement from anonymous or named functions.</p>
+<p>Goroutines are executed in parallel with other goroutines, including their caller. They do not necessarily run in separate threads, but a group of goroutines are multiplexed onto multiple threads — execution control is moved between them by blocking them when sending or receiving messages over channels.</p>
+<h2><span class="editsection">[<a href="/w/index.php?title=Go_(programming_language)&amp;action=edit&amp;section=6" title="Edit section: Implementations">edit</a>]</span> <span class="mw-headline" id="Implementations">Implementations</span></h2>
+<p>There are currently two Go compilers:</p>
+<ul>
+<li>6g/8g/5g (the compilers for AMD64, x86, and ARM respectively) with their supporting tools (collectively known as "gc") based on Ken's previous work on <a href="/wiki/Plan_9_from_Bell_Labs" title="Plan 9 from Bell Labs">Plan 9</a>'s C toolchain.</li>
+<li>gccgo, a <a href="/wiki/GNU_Compiler_Collection" title="GNU Compiler Collection">GCC</a> frontend written in C++,<sup id="cite_ref-14" class="reference"><a href="#cite_note-14"><span>[</span>15<span>]</span></a></sup> and now officially supported as of version 4.6, albeit not part of the standard binary for gcc.<sup id="cite_ref-15" class="reference"><a href="#cite_note-15"><span>[</span>16<span>]</span></a></sup></li>
+</ul>
+<p>Both compilers work on Unix-like systems, and a port to Microsoft Windows of the gc compiler and runtime have been integrated in the main distribution. Most of the standard libraries also work on Windows.</p>
+<p>There is also an unmaintained "tiny" runtime environment that allows Go programs to run on bare hardware.<sup id="cite_ref-16" class="reference"><a href="#cite_note-16"><span>[</span>17<span>]</span></a></sup></p>
+<h2><span class="editsection">[<a href="/w/index.php?title=Go_(programming_language)&amp;action=edit&amp;section=7" title="Edit section: Examples">edit</a>]</span> <span class="mw-headline" id="Examples">Examples</span></h2>
+<h3><span class="editsection">[<a href="/w/index.php?title=Go_(programming_language)&amp;action=edit&amp;section=8" title="Edit section: Hello world">edit</a>]</span> <span class="mw-headline" id="Hello_world">Hello world</span></h3>
+<p>The following is a <a href="/wiki/Hello_world_program" title="Hello world program">Hello world program</a> in Go:</p>
+<div dir="ltr" class="mw-geshi mw-code mw-content-ltr">
+<div class="go source-go">
+<pre class="de1">
+<span class="kw1">package</span> main
+ 
+<span class="kw1">import</span> <span class="st0">"fmt"</span>
+ 
+<span class="kw4">func</span> main<span class="sy1">()</span> <span class="sy1">{</span>
+        fmt<span class="sy3">.</span>Println<span class="sy1">(</span><span class="st0">"Hello, World"</span><span class="sy1">)</span>
+<span class="sy1">}</span>
+</pre></div>
+</div>
+<p>Go's automatic <a href="/wiki/Semicolon" title="Semicolon">semicolon</a> insertion feature requires that opening braces not be placed on their own lines, and this is thus the preferred <a href="/wiki/Brace_style" title="Brace style" class="mw-redirect">brace style</a>; the examples shown comply with this style.<sup id="cite_ref-17" class="reference"><a href="#cite_note-17"><span>[</span>18<span>]</span></a></sup></p>
+<h3><span class="editsection">[<a href="/w/index.php?title=Go_(programming_language)&amp;action=edit&amp;section=9" title="Edit section: Echo">edit</a>]</span> <span class="mw-headline" id="Echo">Echo</span></h3>
+<p>Example illustrating how to write a program like the Unix <a href="/wiki/Echo_(command)" title="Echo (command)">echo command</a> in Go:<sup id="cite_ref-18" class="reference"><a href="#cite_note-18"><span>[</span>19<span>]</span></a></sup></p>
+<div dir="ltr" class="mw-geshi mw-code mw-content-ltr">
+<div class="go source-go">
+<pre class="de1">
+<span class="kw1">package</span> main
+ 
+<span class="kw1">import</span> <span class="sy1">(</span>
+        <span class="st0">"os"</span>
+        <span class="st0">"flag"</span>  <span class="co1">// command line option parser</span>
+<span class="sy1">)</span>
+ 
+<span class="kw1">var</span> omitNewline <span class="sy2">=</span> flag<span class="sy3">.</span>Bool<span class="sy1">(</span><span class="st0">"n"</span><span class="sy1">,</span> <span class="kw2">false</span><span class="sy1">,</span> <span class="st0">"don't print final newline"</span><span class="sy1">)</span>
+ 
+<span class="kw1">const</span> <span class="sy1">(</span>
+        Space <span class="sy2">=</span> <span class="st0">" "</span>
+        Newline <span class="sy2">=</span> <span class="st0">"<span class="es1">\n</span>"</span>
+<span class="sy1">)</span>
+ 
+<span class="kw4">func</span> main<span class="sy1">()</span> <span class="sy1">{</span>
+        flag<span class="sy3">.</span>Parse<span class="sy1">()</span>   <span class="co1">// Scans the arg list and sets up flags</span>
+        <span class="kw1">var</span> s <span class="kw4">string</span>
+        <span class="kw1">for</span> <span class="nu2">i</span> <span class="sy2">:=</span> <span class="nu0">0</span><span class="sy1">;</span> <span class="nu2">i</span> &lt; flag<span class="sy3">.</span>NArg<span class="sy1">();</span> <span class="nu2">i</span><span class="sy2">++</span> <span class="sy1">{</span>
+                <span class="kw1">if</span> <span class="nu2">i</span> &gt; <span class="nu0">0</span> <span class="sy1">{</span>
+                        s <span class="sy2">+=</span> Space
+                <span class="sy1">}</span>
+                s <span class="sy2">+=</span> flag<span class="sy3">.</span>Arg<span class="sy1">(</span><span class="nu2">i</span><span class="sy1">)</span>
+        <span class="sy1">}</span>
+        <span class="kw1">if</span> <span class="sy3">!*</span>omitNewline <span class="sy1">{</span>
+                s <span class="sy2">+=</span> Newline
+        <span class="sy1">}</span>
+        os<span class="sy3">.</span>Stdout<span class="sy3">.</span>WriteString<span class="sy1">(</span>s<span class="sy1">)</span>
+<span class="sy1">}</span>
+</pre></div>
+</div>
+<h2><span class="editsection">[<a href="/w/index.php?title=Go_(programming_language)&amp;action=edit&amp;section=10" title="Edit section: Reception">edit</a>]</span> <span class="mw-headline" id="Reception">Reception</span></h2>
+<p>Go's initial release led to much discussion.</p>
+<p>Michele Simionato wrote in an article for artima.com:<sup id="cite_ref-19" class="reference"><a href="#cite_note-19"><span>[</span>20<span>]</span></a></sup></p>
+<blockquote class="templatequote">
+<div class="Bug6200">Here I just wanted to point out the design choices about interfaces and inheritance. Such ideas are not new and it is a shame that no popular language has followed such particular route in the design space. I hope Go will become popular; if not, I hope such ideas will finally enter in a popular language, we are already 10 or 20 years too late&#160;:-(</div>
+</blockquote>
+<p><a href="/wiki/Dave_Astels" title="Dave Astels">Dave Astels</a> at <a href="/wiki/Engine_Yard" title="Engine Yard">Engine Yard</a> wrote:<sup id="cite_ref-20" class="reference"><a href="#cite_note-20"><span>[</span>21<span>]</span></a></sup></p>
+<blockquote class="templatequote">
+<div class="Bug6200">Go is extremely easy to dive into. There are a minimal number of fundamental language concepts and the <a href="/wiki/Syntax_(programming_languages)" title="Syntax (programming languages)">syntax</a> is clean and designed to be clear and unambiguous. Go is still experimental and still a little rough around the edges.</div>
+</blockquote>
+<p><i><a href="/wiki/Ars_Technica" title="Ars Technica">Ars Technica</a></i> interviewed Rob Pike, one of the authors of Go, and asked why a new language was needed. He replied that:<sup id="cite_ref-ars_21-0" class="reference"><a href="#cite_note-ars-21"><span>[</span>22<span>]</span></a></sup></p>
+<blockquote class="templatequote">
+<div class="Bug6200">It wasn't enough to just add features to existing programming languages, because sometimes you can get more in the long run by taking things away. They wanted to start from scratch and rethink everything. ... [But they did not want] to deviate too much from what developers already knew because they wanted to avoid alienating Go's target audience.</div>
+</blockquote>
+<p>Go was in 15th place on the <a href="/wiki/TIOBE_Programming_Community_Index" title="TIOBE Programming Community Index" class="mw-redirect">TIOBE Programming Community Index</a> of programming language popularity in its first year, 2009,<sup class="Template-Fact" style="white-space:nowrap;">[<i><a href="/wiki/Wikipedia:Citation_needed" title="Wikipedia:Citation needed"><span title="This claim needs references to reliable sources from May 2012">citation needed</span></a></i>]</sup> surpassing established languages like <a href="/wiki/Pascal_(programming_language)" title="Pascal (programming language)">Pascal</a>. As of March 2012<sup class="plainlinks noprint asof-tag update" style="display:none;"><a class="external text" href="//en.wikipedia.org/w/index.php?title=Go_(programming_language)&amp;action=edit">[update]</a></sup>, it ranked 66th in the index.<sup id="cite_ref-22" class="reference"><a href="#cite_note-22"><span>[</span>23<span>]</span></a></sup></p>
+<p><a href="/wiki/Bruce_Eckel" title="Bruce Eckel">Bruce Eckel</a> stated:<sup id="cite_ref-23" class="reference"><a href="#cite_note-23"><span>[</span>24<span>]</span></a></sup></p>
+<blockquote class="templatequote">
+<div class="Bug6200">The complexity of <a href="/wiki/C%2B%2B" title="C++">C++</a> (even more complexity has been added in the new C++), and the resulting impact on productivity, is no longer justified. All the hoops that the C++ programmer had to jump through in order to use a C-compatible language make no sense anymore -- they're just a waste of time and effort. Now, Go makes much more sense for the class of problems that C++ was originally intended to solve.</div>
+</blockquote>
+<h2><span class="editsection">[<a href="/w/index.php?title=Go_(programming_language)&amp;action=edit&amp;section=11" title="Edit section: Naming dispute">edit</a>]</span> <span class="mw-headline" id="Naming_dispute">Naming dispute</span></h2>
+<p>On the day of the general release of the language, Francis McCabe, developer of the <a href="/wiki/Go!_(programming_language)" title="Go! (programming language)">Go! programming language</a> (note the <a href="/wiki/Exclamation_point" title="Exclamation point" class="mw-redirect">exclamation point</a>), requested a name change of Google's language to prevent confusion with his language.<sup id="cite_ref-infoweek_24-0" class="reference"><a href="#cite_note-infoweek-24"><span>[</span>25<span>]</span></a></sup> The issue was closed by a Google developer on 12 October 2010 with the custom status "Unfortunate", with a comment that "there are many computing products and services named Go. In the 11 months since our release, there has been minimal confusion of the two languages."<sup id="cite_ref-25" class="reference"><a href="#cite_note-25"><span>[</span>26<span>]</span></a></sup></p>
+<h2><span class="editsection">[<a href="/w/index.php?title=Go_(programming_language)&amp;action=edit&amp;section=12" title="Edit section: See also">edit</a>]</span> <span class="mw-headline" id="See_also">See also</span></h2>
+<ul>
+<li><a href="/wiki/Comparison_of_programming_languages" title="Comparison of programming languages">Comparison of programming languages</a></li>
+</ul>
+<h2><span class="editsection">[<a href="/w/index.php?title=Go_(programming_language)&amp;action=edit&amp;section=13" title="Edit section: References">edit</a>]</span> <span class="mw-headline" id="References">References</span></h2>
+<div class="dablink">This article incorporates material from the <a rel="nofollow" class="external text" href="http://golang.org/doc/go_tutorial.html">official Go tutorial</a>, which is licensed under the Creative Commons Attribution 3.0 license.</div>
+<div class="reflist references-column-count references-column-count-2" style="-moz-column-count: 2; -webkit-column-count: 2; column-count: 2; list-style-type: decimal;">
+<ol class="references">
+<li id="cite_note-0"><span class="mw-cite-backlink"><b><a href="#cite_ref-0">^</a></b></span> <span class="reference-text"><span class="citation web"><a rel="nofollow" class="external text" href="https://groups.google.com/forum/#!msg/golang-announce/9-f_fnXNDzw/MiM3tk0iyjYJ">"golang-announce: go1.0.2 released"</a><span class="printonly">. <a rel="nofollow" class="external free" href="https://groups.google.com/forum/#!msg/golang-announce/9-f_fnXNDzw/MiM3tk0iyjYJ">https://groups.google.com/forum/#!msg/golang-announce/9-f_fnXNDzw/MiM3tk0iyjYJ</a></span><span class="reference-accessdate">. Retrieved 14 June 2012</span>.</span><span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=bookitem&amp;rft.btitle=golang-announce%3A+go1.0.2+released&amp;rft.atitle=&amp;rft_id=https%3A%2F%2Fgroups.google.com%2Fforum%2F%23%21msg%2Fgolang-announce%2F9-f_fnXNDzw%2FMiM3tk0iyjYJ&amp;rfr_id=info:sid/en.wikipedia.org:Go_(programming_language)"><span style="display: none;">&#160;</span></span></span></li>
+<li id="cite_note-langfaq-1"><span class="mw-cite-backlink">^ <a href="#cite_ref-langfaq_1-0"><sup><i><b>a</b></i></sup></a> <a href="#cite_ref-langfaq_1-1"><sup><i><b>b</b></i></sup></a> <a href="#cite_ref-langfaq_1-2"><sup><i><b>c</b></i></sup></a> <a href="#cite_ref-langfaq_1-3"><sup><i><b>d</b></i></sup></a></span> <span class="reference-text"><span class="citation web"><a rel="nofollow" class="external text" href="http://golang.org/doc/go_faq.html">"Language Design FAQ"</a>. <i>golang.org</i>. 16 January 2010<span class="printonly">. <a rel="nofollow" class="external free" href="http://golang.org/doc/go_faq.html">http://golang.org/doc/go_faq.html</a></span><span class="reference-accessdate">. Retrieved 27 February 2010</span>.</span><span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=bookitem&amp;rft.btitle=Language+Design+FAQ&amp;rft.atitle=golang.org&amp;rft.date=16+January+2010&amp;rft_id=http%3A%2F%2Fgolang.org%2Fdoc%2Fgo_faq.html&amp;rfr_id=info:sid/en.wikipedia.org:Go_(programming_language)"><span style="display: none;">&#160;</span></span></span></li>
+<li id="cite_note-2"><span class="mw-cite-backlink"><b><a href="#cite_ref-2">^</a></b></span> <span class="reference-text"><span class="citation web"><a rel="nofollow" class="external text" href="http://go-lang.cat-v.org/os-ports">"Go Porting Efforts"</a>. <i>Go Language Resources</i>. cat-v. 12 January 2010<span class="printonly">. <a rel="nofollow" class="external free" href="http://go-lang.cat-v.org/os-ports">http://go-lang.cat-v.org/os-ports</a></span><span class="reference-accessdate">. Retrieved 18 January 2010</span>.</span><span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=bookitem&amp;rft.btitle=Go+Porting+Efforts&amp;rft.atitle=Go+Language+Resources&amp;rft.date=12+January+2010&amp;rft.pub=cat-v&amp;rft_id=http%3A%2F%2Fgo-lang.cat-v.org%2Fos-ports&amp;rfr_id=info:sid/en.wikipedia.org:Go_(programming_language)"><span style="display: none;">&#160;</span></span></span></li>
+<li id="cite_note-3"><span class="mw-cite-backlink"><b><a href="#cite_ref-3">^</a></b></span> <span class="reference-text"><span class="citation web"><a rel="nofollow" class="external text" href="http://golang.org/LICENSE">"Text file LICENSE"</a><span class="printonly">. <a rel="nofollow" class="external free" href="http://golang.org/LICENSE">http://golang.org/LICENSE</a></span><span class="reference-accessdate">. Retrieved 27 January 2011</span>.</span><span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=bookitem&amp;rft.btitle=Text+file+LICENSE&amp;rft.atitle=&amp;rft_id=http%3A%2F%2Fgolang.org%2FLICENSE&amp;rfr_id=info:sid/en.wikipedia.org:Go_(programming_language)"><span style="display: none;">&#160;</span></span></span></li>
+<li id="cite_note-4"><span class="mw-cite-backlink"><b><a href="#cite_ref-4">^</a></b></span> <span class="reference-text"><span class="citation web"><a rel="nofollow" class="external text" href="http://code.google.com/p/go/source/browse/PATENTS">"Additional IP Rights Grant"</a><span class="printonly">. <a rel="nofollow" class="external free" href="http://code.google.com/p/go/source/browse/PATENTS">http://code.google.com/p/go/source/browse/PATENTS</a></span><span class="reference-accessdate">. Retrieved 26 July 2012</span>.</span><span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=bookitem&amp;rft.btitle=Additional+IP+Rights+Grant&amp;rft.atitle=&amp;rft_id=http%3A%2F%2Fcode.google.com%2Fp%2Fgo%2Fsource%2Fbrowse%2FPATENTS&amp;rfr_id=info:sid/en.wikipedia.org:Go_(programming_language)"><span style="display: none;">&#160;</span></span></span></li>
+<li id="cite_note-5"><span class="mw-cite-backlink"><b><a href="#cite_ref-5">^</a></b></span> <span class="reference-text"><span class="citation news">Kincaid, Jason (10 November 2009). <a rel="nofollow" class="external text" href="http://www.techcrunch.com/2009/11/10/google-go-language/">"Google’s Go: A New Programming Language That’s Python Meets C++"</a>. <i>TechCrunch</i><span class="printonly">. <a rel="nofollow" class="external free" href="http://www.techcrunch.com/2009/11/10/google-go-language/">http://www.techcrunch.com/2009/11/10/google-go-language/</a></span><span class="reference-accessdate">. Retrieved 18 January 2010</span>.</span><span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Ajournal&amp;rft.genre=article&amp;rft.atitle=Google%E2%80%99s+Go%3A+A+New+Programming+Language+That%E2%80%99s+Python+Meets+C%2B%2B&amp;rft.jtitle=TechCrunch&amp;rft.aulast=Kincaid&amp;rft.aufirst=Jason&amp;rft.au=Kincaid%2C%26%2332%3BJason&amp;rft.date=10+November+2009&amp;rft_id=http%3A%2F%2Fwww.techcrunch.com%2F2009%2F11%2F10%2Fgoogle-go-language%2F&amp;rfr_id=info:sid/en.wikipedia.org:Go_(programming_language)"><span style="display: none;">&#160;</span></span></span></li>
+<li id="cite_note-register-6"><span class="mw-cite-backlink"><b><a href="#cite_ref-register_6-0">^</a></b></span> <span class="reference-text"><span class="citation news">Metz, Cade (20 May 2010). <a rel="nofollow" class="external text" href="http://www.theregister.co.uk/2010/05/20/go_in_production_at_google/">"Google programming Frankenstein is a Go"</a>. <i><a href="/wiki/The_Register" title="The Register">The Register</a></i><span class="printonly">. <a rel="nofollow" class="external free" href="http://www.theregister.co.uk/2010/05/20/go_in_production_at_google/">http://www.theregister.co.uk/2010/05/20/go_in_production_at_google/</a></span>.</span><span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Ajournal&amp;rft.genre=article&amp;rft.atitle=Google+programming+Frankenstein+is+a+Go&amp;rft.jtitle=%5B%5BThe+Register%5D%5D&amp;rft.aulast=Metz&amp;rft.aufirst=Cade&amp;rft.au=Metz%2C%26%2332%3BCade&amp;rft.date=20+May+2010&amp;rft_id=http%3A%2F%2Fwww.theregister.co.uk%2F2010%2F05%2F20%2Fgo_in_production_at_google%2F&amp;rfr_id=info:sid/en.wikipedia.org:Go_(programming_language)"><span style="display: none;">&#160;</span></span></span></li>
+<li id="cite_note-7"><span class="mw-cite-backlink"><b><a href="#cite_ref-7">^</a></b></span> <span class="reference-text"><span class="citation web"><a rel="nofollow" class="external text" href="http://golang.org/doc/install.html#tmp_33">"Installing Go"</a>. <i>golang.org</i>. The Go Authors. 11 June 2010<span class="printonly">. <a rel="nofollow" class="external free" href="http://golang.org/doc/install.html#tmp_33">http://golang.org/doc/install.html#tmp_33</a></span><span class="reference-accessdate">. Retrieved 11 June 2010</span>.</span><span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=bookitem&amp;rft.btitle=Installing+Go&amp;rft.atitle=golang.org&amp;rft.date=11+June+2010&amp;rft.pub=The+Go+Authors&amp;rft_id=http%3A%2F%2Fgolang.org%2Fdoc%2Finstall.html%23tmp_33&amp;rfr_id=info:sid/en.wikipedia.org:Go_(programming_language)"><span style="display: none;">&#160;</span></span></span></li>
+<li id="cite_note-go_lang_video_2009-8"><span class="mw-cite-backlink"><b><a href="#cite_ref-go_lang_video_2009_8-0">^</a></b></span> <span class="reference-text"><span class="citation web">Pike, Rob. <a rel="nofollow" class="external text" href="http://www.youtube.com/watch?v=rKnDgT73v8s&amp;feature=related">"The Go Programming Language"</a>. YouTube<span class="printonly">. <a rel="nofollow" class="external free" href="http://www.youtube.com/watch?v=rKnDgT73v8s&amp;feature=related">http://www.youtube.com/watch?v=rKnDgT73v8s&amp;feature=related</a></span><span class="reference-accessdate">. Retrieved 1 Jul 2011</span>.</span><span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=bookitem&amp;rft.btitle=The+Go+Programming+Language&amp;rft.atitle=&amp;rft.aulast=Pike&amp;rft.aufirst=Rob&amp;rft.au=Pike%2C%26%2332%3BRob&amp;rft.pub=YouTube&amp;rft_id=http%3A%2F%2Fwww.youtube.com%2Fwatch%3Fv%3DrKnDgT73v8s%26feature%3Drelated&amp;rfr_id=info:sid/en.wikipedia.org:Go_(programming_language)"><span style="display: none;">&#160;</span></span></span></li>
+<li id="cite_note-techtalk-compiling-9"><span class="mw-cite-backlink"><b><a href="#cite_ref-techtalk-compiling_9-0">^</a></b></span> <span class="reference-text"><span class="citation video"><a href="/wiki/Rob_Pike" title="Rob Pike">Rob Pike</a> (10 November 2009) (flv). <a rel="nofollow" class="external text" href="http://www.youtube.com/watch?v=rKnDgT73v8s#t=8m53"><i>The Go Programming Language</i></a> (Tech talk). Google. Event occurs at 8:53<span class="printonly">. <a rel="nofollow" class="external free" href="http://www.youtube.com/watch?v=rKnDgT73v8s#t=8m53">http://www.youtube.com/watch?v=rKnDgT73v8s#t=8m53</a></span>.</span><span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=book&amp;rft.btitle=The+Go+Programming+Language&amp;rft.aulast=%5B%5BRob+Pike%5D%5D&amp;rft.au=%5B%5BRob+Pike%5D%5D&amp;rft.date=10+November+2009&amp;rft.pages=Event+occurs+at+8%3A53&amp;rft.pub=Google&amp;rft_id=http%3A%2F%2Fwww.youtube.com%2Fwatch%3Fv%3DrKnDgT73v8s%23t%3D8m53&amp;rfr_id=info:sid/en.wikipedia.org:Go_(programming_language)"><span style="display: none;">&#160;</span></span></span></li>
+<li id="cite_note-memmodel-10"><span class="mw-cite-backlink">^ <a href="#cite_ref-memmodel_10-0"><sup><i><b>a</b></i></sup></a> <a href="#cite_ref-memmodel_10-1"><sup><i><b>b</b></i></sup></a></span> <span class="reference-text"><span class="citation web"><a rel="nofollow" class="external text" href="http://golang.org/doc/go_mem.html">"The Go Memory Model"</a>. Google<span class="printonly">. <a rel="nofollow" class="external free" href="http://golang.org/doc/go_mem.html">http://golang.org/doc/go_mem.html</a></span><span class="reference-accessdate">. Retrieved 5 January 2011</span>.</span><span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=bookitem&amp;rft.btitle=The+Go+Memory+Model&amp;rft.atitle=&amp;rft.pub=Google&amp;rft_id=http%3A%2F%2Fgolang.org%2Fdoc%2Fgo_mem.html&amp;rfr_id=info:sid/en.wikipedia.org:Go_(programming_language)"><span style="display: none;">&#160;</span></span></span></li>
+<li id="cite_note-11"><span class="mw-cite-backlink"><b><a href="#cite_ref-11">^</a></b></span> <span class="reference-text"><a rel="nofollow" class="external text" href="http://golang.org/doc/devel/weekly.html#2010-03-30">Release notes, 30 March 2010</a></span></li>
+<li id="cite_note-12"><span class="mw-cite-backlink"><b><a href="#cite_ref-12">^</a></b></span> <span class="reference-text"><span class="citation web"><a rel="nofollow" class="external text" href="http://groups.google.com/group/golang-nuts/browse_thread/thread/1ce5cd050bb973e4">"Proposal for an exception-like mechanism"</a>. <i>golang-nuts</i>. 25 March 2010<span class="printonly">. <a rel="nofollow" class="external free" href="http://groups.google.com/group/golang-nuts/browse_thread/thread/1ce5cd050bb973e4">http://groups.google.com/group/golang-nuts/browse_thread/thread/1ce5cd050bb973e4</a></span><span class="reference-accessdate">. Retrieved 25 March 2010</span>.</span><span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=bookitem&amp;rft.btitle=Proposal+for+an+exception-like+mechanism&amp;rft.atitle=golang-nuts&amp;rft.date=25+March+2010&amp;rft_id=http%3A%2F%2Fgroups.google.com%2Fgroup%2Fgolang-nuts%2Fbrowse_thread%2Fthread%2F1ce5cd050bb973e4&amp;rfr_id=info:sid/en.wikipedia.org:Go_(programming_language)"><span style="display: none;">&#160;</span></span></span></li>
+<li id="cite_note-13"><span class="mw-cite-backlink"><b><a href="#cite_ref-13">^</a></b></span> <span class="reference-text"><span class="citation web"><a rel="nofollow" class="external text" href="http://golang.org/doc/go_tutorial.html">"A Tutorial for the Go Programming Language"</a>. <i>The Go Programming Language</i>. Google<span class="printonly">. <a rel="nofollow" class="external free" href="http://golang.org/doc/go_tutorial.html">http://golang.org/doc/go_tutorial.html</a></span><span class="reference-accessdate">. Retrieved 10 March 2010</span>. "In Go the rule about visibility of information is simple: if a name (of a top-level type, function, method, constant or variable, or of a structure field or method) is capitalized, users of the package may see it. Otherwise, the name and hence the thing being named is visible only inside the package in which it is declared."</span><span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=bookitem&amp;rft.btitle=A+Tutorial+for+the+Go+Programming+Language&amp;rft.atitle=The+Go+Programming+Language&amp;rft.pub=Google&amp;rft_id=http%3A%2F%2Fgolang.org%2Fdoc%2Fgo_tutorial.html&amp;rfr_id=info:sid/en.wikipedia.org:Go_(programming_language)"><span style="display: none;">&#160;</span></span></span></li>
+<li id="cite_note-14"><span class="mw-cite-backlink"><b><a href="#cite_ref-14">^</a></b></span> <span class="reference-text"><span class="citation web"><a rel="nofollow" class="external text" href="http://golang.org/doc/go_faq.html#Implementation">"FAQ: Implementation"</a>. <i>golang.org</i>. 16 January 2010<span class="printonly">. <a rel="nofollow" class="external free" href="http://golang.org/doc/go_faq.html#Implementation">http://golang.org/doc/go_faq.html#Implementation</a></span><span class="reference-accessdate">. Retrieved 18 January 2010</span>.</span><span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=bookitem&amp;rft.btitle=FAQ%3A+Implementation&amp;rft.atitle=golang.org&amp;rft.date=16+January+2010&amp;rft_id=http%3A%2F%2Fgolang.org%2Fdoc%2Fgo_faq.html%23Implementation&amp;rfr_id=info:sid/en.wikipedia.org:Go_(programming_language)"><span style="display: none;">&#160;</span></span></span></li>
+<li id="cite_note-15"><span class="mw-cite-backlink"><b><a href="#cite_ref-15">^</a></b></span> <span class="reference-text"><span class="citation web"><a rel="nofollow" class="external text" href="http://gcc.gnu.org/install/configure.html">"Installing GCC: Configuration"</a><span class="printonly">. <a rel="nofollow" class="external free" href="http://gcc.gnu.org/install/configure.html">http://gcc.gnu.org/install/configure.html</a></span><span class="reference-accessdate">. Retrieved 3 December 2011</span>. "Ada, Go and Objective-C++ are not default languages"</span><span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=bookitem&amp;rft.btitle=Installing+GCC%3A+Configuration&amp;rft.atitle=&amp;rft_id=http%3A%2F%2Fgcc.gnu.org%2Finstall%2Fconfigure.html&amp;rfr_id=info:sid/en.wikipedia.org:Go_(programming_language)"><span style="display: none;">&#160;</span></span></span></li>
+<li id="cite_note-16"><span class="mw-cite-backlink"><b><a href="#cite_ref-16">^</a></b></span> <span class="reference-text"><span class="citation web">Gerrand, Andrew (1 February 2011). <a rel="nofollow" class="external text" href="http://groups.google.com/group/golang-nuts/browse_thread/thread/b877e34723b543a7">"release.2011-02-01"</a>. <i>golang-nuts</i>. <a href="/wiki/Google" title="Google">Google</a><span class="printonly">. <a rel="nofollow" class="external free" href="http://groups.google.com/group/golang-nuts/browse_thread/thread/b877e34723b543a7">http://groups.google.com/group/golang-nuts/browse_thread/thread/b877e34723b543a7</a></span><span class="reference-accessdate">. Retrieved 5 February 2011</span>.</span><span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=bookitem&amp;rft.btitle=release.2011-02-01&amp;rft.atitle=golang-nuts&amp;rft.aulast=Gerrand&amp;rft.aufirst=Andrew&amp;rft.au=Gerrand%2C%26%2332%3BAndrew&amp;rft.date=1+February+2011&amp;rft.pub=%5B%5BGoogle%5D%5D&amp;rft_id=http%3A%2F%2Fgroups.google.com%2Fgroup%2Fgolang-nuts%2Fbrowse_thread%2Fthread%2Fb877e34723b543a7&amp;rfr_id=info:sid/en.wikipedia.org:Go_(programming_language)"><span style="display: none;">&#160;</span></span></span></li>
+<li id="cite_note-17"><span class="mw-cite-backlink"><b><a href="#cite_ref-17">^</a></b></span> <span class="reference-text"><span class="citation web"><a rel="nofollow" class="external text" href="http://golang.org/doc/go_tutorial.html">"A Tutorial for the Go Programming Language"</a>. <i>The Go Programming Language</i>. Google<span class="printonly">. <a rel="nofollow" class="external free" href="http://golang.org/doc/go_tutorial.html">http://golang.org/doc/go_tutorial.html</a></span><span class="reference-accessdate">. Retrieved 10 March 2010</span>. "The one surprise is that it's important to put the opening brace of a construct such as an if statement on the same line as the if; however, if you don't, there are situations that may not compile or may give the wrong result. The language forces the brace style to some extent."</span><span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=bookitem&amp;rft.btitle=A+Tutorial+for+the+Go+Programming+Language&amp;rft.atitle=The+Go+Programming+Language&amp;rft.pub=Google&amp;rft_id=http%3A%2F%2Fgolang.org%2Fdoc%2Fgo_tutorial.html&amp;rfr_id=info:sid/en.wikipedia.org:Go_(programming_language)"><span style="display: none;">&#160;</span></span></span></li>
+<li id="cite_note-18"><span class="mw-cite-backlink"><b><a href="#cite_ref-18">^</a></b></span> <span class="reference-text"><span class="citation web"><a rel="nofollow" class="external text" href="http://golang.org/doc/go_tutorial.html">"A Tutorial for the Go Programming Language"</a>. <i>golang.org</i>. 16 January 2010<span class="printonly">. <a rel="nofollow" class="external free" href="http://golang.org/doc/go_tutorial.html">http://golang.org/doc/go_tutorial.html</a></span><span class="reference-accessdate">. Retrieved 18 January 2010</span>.</span><span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=bookitem&amp;rft.btitle=A+Tutorial+for+the+Go+Programming+Language&amp;rft.atitle=golang.org&amp;rft.date=16+January+2010&amp;rft_id=http%3A%2F%2Fgolang.org%2Fdoc%2Fgo_tutorial.html&amp;rfr_id=info:sid/en.wikipedia.org:Go_(programming_language)"><span style="display: none;">&#160;</span></span></span></li>
+<li id="cite_note-19"><span class="mw-cite-backlink"><b><a href="#cite_ref-19">^</a></b></span> <span class="reference-text"><span class="citation news">Simionato, Michele (15 November 2009). <a rel="nofollow" class="external text" href="http://www.artima.com/weblogs/viewpost.jsp?thread=274019">"Interfaces vs Inheritance (or, watch out for Go!)"</a>. artima<span class="printonly">. <a rel="nofollow" class="external free" href="http://www.artima.com/weblogs/viewpost.jsp?thread=274019">http://www.artima.com/weblogs/viewpost.jsp?thread=274019</a></span><span class="reference-accessdate">. Retrieved 15 November 2009</span>.</span><span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=bookitem&amp;rft.btitle=Interfaces+vs+Inheritance+%28or%2C+watch+out+for+Go%21%29&amp;rft.atitle=&amp;rft.aulast=Simionato&amp;rft.aufirst=Michele&amp;rft.au=Simionato%2C%26%2332%3BMichele&amp;rft.date=15+November+2009&amp;rft.pub=artima&amp;rft_id=http%3A%2F%2Fwww.artima.com%2Fweblogs%2Fviewpost.jsp%3Fthread%3D274019&amp;rfr_id=info:sid/en.wikipedia.org:Go_(programming_language)"><span style="display: none;">&#160;</span></span></span></li>
+<li id="cite_note-20"><span class="mw-cite-backlink"><b><a href="#cite_ref-20">^</a></b></span> <span class="reference-text"><span class="citation news">Astels, Dave (9 November 2009). <a rel="nofollow" class="external text" href="http://www.engineyard.com/blog/2009/ready-set-go/">"Ready, Set, Go!"</a>. engineyard<span class="printonly">. <a rel="nofollow" class="external free" href="http://www.engineyard.com/blog/2009/ready-set-go/">http://www.engineyard.com/blog/2009/ready-set-go/</a></span><span class="reference-accessdate">. Retrieved 9 November 2009</span>.</span><span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=bookitem&amp;rft.btitle=Ready%2C+Set%2C+Go%21&amp;rft.atitle=&amp;rft.aulast=Astels&amp;rft.aufirst=Dave&amp;rft.au=Astels%2C%26%2332%3BDave&amp;rft.date=9+November+2009&amp;rft.pub=engineyard&amp;rft_id=http%3A%2F%2Fwww.engineyard.com%2Fblog%2F2009%2Fready-set-go%2F&amp;rfr_id=info:sid/en.wikipedia.org:Go_(programming_language)"><span style="display: none;">&#160;</span></span></span></li>
+<li id="cite_note-ars-21"><span class="mw-cite-backlink"><b><a href="#cite_ref-ars_21-0">^</a></b></span> <span class="reference-text"><span class="citation news">Paul, Ryan (10 November 2009). <a rel="nofollow" class="external text" href="http://arstechnica.com/open-source/news/2009/11/go-new-open-source-programming-language-from-google.ars">"Go: new open source programming language from Google"</a>. Ars Technica<span class="printonly">. <a rel="nofollow" class="external free" href="http://arstechnica.com/open-source/news/2009/11/go-new-open-source-programming-language-from-google.ars">http://arstechnica.com/open-source/news/2009/11/go-new-open-source-programming-language-from-google.ars</a></span><span class="reference-accessdate">. Retrieved 13 November 2009</span>.</span><span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=bookitem&amp;rft.btitle=Go%3A+new+open+source+programming+language+from+Google&amp;rft.atitle=&amp;rft.aulast=Paul&amp;rft.aufirst=Ryan&amp;rft.au=Paul%2C%26%2332%3BRyan&amp;rft.date=10+November+2009&amp;rft.pub=Ars+Technica&amp;rft_id=http%3A%2F%2Farstechnica.com%2Fopen-source%2Fnews%2F2009%2F11%2Fgo-new-open-source-programming-language-from-google.ars&amp;rfr_id=info:sid/en.wikipedia.org:Go_(programming_language)"><span style="display: none;">&#160;</span></span></span></li>
+<li id="cite_note-22"><span class="mw-cite-backlink"><b><a href="#cite_ref-22">^</a></b></span> <span class="reference-text"><span class="citation web"><a rel="nofollow" class="external text" href="http://es.scribd.com/doc/89569304/TIOBE-Programming-Community-Index-for-March-2012">"TIOBE Programming Community Index for March 2012"</a>. TIOBE Software. March 2012<span class="printonly">. <a rel="nofollow" class="external free" href="http://es.scribd.com/doc/89569304/TIOBE-Programming-Community-Index-for-March-2012">http://es.scribd.com/doc/89569304/TIOBE-Programming-Community-Index-for-March-2012</a></span><span class="reference-accessdate">. Retrieved 28 April 2012</span>.</span><span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=bookitem&amp;rft.btitle=TIOBE+Programming+Community+Index+for+March+2012&amp;rft.atitle=&amp;rft.date=March+2012&amp;rft.pub=TIOBE+Software&amp;rft_id=http%3A%2F%2Fes.scribd.com%2Fdoc%2F89569304%2FTIOBE-Programming-Community-Index-for-March-2012&amp;rfr_id=info:sid/en.wikipedia.org:Go_(programming_language)"><span style="display: none;">&#160;</span></span></span></li>
+<li id="cite_note-23"><span class="mw-cite-backlink"><b><a href="#cite_ref-23">^</a></b></span> <span class="reference-text"><span class="citation web">Bruce Eckel (27). <a rel="nofollow" class="external text" href="http://www.artima.com/weblogs/viewpost.jsp?thread=333589">"Calling Go from Python via JSON-RPC"</a><span class="printonly">. <a rel="nofollow" class="external free" href="http://www.artima.com/weblogs/viewpost.jsp?thread=333589">http://www.artima.com/weblogs/viewpost.jsp?thread=333589</a></span><span class="reference-accessdate">. Retrieved 29 August 2011</span>.</span><span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=bookitem&amp;rft.btitle=Calling+Go+from+Python+via+JSON-RPC&amp;rft.atitle=&amp;rft.aulast=Bruce+Eckel&amp;rft.au=Bruce+Eckel&amp;rft.date=27&amp;rft_id=http%3A%2F%2Fwww.artima.com%2Fweblogs%2Fviewpost.jsp%3Fthread%3D333589&amp;rfr_id=info:sid/en.wikipedia.org:Go_(programming_language)"><span style="display: none;">&#160;</span></span></span></li>
+<li id="cite_note-infoweek-24"><span class="mw-cite-backlink"><b><a href="#cite_ref-infoweek_24-0">^</a></b></span> <span class="reference-text"><span class="citation news">Claburn, Thomas (11 November 2009). <a rel="nofollow" class="external text" href="http://www.informationweek.com/news/software/web_services/showArticle.jhtml?articleID=221601351">"Google 'Go' Name Brings Accusations Of Evil'"</a>. InformationWeek<span class="printonly">. <a rel="nofollow" class="external free" href="http://www.informationweek.com/news/software/web_services/showArticle.jhtml?articleID=221601351">http://www.informationweek.com/news/software/web_services/showArticle.jhtml?articleID=221601351</a></span><span class="reference-accessdate">. Retrieved 18 January 2010</span>.</span><span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=bookitem&amp;rft.btitle=Google+%27Go%27+Name+Brings+Accusations+Of+Evil%27&amp;rft.atitle=&amp;rft.aulast=Claburn&amp;rft.aufirst=Thomas&amp;rft.au=Claburn%2C%26%2332%3BThomas&amp;rft.date=11+November+2009&amp;rft.pub=InformationWeek&amp;rft_id=http%3A%2F%2Fwww.informationweek.com%2Fnews%2Fsoftware%2Fweb_services%2FshowArticle.jhtml%3FarticleID%3D221601351&amp;rfr_id=info:sid/en.wikipedia.org:Go_(programming_language)"><span style="display: none;">&#160;</span></span></span></li>
+<li id="cite_note-25"><span class="mw-cite-backlink"><b><a href="#cite_ref-25">^</a></b></span> <span class="reference-text"><span class="citation web"><a rel="nofollow" class="external text" href="http://code.google.com/p/go/issues/detail?id=9">"Issue 9 - go - I have already used the name for *MY* programming language"</a>. <i>Google Code</i>. <a href="/wiki/Google_Inc." title="Google Inc." class="mw-redirect">Google Inc.</a><span class="printonly">. <a rel="nofollow" class="external free" href="http://code.google.com/p/go/issues/detail?id=9">http://code.google.com/p/go/issues/detail?id=9</a></span><span class="reference-accessdate">. Retrieved 12 October 2010</span>.</span><span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=bookitem&amp;rft.btitle=Issue+9+-+go+-+I+have+already+used+the+name+for+%2AMY%2A+programming+language&amp;rft.atitle=Google+Code&amp;rft.pub=%5B%5BGoogle+Inc.%5D%5D&amp;rft_id=http%3A%2F%2Fcode.google.com%2Fp%2Fgo%2Fissues%2Fdetail%3Fid%3D9&amp;rfr_id=info:sid/en.wikipedia.org:Go_(programming_language)"><span style="display: none;">&#160;</span></span></span></li>
+</ol>
+</div>
+<h2><span class="editsection">[<a href="/w/index.php?title=Go_(programming_language)&amp;action=edit&amp;section=14" title="Edit section: Further reading">edit</a>]</span> <span class="mw-headline" id="Further_reading">Further reading</span></h2>
+<ul>
+<li><span class="citation book">Chisnall, David (9 May 2012). <a rel="nofollow" class="external text" href="http://www.informit.com/articles/article.aspx?p=1760496">"Common Go Patterns"</a>. <i>The Go Programming Language Phrasebook</i>. <a href="/wiki/Addison-Wesley_Professional" title="Addison-Wesley Professional" class="mw-redirect">Addison-Wesley Professional</a>. <a href="/wiki/International_Standard_Book_Number" title="International Standard Book Number">ISBN</a>&#160;<a href="/wiki/Special:BookSources/0-321-81714-1" title="Special:BookSources/0-321-81714-1">0-321-81714-1</a><span class="printonly">. <a rel="nofollow" class="external free" href="http://www.informit.com/articles/article.aspx?p=1760496">http://www.informit.com/articles/article.aspx?p=1760496</a></span>.</span><span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=bookitem&amp;rft.btitle=Common+Go+Patterns&amp;rft.atitle=The+Go+Programming+Language+Phrasebook&amp;rft.aulast=Chisnall&amp;rft.aufirst=David&amp;rft.au=Chisnall%2C%26%2332%3BDavid&amp;rft.date=9+May+2012&amp;rft.pub=%5B%5BAddison-Wesley+Professional%5D%5D&amp;rft.isbn=0-321-81714-1&amp;rft_id=http%3A%2F%2Fwww.informit.com%2Farticles%2Farticle.aspx%3Fp%3D1760496&amp;rfr_id=info:sid/en.wikipedia.org:Go_(programming_language)"><span style="display: none;">&#160;</span></span></li>
+<li><span class="citation book">Summerfield, Mark (5 May 2012). <a rel="nofollow" class="external text" href="http://www.informit.com/store/product.aspx?isbn=0321774639"><i>Programming in Go: Creating Applications for the 21st Century</i></a>. <a href="/wiki/Addison-Wesley_Professional" title="Addison-Wesley Professional" class="mw-redirect">Addison-Wesley Professional</a>. <a href="/wiki/International_Standard_Book_Number" title="International Standard Book Number">ISBN</a>&#160;<a href="/wiki/Special:BookSources/0-321-77463-9" title="Special:BookSources/0-321-77463-9">0-321-77463-9</a><span class="printonly">. <a rel="nofollow" class="external free" href="http://www.informit.com/store/product.aspx?isbn=0321774639">http://www.informit.com/store/product.aspx?isbn=0321774639</a></span>.</span><span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=book&amp;rft.btitle=Programming+in+Go%3A+Creating+Applications+for+the+21st+Century&amp;rft.aulast=Summerfield&amp;rft.aufirst=Mark&amp;rft.au=Summerfield%2C%26%2332%3BMark&amp;rft.date=5+May+2012&amp;rft.pub=%5B%5BAddison-Wesley+Professional%5D%5D&amp;rft.isbn=0-321-77463-9&amp;rft_id=http%3A%2F%2Fwww.informit.com%2Fstore%2Fproduct.aspx%3Fisbn%3D0321774639&amp;rfr_id=info:sid/en.wikipedia.org:Go_(programming_language)"><span style="display: none;">&#160;</span></span></li>
+</ul>
+<h2><span class="editsection">[<a href="/w/index.php?title=Go_(programming_language)&amp;action=edit&amp;section=15" title="Edit section: External links">edit</a>]</span> <span class="mw-headline" id="External_links">External links</span></h2>
+<ul>
+<li><span class="official website"><a rel="nofollow" class="external text" href="http://golang.org">Official website</a></span></li>
+<li><span class="citation web">Pike, Rob (28 April 2010). <a rel="nofollow" class="external text" href="http://www.stanford.edu/class/ee380/Abstracts/100428.html">"Another Go at Language Design"</a>. <i>Stanford EE Computer Systems Colloquium</i>. <a href="/wiki/Stanford_University" title="Stanford University">Stanford University</a><span class="printonly">. <a rel="nofollow" class="external free" href="http://www.stanford.edu/class/ee380/Abstracts/100428.html">http://www.stanford.edu/class/ee380/Abstracts/100428.html</a></span>.</span><span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=bookitem&amp;rft.btitle=Another+Go+at+Language+Design&amp;rft.atitle=Stanford+EE+Computer+Systems+Colloquium&amp;rft.aulast=Pike&amp;rft.aufirst=Rob&amp;rft.au=Pike%2C%26%2332%3BRob&amp;rft.date=28+April+2010&amp;rft.pub=%5B%5BStanford+University%5D%5D&amp;rft_id=http%3A%2F%2Fwww.stanford.edu%2Fclass%2Fee380%2FAbstracts%2F100428.html&amp;rfr_id=info:sid/en.wikipedia.org:Go_(programming_language)"><span style="display: none;">&#160;</span></span> (<a rel="nofollow" class="external text" href="http://ee380.stanford.edu/cgi-bin/videologger.php?target=100428-ee380-300.asx">video</a>) — A university lecture</li>
+<li><span class="citation podcast">Wynn Netherland &amp; Adam Stacoviak (27 November 2009). <a rel="nofollow" class="external text" href="http://thechangelog.com/post/259401776/episode-0-0-3-googles-go-programming-language">"Episode 0.0.3 - Google’s Go Programming Language"</a>. <i>The Changelog</i> (Podcast)<span class="printonly">. <a rel="nofollow" class="external free" href="http://thechangelog.com/post/259401776/episode-0-0-3-googles-go-programming-language">http://thechangelog.com/post/259401776/episode-0-0-3-googles-go-programming-language</a></span>.</span><span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=bookitem&amp;rft.btitle=Episode+0.0.3+-+Google%E2%80%99s+Go+Programming+Language&amp;rft.atitle=The+Changelog&amp;rft.aulast=Wynn+Netherland+%26+Adam+Stacoviak&amp;rft.au=Wynn+Netherland+%26+Adam+Stacoviak&amp;rft.date=27+November+2009&amp;rft_id=http%3A%2F%2Fthechangelog.com%2Fpost%2F259401776%2Fepisode-0-0-3-googles-go-programming-language&amp;rfr_id=info:sid/en.wikipedia.org:Go_(programming_language)"><span style="display: none;">&#160;</span></span> — Interview with Rob Pike, Tech Lead for the Google Go team</li>
+<li><a rel="nofollow" class="external text" href="http://go-lang.cat-v.org/">Go Programming Language Resources</a> (unofficial)</li>
+<li><a rel="nofollow" class="external free" href="irc://chat.freenode.net/#go-nuts">irc://chat.freenode.net/#go-nuts</a> – the <a href="/wiki/IRC" title="IRC" class="mw-redirect">IRC</a> channel #go-nuts on <a href="/wiki/Freenode" title="Freenode">freenode</a></li>
+<li><span class="citation podcast">Steve Dalton (22 January 2011). <a rel="nofollow" class="external text" href="http://www.codingbynumbers.com/2011/01/coding-by-numbers-episode-20-interview.html">"Episode 20 (Interview with Andrew Gerrand about Go Programming Language)"</a>. <i>Coding By Numbers</i> (Podcast)<span class="printonly">. <a rel="nofollow" class="external free" href="http://www.codingbynumbers.com/2011/01/coding-by-numbers-episode-20-interview.html">http://www.codingbynumbers.com/2011/01/coding-by-numbers-episode-20-interview.html</a></span>.</span><span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=bookitem&amp;rft.btitle=Episode+20+%28Interview+with+Andrew+Gerrand+about+Go+Programming+Language%29&amp;rft.atitle=Coding+By+Numbers&amp;rft.aulast=Steve+Dalton&amp;rft.au=Steve+Dalton&amp;rft.date=22+January+2011&amp;rft_id=http%3A%2F%2Fwww.codingbynumbers.com%2F2011%2F01%2Fcoding-by-numbers-episode-20-interview.html&amp;rfr_id=info:sid/en.wikipedia.org:Go_(programming_language)"><span style="display: none;">&#160;</span></span></li>
+<li><span class="citation web">Schuster, Werner (25 February 2011). <a rel="nofollow" class="external text" href="http://www.infoq.com/interviews/pike-google-go">"Rob Pike on Google Go: Concurrency, Type System, Memory Management and GC"</a>. <i>InfoQ</i>. GOTO Conference: C4Media Inc.<span class="printonly">. <a rel="nofollow" class="external free" href="http://www.infoq.com/interviews/pike-google-go">http://www.infoq.com/interviews/pike-google-go</a></span>.</span><span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.genre=bookitem&amp;rft.btitle=Rob+Pike+on+Google+Go%3A+Concurrency%2C+Type+System%2C+Memory+Management+and+GC&amp;rft.atitle=InfoQ&amp;rft.aulast=Schuster&amp;rft.aufirst=Werner&amp;rft.au=Schuster%2C%26%2332%3BWerner&amp;rft.date=25+February+2011&amp;rft.place=GOTO+Conference&amp;rft.pub=C4Media+Inc.&amp;rft_id=http%3A%2F%2Fwww.infoq.com%2Finterviews%2Fpike-google-go&amp;rfr_id=info:sid/en.wikipedia.org:Go_(programming_language)"><span style="display: none;">&#160;</span></span></li>
+</ul>
+<table cellspacing="0" class="navbox" style="border-spacing:0;;">
+<tr>
+<td style="padding:2px;">
+<table cellspacing="0" class="nowraplinks hlist collapsible collapsed navbox-inner" style="border-spacing:0;background:transparent;color:inherit;;">
+<tr>
+<th scope="col" style=";" class="navbox-title" colspan="2">
+<div class="noprint plainlinks hlist navbar mini" style="">
+<ul>
+<li class="nv-view"><a href="/wiki/Template:Google_Inc." title="Template:Google Inc."><span title="View this template" style=";;background:none transparent;border:none;">v</span></a></li>
+<li class="nv-talk"><a href="/wiki/Template_talk:Google_Inc." title="Template talk:Google Inc."><span title="Discuss this template" style=";;background:none transparent;border:none;">t</span></a></li>
+<li class="nv-edit"><a class="external text" href="//en.wikipedia.org/w/index.php?title=Template:Google_Inc.&amp;action=edit"><span title="Edit this template" style=";;background:none transparent;border:none;">e</span></a></li>
+</ul>
+</div>
+<div class="" style="font-size:110%;"><a href="/wiki/Google" title="Google">Google Inc.</a></div>
+</th>
+</tr>
+<tr style="height:2px;">
+<td></td>
+</tr>
+<tr>
+<td class="navbox-abovebelow" style=";" colspan="2">
+<div>
+<dl>
+<dt>Co-founder &amp; CEO</dt>
+<dd><a href="/wiki/Larry_Page" title="Larry Page">Larry Page</a></dd>
+<dt>Executive Chairman</dt>
+<dd><a href="/wiki/Eric_Schmidt" title="Eric Schmidt">Eric Schmidt</a></dd>
+<dt>Co-founder</dt>
+<dd><a href="/wiki/Sergey_Brin" title="Sergey Brin">Sergey Brin</a></dd>
+</dl>
+<dl>
+<dt>Other directors</dt>
+<dd><a href="/wiki/John_Doerr" title="John Doerr">John Doerr</a></dd>
+<dd><a href="/wiki/John_L._Hennessy" title="John L. Hennessy">John L. Hennessy</a></dd>
+<dd><a href="/wiki/Ann_Mather" title="Ann Mather">Ann Mather</a></dd>
+<dd><a href="/wiki/Paul_Otellini" title="Paul Otellini">Paul Otellini</a></dd>
+<dd><a href="/wiki/Ram_Shriram" title="Ram Shriram">Ram Shriram</a></dd>
+<dd><a href="/wiki/Shirley_M._Tilghman" title="Shirley M. Tilghman">Shirley M. Tilghman</a></dd>
+<dt>Senior Advisor</dt>
+<dd><a href="/wiki/Al_Gore" title="Al Gore">Al Gore</a></dd>
+<dd><a href="/wiki/Rajen_Sheth" title="Rajen Sheth">Rajen Sheth</a></dd>
+</dl>
+</div>
+</td>
+</tr>
+<tr style="height:2px;">
+<td></td>
+</tr>
+<tr>
+<th scope="row" class="navbox-group" style=";;">Advertising</th>
+<td style="text-align:left;border-left-width:2px;border-left-style:solid;width:100%;padding:0px;;;" class="navbox-list navbox-odd">
+<div style="padding:0em 0.25em">
+<ul>
+<li><a href="/wiki/Ad_Manager" title="Ad Manager" class="mw-redirect">Ad Manager</a></li>
+<li><a href="/wiki/AdMob" title="AdMob">AdMob</a></li>
+<li><a href="/wiki/Adscape" title="Adscape">Adscape</a></li>
+<li><a href="/wiki/AdSense" title="AdSense">AdSense</a></li>
+<li><a href="/wiki/Google_Advertising_Professional" title="Google Advertising Professional" class="mw-redirect">Advertising Professionals</a></li>
+<li><a href="/wiki/AdWords" title="AdWords">AdWords</a></li>
+<li><a href="/wiki/Google_Analytics" title="Google Analytics">Analytics</a></li>
+<li><a href="/wiki/Google_Checkout" title="Google Checkout">Checkout</a></li>
+<li><a href="/wiki/DoubleClick" title="DoubleClick">DoubleClick</a></li>
+<li><a href="/wiki/Google_Offers" title="Google Offers">Offers</a></li>
+<li><a href="/wiki/Google_Wallet" title="Google Wallet">Wallet</a></li>
+</ul>
+</div>
+</td>
+</tr>
+<tr style="height:2px">
+<td></td>
+</tr>
+<tr>
+<th scope="row" class="navbox-group" style=";;">Communication</th>
+<td style="text-align:left;border-left-width:2px;border-left-style:solid;width:100%;padding:0px;;;" class="navbox-list navbox-even">
+<div style="padding:0em 0.25em">
+<ul>
+<li><a href="/wiki/Google_Alerts" title="Google Alerts">Alerts</a></li>
+<li><a href="/wiki/Google_Calendar" title="Google Calendar">Calendar</a></li>
+<li><a href="/wiki/Google_Cloud_Connect" title="Google Cloud Connect">Cloud Connect</a></li>
+<li><a href="/wiki/Google_Contacts" title="Google Contacts">Contacts</a></li>
+<li><a href="/wiki/Google_Friend_Connect" title="Google Friend Connect">Friend Connect</a></li>
+<li><a href="/wiki/Gmail" title="Gmail">Gmail</a>
+<ul>
+<li><a href="/wiki/History_of_Gmail" title="History of Gmail">history</a></li>
+<li><a href="/wiki/Gmail_interface" title="Gmail interface">interface</a></li>
+</ul>
+</li>
+<li><a href="/wiki/Google%2B" title="Google+">Google+</a></li>
+<li><a href="/wiki/Google_Groups" title="Google Groups">Groups</a></li>
+<li><a href="/wiki/Google_Talk" title="Google Talk">Talk</a></li>
+<li><a href="/wiki/Google_Latitude" title="Google Latitude">Latitude</a></li>
+<li><a href="/wiki/Orkut" title="Orkut">Orkut</a></li>
+<li><a href="/wiki/Google_Questions_and_Answers" title="Google Questions and Answers">Q &amp; A</a></li>
+<li><a href="/wiki/Google_Reader" title="Google Reader">Reader</a></li>
+<li><a href="/wiki/Google_Sync" title="Google Sync">Sync</a></li>
+<li><a href="/wiki/Google_Translate" title="Google Translate">Translate</a></li>
+<li><a href="/wiki/Google_Voice" title="Google Voice">Voice</a></li>
+</ul>
+</div>
+</td>
+</tr>
+<tr style="height:2px">
+<td></td>
+</tr>
+<tr>
+<th scope="row" class="navbox-group" style=";;">Software</th>
+<td style="text-align:left;border-left-width:2px;border-left-style:solid;width:100%;padding:0px;;;" class="navbox-list navbox-odd">
+<div style="padding:0em 0.25em">
+<ul>
+<li><a href="/wiki/Google_Chrome" title="Google Chrome">Chrome</a>
+<ul>
+<li><a href="/wiki/Chrome_Web_Store" title="Chrome Web Store">Chrome Web Store</a></li>
+</ul>
+</li>
+<li><a href="/wiki/Google_Chrome_OS" title="Google Chrome OS">Chrome OS</a>
+<ul>
+<li><a href="/wiki/Chromebook" title="Chromebook">Chromebook</a></li>
+</ul>
+</li>
+<li><a href="/wiki/Google_Cloud_Print" title="Google Cloud Print">Cloud Print</a></li>
+<li><a href="/wiki/Google_Currents" title="Google Currents">Currents</a></li>
+<li><a href="/wiki/Google_Earth" title="Google Earth">Earth</a>
+<ul>
+<li><a href="/wiki/Google_Sky" title="Google Sky">Sky</a></li>
+<li><a href="/wiki/Google_Moon" title="Google Moon">Moon</a></li>
+<li><a href="/wiki/Google_Mars" title="Google Mars">Mars</a></li>
+</ul>
+</li>
+<li><a href="/wiki/Google_Gadgets" title="Google Gadgets">Gadgets</a></li>
+<li><a href="/wiki/Google_Goggles" title="Google Goggles">Goggles</a></li>
+<li><a href="/wiki/Google_IME" title="Google IME">IME</a>
+<ul>
+<li><a href="/wiki/Google_Pinyin" title="Google Pinyin">Pinyin</a></li>
+<li><a href="/wiki/Google_Japanese_Input" title="Google Japanese Input">Japanese</a></li>
+</ul>
+</li>
+<li><a href="/wiki/Picasa" title="Picasa">Picasa</a></li>
+<li><a href="/wiki/Google_Refine" title="Google Refine">Refine</a></li>
+<li><a href="/wiki/SketchUp" title="SketchUp">SketchUp</a></li>
+<li><a href="/wiki/Google_Talk" title="Google Talk">Talk</a></li>
+<li><a href="/wiki/Google_Toolbar" title="Google Toolbar">Toolbar</a></li>
+<li><a href="/wiki/Google_Pack#Google_Updater" title="Google Pack">Updater</a></li>
+<li><a href="/wiki/Urchin_(software)" title="Urchin (software)">Urchin</a></li>
+</ul>
+</div>
+</td>
+</tr>
+<tr style="height:2px">
+<td></td>
+</tr>
+<tr>
+<th scope="row" class="navbox-group" style=";;"><a href="/wiki/Google_platform" title="Google platform">Platforms</a></th>
+<td style="text-align:left;border-left-width:2px;border-left-style:solid;width:100%;padding:0px;;;" class="navbox-list navbox-even">
+<div style="padding:0em 0.25em">
+<ul>
+<li><a href="/wiki/Google_Account" title="Google Account">Account</a></li>
+<li><a href="/wiki/Android_(operating_system)" title="Android (operating system)">Android</a>
+<ul>
+<li><a href="/wiki/Google_TV" title="Google TV">Google TV</a></li>
+<li><a href="/wiki/Google_Nexus" title="Google Nexus">Google Nexus</a></li>
+</ul>
+</li>
+<li><a href="/wiki/Google_App_Engine" title="Google App Engine">App Engine</a></li>
+<li><a href="/wiki/Google_Apps" title="Google Apps">Apps</a>
+<ul>
+<li><a href="/wiki/Google_Apps_Marketplace" title="Google Apps Marketplace">Marketplace</a></li>
+</ul>
+</li>
+<li><a href="/wiki/Google_Authenticator" title="Google Authenticator">Authenticator</a></li>
+<li><a href="/wiki/BigTable" title="BigTable">BigTable</a></li>
+<li><a href="/wiki/Google_Body" title="Google Body" class="mw-redirect">Body</a></li>
+<li><a href="/wiki/Google_Books" title="Google Books">Books</a></li>
+<li><a href="/wiki/Google_Play" title="Google Play">Play</a></li>
+<li><a href="/wiki/Caja_project" title="Caja project">Caja</a></li>
+<li><a href="/wiki/Google_Compute_Engine" title="Google Compute Engine">Google Compute Engine</a></li>
+<li><a href="/wiki/Project_Glass" title="Project Glass">Project Glass</a></li>
+<li><a href="/wiki/Google_Custom_Search" title="Google Custom Search">Custom Search</a></li>
+<li><a href="/wiki/Dart_(programming_language)" title="Dart (programming language)">Dart</a></li>
+<li><a href="/wiki/Google_Earth_Engine" title="Google Earth Engine">Earth Engine</a></li>
+<li><strong class="selflink">Go</strong></li>
+<li><a href="/wiki/Google_File_System" title="Google File System">GFS</a></li>
+<li><a href="/wiki/Google_Native_Client" title="Google Native Client">Native Client</a></li>
+<li><a href="/wiki/OpenSocial" title="OpenSocial">OpenSocial</a></li>
+<li><a href="/wiki/Google_Public_DNS" title="Google Public DNS">Public DNS</a></li>
+<li><a href="/wiki/Google_Wallet" title="Google Wallet">Wallet</a></li>
+<li><a href="/wiki/Google_Wave_Federation_Protocol" title="Google Wave Federation Protocol">Wave</a></li>
+</ul>
+</div>
+</td>
+</tr>
+<tr style="height:2px">
+<td></td>
+</tr>
+<tr>
+<th scope="row" class="navbox-group" style=";;">Development tools</th>
+<td style="text-align:left;border-left-width:2px;border-left-style:solid;width:100%;padding:0px;;;" class="navbox-list navbox-odd">
+<div style="padding:0em 0.25em">
+<ul>
+<li><a href="/wiki/Google_AJAX_APIs" title="Google AJAX APIs">AJAX APIs</a></li>
+<li><a href="/wiki/App_Inventor" title="App Inventor" class="mw-redirect">App Inventor</a></li>
+<li><a href="/wiki/AtGoogleTalks" title="AtGoogleTalks">AtGoogleTalks</a></li>
+<li><a href="/wiki/Google_Closure_Tools" title="Google Closure Tools">Closure Tools</a></li>
+<li><a href="/wiki/Google_Code" title="Google Code">Code</a></li>
+<li><a href="/wiki/Google_Gadgets_API" title="Google Gadgets API">Gadgets API</a></li>
+<li><a href="/wiki/GData" title="GData">GData</a></li>
+<li><a href="/wiki/Googlebot" title="Googlebot">Googlebot</a></li>
+<li><a href="/wiki/Google_Guice" title="Google Guice">Guice</a></li>
+<li><a href="/wiki/Google_Web_Server" title="Google Web Server" class="mw-redirect">GWS</a></li>
+<li><a href="/wiki/Keyhole_Markup_Language" title="Keyhole Markup Language">KML</a></li>
+<li><a href="/wiki/MapReduce" title="MapReduce">MapReduce</a></li>
+<li><a href="/wiki/SketchUp_Ruby" title="SketchUp Ruby" class="mw-redirect">SketchUp Ruby</a></li>
+<li><a href="/wiki/Sitemaps" title="Sitemaps">Sitemaps</a></li>
+<li><a href="/wiki/Google_Summer_of_Code" title="Google Summer of Code">Summer of Code</a></li>
+<li><a href="/wiki/Google_Web_Toolkit" title="Google Web Toolkit">Web Toolkit</a></li>
+<li><a href="/wiki/Google_Website_Optimizer" title="Google Website Optimizer">Website Optimizer</a></li>
+<li><a href="/wiki/Google_Swiffy" title="Google Swiffy">Swiffy</a></li>
+</ul>
+</div>
+</td>
+</tr>
+<tr style="height:2px">
+<td></td>
+</tr>
+<tr>
+<th scope="row" class="navbox-group" style=";;">Publishing</th>
+<td style="text-align:left;border-left-width:2px;border-left-style:solid;width:100%;padding:0px;;;" class="navbox-list navbox-even">
+<div style="padding:0em 0.25em">
+<ul>
+<li><a href="/wiki/Google_3D_Warehouse" title="Google 3D Warehouse" class="mw-redirect">Google 3D Warehouse</a></li>
+<li><a href="/wiki/Blogger_(service)" title="Blogger (service)">Blogger</a></li>
+<li><a href="/wiki/Google_Bookmarks" title="Google Bookmarks">Bookmarks</a></li>
+<li><a href="/wiki/Google_Docs" title="Google Docs">Docs</a></li>
+<li><a href="/wiki/Google_Drive" title="Google Drive">Drive</a></li>
+<li><a href="/wiki/FeedBurner" title="FeedBurner">FeedBurner</a></li>
+<li><a href="/wiki/IGoogle" title="IGoogle">iGoogle</a></li>
+<li><a href="/wiki/Knol" title="Knol">Knol</a></li>
+<li><a href="/wiki/Google_Map_Maker" title="Google Map Maker">Map Maker</a></li>
+<li><a href="/wiki/Panoramio" title="Panoramio">Panoramio</a></li>
+<li><a href="/wiki/Picasa#Picasa_Web_Albums" title="Picasa">Picasa Web Albums</a></li>
+<li><a href="/wiki/Google_Sites" title="Google Sites">Sites (JotSpot)</a></li>
+<li><a href="/wiki/YouTube" title="YouTube">YouTube</a></li>
+<li><a href="/wiki/Zagat" title="Zagat">Zagat</a></li>
+</ul>
+</div>
+</td>
+</tr>
+<tr style="height:2px">
+<td></td>
+</tr>
+<tr>
+<th scope="row" class="navbox-group" style=";;"><a href="/wiki/Google_Search" title="Google Search">Search</a> (<a href="/wiki/PageRank" title="PageRank">PageRank</a>)</th>
+<td style="text-align:left;border-left-width:2px;border-left-style:solid;width:100%;padding:0px;;;" class="navbox-list navbox-odd">
+<div style="padding:0em 0.25em">
+<ul>
+<li><a href="/wiki/Google_Search_Appliance" title="Google Search Appliance">Appliance</a></li>
+<li><a href="/wiki/Google_Audio_Indexing" title="Google Audio Indexing">Audio</a></li>
+<li><a href="/wiki/Google_Books" title="Google Books">Books</a>
+<ul>
+<li><a href="/wiki/Google_Books_Library_Project" title="Google Books Library Project">Library Project</a></li>
+<li><a href="/wiki/Google_eBooks" title="Google eBooks">eBooks</a></li>
+</ul>
+</li>
+<li><a href="/wiki/Google_Finance" title="Google Finance">Finance</a></li>
+<li><a href="/wiki/Google_Images" title="Google Images">Images</a></li>
+<li><a href="/wiki/Google_Maps" title="Google Maps">Maps</a>
+<ul>
+<li><a href="/wiki/Google_Street_View" title="Google Street View">Street View</a>
+<ul>
+<li><a href="/wiki/Timeline_of_Google_Street_View" title="Timeline of Google Street View">Timeline</a></li>
+<li><a href="/wiki/Google_Street_View_privacy_concerns" title="Google Street View privacy concerns">Privacy concerns</a></li>
+<li><a href="/wiki/Competition_of_Google_Street_View" title="Competition of Google Street View">Competition</a></li>
+<li><a href="/wiki/Locations_of_Google_Street_View" title="Locations of Google Street View">Locations</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li><a href="/wiki/Google_News" title="Google News">News</a></li>
+<li><a href="/wiki/Google_Patents" title="Google Patents">Patents</a></li>
+<li><a href="/wiki/Google_Scholar" title="Google Scholar">Scholar</a></li>
+<li><a href="/wiki/Google_Shopping" title="Google Shopping">Shopping</a></li>
+<li><a href="/wiki/Google_Groups" title="Google Groups">Usenet</a></li>
+<li><a href="/wiki/Google_Videos" title="Google Videos">Videos</a></li>
+<li><a href="/wiki/Google_Search" title="Google Search">Web Search</a>
+<ul>
+<li><a href="/wiki/Google_Web_History" title="Google Web History">History</a></li>
+<li><a href="/wiki/Google_Personalized_Search" title="Google Personalized Search">Personalized</a></li>
+<li><a href="/wiki/Google_Real-Time_Search" title="Google Real-Time Search">Real-Time</a></li>
+<li><a href="/wiki/Instant_Search" title="Instant Search" class="mw-redirect">Instant Search</a></li>
+<li><a href="/wiki/SafeSearch" title="SafeSearch">SafeSearch</a></li>
+</ul>
+</li>
+<li>Analysis: <a href="/wiki/Google_Insights_for_Search" title="Google Insights for Search">Insights for Search</a></li>
+<li><a href="/wiki/Google_Trends" title="Google Trends">Trends</a></li>
+</ul>
+</div>
+</td>
+</tr>
+<tr style="height:2px">
+<td></td>
+</tr>
+<tr>
+<th scope="row" class="navbox-group" style=";;"><a href="/wiki/List_of_Google_products#Discontinued_products_and_services" title="List of Google products">Discontinued</a></th>
+<td style="text-align:left;border-left-width:2px;border-left-style:solid;width:100%;padding:0px;;;" class="navbox-list navbox-even">
+<div style="padding:0em 0.25em">
+<ul>
+<li><a href="/wiki/Aardvark_(search_engine)" title="Aardvark (search engine)">Aardvark</a></li>
+<li><a href="/wiki/Google_Answers" title="Google Answers">Answers</a></li>
+<li><a href="/wiki/Google_Browser_Sync" title="Google Browser Sync">Browser Sync</a></li>
+<li><a href="/wiki/Google_Base" title="Google Base">Base</a></li>
+<li><a href="/wiki/Google_Buzz" title="Google Buzz">Buzz</a></li>
+<li><a href="/wiki/AdWords#Google_Click-to-Call" title="AdWords">Click-to-Call</a></li>
+<li><a href="/wiki/Google_Code_Search" title="Google Code Search">Code Search</a></li>
+<li><a href="/wiki/Google_Desktop" title="Google Desktop">Desktop</a></li>
+<li><a href="/wiki/Google_Dictionary" title="Google Dictionary">Dictionary</a></li>
+<li><a href="/wiki/Dodgeball_(service)" title="Dodgeball (service)">Dodgeball</a></li>
+<li><a href="/wiki/Google_Fast_Flip" title="Google Fast Flip">Fast Flip</a></li>
+<li><a href="/wiki/Gears_(software)" title="Gears (software)">Gears</a></li>
+<li><a href="/wiki/GOOG-411" title="GOOG-411">GOOG-411</a></li>
+<li><a href="/wiki/Jaiku" title="Jaiku">Jaiku</a></li>
+<li><a href="/wiki/Google_Health" title="Google Health">Health</a></li>
+<li><a href="/wiki/Google_Image_Labeler" title="Google Image Labeler">Image Labeler</a></li>
+<li><a href="/wiki/Google_Labs" title="Google Labs">Labs</a></li>
+<li><a href="/wiki/Google_Lively" title="Google Lively">Lively</a></li>
+<li><a href="/wiki/Google_Mashup_Editor" title="Google Mashup Editor">Mashup Editor</a></li>
+<li><a href="/wiki/Google_Notebook" title="Google Notebook">Notebook</a></li>
+<li><a href="/wiki/Google_Pack" title="Google Pack">Pack</a></li>
+<li><a href="/wiki/Google_Page_Creator" title="Google Page Creator">Page Creator</a></li>
+<li><a href="/wiki/Picnik" title="Picnik">Picnik</a></li>
+<li><a href="/wiki/Google_PowerMeter" title="Google PowerMeter">PowerMeter</a></li>
+<li><a href="/wiki/Google_SearchWiki" title="Google SearchWiki">SearchWiki</a></li>
+<li><a href="/wiki/Google_Sidewiki" title="Google Sidewiki">Sidewiki</a></li>
+<li><a href="/wiki/Slide.com" title="Slide.com">Slide</a></li>
+<li><a href="/wiki/Google_Squared" title="Google Squared">Google Squared</a></li>
+<li><a href="/wiki/Google_Video_Marketplace" title="Google Video Marketplace">Video Marketplace</a></li>
+<li><a href="/wiki/Apache_Wave" title="Apache Wave">Wave</a></li>
+<li><a href="/wiki/Google_Web_Accelerator" title="Google Web Accelerator">Web Accelerator</a></li>
+<li><a href="/wiki/Google_X" title="Google X">Google X</a></li>
+</ul>
+</div>
+</td>
+</tr>
+<tr style="height:2px">
+<td></td>
+</tr>
+<tr>
+<th scope="row" class="navbox-group" style=";;"><a href="/wiki/Category:Google" title="Category:Google">Related</a></th>
+<td style="text-align:left;border-left-width:2px;border-left-style:solid;width:100%;padding:0px;;;" class="navbox-list navbox-odd">
+<div style="padding:0em 0.25em">
+<ul>
+<li><a href="/wiki/List_of_acquisitions_by_Google" title="List of acquisitions by Google" class="mw-redirect">Acquisitions</a></li>
+<li><a href="/wiki/Google_AI_Challenge" title="Google AI Challenge" class="mw-redirect">AI Challenge</a></li>
+<li><a href="/wiki/Google_Art_Project" title="Google Art Project">Art Project</a></li>
+<li><a href="/wiki/Google_bomb" title="Google bomb">Bomb</a></li>
+<li><a href="/wiki/Criticism_of_Google" title="Criticism of Google">Criticism</a></li>
+<li><a href="/wiki/List_of_Google_domains" title="List of Google domains">Domains</a></li>
+<li><a href="/wiki/Google_driverless_car" title="Google driverless car">Driverless car</a></li>
+<li><a href="/wiki/Google_Fiber" title="Google Fiber">Fiber</a></li>
+<li><a href="/wiki/Google.org#Google_Foundation" title="Google.org">Foundation</a></li>
+<li><a href="/wiki/Google_China" title="Google China">Google China</a></li>
+<li><a href="/wiki/Googlization" title="Googlization">Googlization</a></li>
+<li><a href="/wiki/Google_Grants" title="Google Grants">Grants</a></li>
+<li><a href="/wiki/Google.org" title="Google.org">Google.org</a></li>
+<li><a href="/wiki/Googleplex" title="Googleplex">Googleplex</a></li>
+<li><a href="/wiki/History_of_Google" title="History of Google">History</a></li>
+<li><a href="/wiki/List_of_Google%27s_hoaxes_and_easter_eggs" title="List of Google's hoaxes and easter eggs">Hoaxes</a></li>
+<li><a href="/wiki/Google_Search#.22I.27m_Feeling_Lucky.22" title="Google Search">I'm Feeling Lucky</a></li>
+<li><a href="/wiki/Google_I/O" title="Google I/O">I/O</a></li>
+<li><a href="/wiki/Google_logo" title="Google logo">Logo</a>
+<ul>
+<li><a href="/wiki/List_of_Google_Doodles_(1998%E2%80%932009)" title="List of Google Doodles (1998–2009)">1998–2009</a></li>
+<li><a href="/wiki/List_of_Google_Doodles_in_2010" title="List of Google Doodles in 2010">2010</a></li>
+<li><a href="/wiki/List_of_Google_Doodles_in_2011" title="List of Google Doodles in 2011">2011</a></li>
+<li><a href="/wiki/List_of_Google_Doodles_in_2012" title="List of Google Doodles in 2012">2012</a></li>
+</ul>
+</li>
+<li><a href="/wiki/Google_Lunar_X_Prize" title="Google Lunar X Prize">Lunar X Prize</a></li>
+<li><a href="/wiki/Monopoly_City_Streets" title="Monopoly City Streets">Monopoly City Streets</a></li>
+<li><a href="/wiki/Motorola_Mobility" title="Motorola Mobility">Motorola Mobility</a></li>
+<li><a href="/wiki/List_of_Google_products" title="List of Google products">Products</a></li>
+<li><a href="/wiki/Google_Science_Fair" title="Google Science Fair">Science Fair</a></li>
+<li><a href="/wiki/Google_Searchology" title="Google Searchology">Searchology</a></li>
+<li><a href="/wiki/Unity_(cable_system)" title="Unity (cable system)">Unity</a></li>
+<li><a href="/wiki/Google_Ventures" title="Google Ventures">Ventures</a></li>
+<li><a href="/wiki/Google_WiFi" title="Google WiFi">WiFi</a></li>
+<li><a href="/wiki/Google_Data_Liberation_Front" title="Google Data Liberation Front">Data Liberation</a></li>
+</ul>
+</div>
+</td>
+</tr>
+<tr style="height:2px;">
+<td></td>
+</tr>
+<tr>
+<td class="navbox-abovebelow" style=";" colspan="2">
+<div>
+<ul>
+<li><b><a href="/wiki/History_of_Google" title="History of Google">History of Google</a></b></li>
+<li><b>Motto</b>: <a href="/wiki/Don%27t_be_evil" title="Don't be evil">Don't be evil</a></li>
+</ul>
+</div>
+</td>
+</tr>
+</table>
+</td>
+</tr>
+</table>
+<table cellspacing="0" class="navbox" style="border-spacing:0;;">
+<tr>
+<td style="padding:2px;">
+<table cellspacing="0" class="nowraplinks hlist collapsible autocollapse navbox-inner" style="border-spacing:0;background:transparent;color:inherit;;">
+<tr>
+<th scope="col" style=";" class="navbox-title" colspan="2">
+<div class="noprint plainlinks hlist navbar mini" style="">
+<ul>
+<li class="nv-view"><a href="/wiki/Template:Rob_Pike_navbox" title="Template:Rob Pike navbox"><span title="View this template" style=";;background:none transparent;border:none;">v</span></a></li>
+<li class="nv-talk"><a href="/w/index.php?title=Template_talk:Rob_Pike_navbox&amp;action=edit&amp;redlink=1" class="new" title="Template talk:Rob Pike navbox (page does not exist)"><span title="Discuss this template" style=";;background:none transparent;border:none;">t</span></a></li>
+<li class="nv-edit"><a class="external text" href="//en.wikipedia.org/w/index.php?title=Template:Rob_Pike_navbox&amp;action=edit"><span title="Edit this template" style=";;background:none transparent;border:none;">e</span></a></li>
+</ul>
+</div>
+<div class="" style="font-size:110%;"><a href="/wiki/Rob_Pike" title="Rob Pike">Rob Pike</a></div>
+</th>
+</tr>
+<tr style="height:2px;">
+<td></td>
+</tr>
+<tr>
+<th scope="row" class="navbox-group" style=";;">Operating systems</th>
+<td style="text-align:left;border-left-width:2px;border-left-style:solid;width:100%;padding:0px;;;" class="navbox-list navbox-odd">
+<div style="padding:0em 0.25em">
+<ul>
+<li><a href="/wiki/Plan_9_from_Bell_Labs" title="Plan 9 from Bell Labs">Plan 9 from Bell Labs</a></li>
+<li><a href="/wiki/Inferno_(operating_system)" title="Inferno (operating system)">Inferno</a></li>
+</ul>
+</div>
+</td>
+</tr>
+<tr style="height:2px">
+<td></td>
+</tr>
+<tr>
+<th scope="row" class="navbox-group" style=";;">Programming languages</th>
+<td style="text-align:left;border-left-width:2px;border-left-style:solid;width:100%;padding:0px;;;" class="navbox-list navbox-even">
+<div style="padding:0em 0.25em">
+<ul>
+<li><a href="/wiki/Newsqueak" title="Newsqueak">Newsqueak</a></li>
+<li><a href="/wiki/Limbo_(programming_language)" title="Limbo (programming language)">Limbo</a></li>
+<li><strong class="selflink">Go</strong></li>
+<li><a href="/wiki/Sawzall_(programming_language)" title="Sawzall (programming language)">Sawzall</a></li>
+</ul>
+</div>
+</td>
+</tr>
+<tr style="height:2px">
+<td></td>
+</tr>
+<tr>
+<th scope="row" class="navbox-group" style=";;">Software</th>
+<td style="text-align:left;border-left-width:2px;border-left-style:solid;width:100%;padding:0px;;;" class="navbox-list navbox-odd">
+<div style="padding:0em 0.25em">
+<ul>
+<li><a href="/wiki/Acme_(text_editor)" title="Acme (text editor)">acme</a></li>
+<li><a href="/wiki/Blit_(computer_terminal)" title="Blit (computer terminal)">Blit</a></li>
+<li><a href="/wiki/Sam_(text_editor)" title="Sam (text editor)">sam</a></li>
+<li><a href="/wiki/Rio_(windowing_system)" title="Rio (windowing system)">rio</a></li>
+<li><a href="/wiki/8%C2%BD_(Plan_9)" title="8½ (Plan 9)">8½</a></li>
+</ul>
+</div>
+</td>
+</tr>
+<tr style="height:2px">
+<td></td>
+</tr>
+<tr>
+<th scope="row" class="navbox-group" style=";;">Publications</th>
+<td style="text-align:left;border-left-width:2px;border-left-style:solid;width:100%;padding:0px;;;" class="navbox-list navbox-even">
+<div style="padding:0em 0.25em">
+<ul>
+<li><i><a href="/wiki/The_Practice_of_Programming" title="The Practice of Programming">The Practice of Programming</a></i></li>
+<li><i><a href="/wiki/The_Unix_Programming_Environment" title="The Unix Programming Environment">The Unix Programming Environment</a></i></li>
+</ul>
+</div>
+</td>
+</tr>
+<tr style="height:2px">
+<td></td>
+</tr>
+<tr>
+<th scope="row" class="navbox-group" style=";;">Other</th>
+<td style="text-align:left;border-left-width:2px;border-left-style:solid;width:100%;padding:0px;;;" class="navbox-list navbox-odd">
+<div style="padding:0em 0.25em">
+<ul>
+<li><a href="/wiki/Ren%C3%A9e_French" title="Renée French">Renée French</a></li>
+<li><a href="/wiki/Mark_V_Shaney" title="Mark V Shaney">Mark V Shaney</a></li>
+<li><a href="/wiki/UTF-8" title="UTF-8">UTF-8</a></li>
+</ul>
+</div>
+</td>
+</tr>
+</table>
+</td>
+</tr>
+</table>
+<table cellspacing="0" class="navbox" style="border-spacing:0;;">
+<tr>
+<td style="padding:2px;">
+<table cellspacing="0" class="nowraplinks hlist collapsible autocollapse navbox-inner" style="border-spacing:0;background:transparent;color:inherit;;">
+<tr>
+<th scope="col" style=";" class="navbox-title" colspan="2">
+<div class="noprint plainlinks hlist navbar mini" style="">
+<ul>
+<li class="nv-view"><a href="/wiki/Template:Ken_Thompson_navbox" title="Template:Ken Thompson navbox"><span title="View this template" style=";;background:none transparent;border:none;">v</span></a></li>
+<li class="nv-talk"><a href="/w/index.php?title=Template_talk:Ken_Thompson_navbox&amp;action=edit&amp;redlink=1" class="new" title="Template talk:Ken Thompson navbox (page does not exist)"><span title="Discuss this template" style=";;background:none transparent;border:none;">t</span></a></li>
+<li class="nv-edit"><a class="external text" href="//en.wikipedia.org/w/index.php?title=Template:Ken_Thompson_navbox&amp;action=edit"><span title="Edit this template" style=";;background:none transparent;border:none;">e</span></a></li>
+</ul>
+</div>
+<div class="" style="font-size:110%;"><a href="/wiki/Ken_Thompson" title="Ken Thompson">Ken Thompson</a></div>
+</th>
+</tr>
+<tr style="height:2px;">
+<td></td>
+</tr>
+<tr>
+<th scope="row" class="navbox-group" style=";;">Operating systems</th>
+<td style="text-align:left;border-left-width:2px;border-left-style:solid;width:100%;padding:0px;;;" class="navbox-list navbox-odd">
+<div style="padding:0em 0.25em">
+<ul>
+<li><a href="/wiki/Unix" title="Unix">Unix</a></li>
+<li><a href="/wiki/Plan_9_from_Bell_Labs" title="Plan 9 from Bell Labs">Plan 9 from Bell Labs</a></li>
+</ul>
+</div>
+</td>
+</tr>
+<tr style="height:2px">
+<td></td>
+</tr>
+<tr>
+<th scope="row" class="navbox-group" style=";;">Programming languages</th>
+<td style="text-align:left;border-left-width:2px;border-left-style:solid;width:100%;padding:0px;;;" class="navbox-list navbox-even">
+<div style="padding:0em 0.25em">
+<ul>
+<li><a href="/wiki/B_(programming_language)" title="B (programming language)">B</a></li>
+<li><a href="/wiki/Bon_(programming_language)" title="Bon (programming language)">Bon</a></li>
+<li><strong class="selflink">Go</strong></li>
+</ul>
+</div>
+</td>
+</tr>
+<tr style="height:2px">
+<td></td>
+</tr>
+<tr>
+<th scope="row" class="navbox-group" style=";;">Software</th>
+<td style="text-align:left;border-left-width:2px;border-left-style:solid;width:100%;padding:0px;;;" class="navbox-list navbox-odd">
+<div style="padding:0em 0.25em">
+<ul>
+<li><a href="/wiki/Belle_(chess_machine)" title="Belle (chess machine)">Belle</a></li>
+<li><a href="/wiki/Ed_(text_editor)" title="Ed (text editor)">ed</a></li>
+<li><a href="/wiki/Sam_(text_editor)" title="Sam (text editor)">sam</a></li>
+<li><a href="/wiki/Space_Travel_(video_game)" title="Space Travel (video game)">Space Travel</a></li>
+</ul>
+</div>
+</td>
+</tr>
+<tr style="height:2px">
+<td></td>
+</tr>
+<tr>
+<th scope="row" class="navbox-group" style=";;">Other</th>
+<td style="text-align:left;border-left-width:2px;border-left-style:solid;width:100%;padding:0px;;;" class="navbox-list navbox-even">
+<div style="padding:0em 0.25em">
+<ul>
+<li><a href="/wiki/UTF-8" title="UTF-8">UTF-8</a></li>
+</ul>
+</div>
+</td>
+</tr>
+</table>
+</td>
+</tr>
+</table>
+
+
+<!-- 
+NewPP limit report
+Preprocessor node count: 25469/1000000
+Post-expand include size: 204022/2048000 bytes
+Template argument size: 74337/2048000 bytes
+Highest expansion depth: 28/40
+Expensive parser function count: 5/500
+-->
+
+<!-- Saved in parser cache with key enwiki:pcache:idhash:25039021-0!*!0!!en!4!* and timestamp 20120907001121 -->
+</div>				<!-- /bodycontent -->
+								<!-- printfooter -->
+				<div class="printfooter">
+				Retrieved from "<a href="http://en.wikipedia.org/w/index.php?title=Go_(programming_language)&amp;oldid=508833010">http://en.wikipedia.org/w/index.php?title=Go_(programming_language)&amp;oldid=508833010</a>"				</div>
+				<!-- /printfooter -->
+												<!-- catlinks -->
+				<div id='catlinks' class='catlinks'><div id="mw-normal-catlinks" class="mw-normal-catlinks"><a href="/wiki/Special:Categories" title="Special:Categories">Categories</a>: <ul><li><a href="/wiki/Category:C_programming_language_family" title="Category:C programming language family">C programming language family</a></li><li><a href="/wiki/Category:Concurrent_programming_languages" title="Category:Concurrent programming languages">Concurrent programming languages</a></li><li><a href="/wiki/Category:Google_software" title="Category:Google software">Google software</a></li><li><a href="/wiki/Category:Procedural_programming_languages" title="Category:Procedural programming languages">Procedural programming languages</a></li><li><a href="/wiki/Category:Systems_programming_languages" title="Category:Systems programming languages">Systems programming languages</a></li><li><a href="/wiki/Category:Cross-platform_software" title="Category:Cross-platform software">Cross-platform software</a></li><li><a href="/wiki/Category:Programming_languages_created_in_2009" title="Category:Programming languages created in 2009">Programming languages created in 2009</a></li><li><a href="/wiki/Category:American_inventions" title="Category:American inventions">American inventions</a></li></ul></div><div id="mw-hidden-catlinks" class="mw-hidden-catlinks mw-hidden-cats-hidden">Hidden categories: <ul><li><a href="/wiki/Category:Wikipedia_introduction_cleanup_from_March_2012" title="Category:Wikipedia introduction cleanup from March 2012">Wikipedia introduction cleanup from March 2012</a></li><li><a href="/wiki/Category:All_pages_needing_cleanup" title="Category:All pages needing cleanup">All pages needing cleanup</a></li><li><a href="/wiki/Category:Articles_covered_by_WikiProject_Wikify_from_March_2012" title="Category:Articles covered by WikiProject Wikify from March 2012">Articles covered by WikiProject Wikify from March 2012</a></li><li><a href="/wiki/Category:All_articles_covered_by_WikiProject_Wikify" title="Category:All articles covered by WikiProject Wikify">All articles covered by WikiProject Wikify</a></li><li><a href="/wiki/Category:All_articles_with_unsourced_statements" title="Category:All articles with unsourced statements">All articles with unsourced statements</a></li><li><a href="/wiki/Category:Articles_with_unsourced_statements_from_May_2012" title="Category:Articles with unsourced statements from May 2012">Articles with unsourced statements from May 2012</a></li><li><a href="/wiki/Category:Articles_containing_potentially_dated_statements_from_March_2012" title="Category:Articles containing potentially dated statements from March 2012">Articles containing potentially dated statements from March 2012</a></li><li><a href="/wiki/Category:All_articles_containing_potentially_dated_statements" title="Category:All articles containing potentially dated statements">All articles containing potentially dated statements</a></li><li><a href="/wiki/Category:Use_dmy_dates_from_August_2011" title="Category:Use dmy dates from August 2011">Use dmy dates from August 2011</a></li></ul></div></div>				<!-- /catlinks -->
+												<div class="visualClear"></div>
+				<!-- debughtml -->
+								<!-- /debughtml -->
+			</div>
+			<!-- /bodyContent -->
+		</div>
+		<!-- /content -->
+		<!-- header -->
+		<div id="mw-head" class="noprint">
+			
+<!-- 0 -->
+<div id="p-personal" class="">
+	<h5>Personal tools</h5>
+	<ul>
+		<li id="pt-createaccount"><a href="/w/index.php?title=Special:UserLogin&amp;returnto=Golang&amp;type=signup" class="">Create account</a></li>
+		<li id="pt-login"><a href="/w/index.php?title=Special:UserLogin&amp;returnto=Golang" class="" title="You are encouraged to log in; however, it is not mandatory. [o]" accesskey="o">Log in</a></li>
+	</ul>
+</div>
+
+<!-- /0 -->
+			<div id="left-navigation">
+				
+<!-- 0 -->
+<div id="p-namespaces" class="vectorTabs">
+	<h5>Namespaces</h5>
+	<ul>
+					<li  id="ca-nstab-main" class="selected"><span><a href="/wiki/Go_(programming_language)"  title="View the content page [c]" accesskey="c">Article</a></span></li>
+					<li  id="ca-talk"><span><a href="/wiki/Talk:Go_(programming_language)"  title="Discussion about the content page [t]" accesskey="t">Talk</a></span></li>
+			</ul>
+</div>
+
+<!-- /0 -->
+
+<!-- 1 -->
+<div id="p-variants" class="vectorMenu emptyPortlet">
+	<h4>
+		</h4>
+	<h5><span>Variants</span><a href="#"></a></h5>
+	<div class="menu">
+		<ul>
+					</ul>
+	</div>
+</div>
+
+<!-- /1 -->
+			</div>
+			<div id="right-navigation">
+				
+<!-- 0 -->
+<div id="p-views" class="vectorTabs">
+	<h5>Views</h5>
+	<ul>
+					<li id="ca-view" class="selected"><span><a href="/wiki/Go_(programming_language)" >Read</a></span></li>
+					<li id="ca-edit"><span><a href="/w/index.php?title=Go_(programming_language)&amp;action=edit"  title="You can edit this page. &#10;Please use the preview button before saving. [e]" accesskey="e">Edit</a></span></li>
+					<li id="ca-history" class="collapsible"><span><a href="/w/index.php?title=Go_(programming_language)&amp;action=history"  title="Past versions of this page [h]" accesskey="h">View history</a></span></li>
+			</ul>
+</div>
+
+<!-- /0 -->
+
+<!-- 1 -->
+<div id="p-cactions" class="vectorMenu emptyPortlet">
+	<h5><span>Actions</span><a href="#"></a></h5>
+	<div class="menu">
+		<ul>
+					</ul>
+	</div>
+</div>
+
+<!-- /1 -->
+
+<!-- 2 -->
+<div id="p-search">
+	<h5><label for="searchInput">Search</label></h5>
+	<form action="/w/index.php" id="searchform">
+				<div id="simpleSearch">
+						<input type="text" name="search" value="" title="Search Wikipedia [f]" accesskey="f" id="searchInput" />						<button type="submit" name="button" title="Search Wikipedia for this text" id="searchButton" width="12" height="13"><img src="//bits.wikimedia.org/static-1.20wmf10/skins/vector/images/search-ltr.png?303-4" alt="Search" /></button>								<input type='hidden' name="title" value="Special:Search"/>
+		</div>
+	</form>
+</div>
+
+<!-- /2 -->
+			</div>
+		</div>
+		<!-- /header -->
+		<!-- panel -->
+			<div id="mw-panel" class="noprint">
+				<!-- logo -->
+					<div id="p-logo"><a style="background-image: url(//upload.wikimedia.org/wikipedia/en/b/bc/Wiki.png);" href="/wiki/Main_Page"  title="Visit the main page"></a></div>
+				<!-- /logo -->
+				
+<!-- navigation -->
+<div class="portal" id='p-navigation'>
+	<h5>Navigation</h5>
+	<div class="body">
+		<ul>
+			<li id="n-mainpage-description"><a href="/wiki/Main_Page" title="Visit the main page [z]" accesskey="z">Main page</a></li>
+			<li id="n-contents"><a href="/wiki/Portal:Contents" title="Guides to browsing Wikipedia">Contents</a></li>
+			<li id="n-featuredcontent"><a href="/wiki/Portal:Featured_content" title="Featured content – the best of Wikipedia">Featured content</a></li>
+			<li id="n-currentevents"><a href="/wiki/Portal:Current_events" title="Find background information on current events">Current events</a></li>
+			<li id="n-randompage"><a href="/wiki/Special:Random" title="Load a random article [x]" accesskey="x">Random article</a></li>
+			<li id="n-sitesupport"><a href="//donate.wikimedia.org/wiki/Special:FundraiserRedirector?utm_source=donate&amp;utm_medium=sidebar&amp;utm_campaign=20120717SB001&amp;uselang=en" title="Support us">Donate to Wikipedia</a></li>
+		</ul>
+	</div>
+</div>
+
+<!-- /navigation -->
+
+<!-- SEARCH -->
+
+<!-- /SEARCH -->
+
+<!-- interaction -->
+<div class="portal" id='p-interaction'>
+	<h5>Interaction</h5>
+	<div class="body">
+		<ul>
+			<li id="n-help"><a href="/wiki/Help:Contents" title="Guidance on how to use and edit Wikipedia">Help</a></li>
+			<li id="n-aboutsite"><a href="/wiki/Wikipedia:About" title="Find out about Wikipedia">About Wikipedia</a></li>
+			<li id="n-portal"><a href="/wiki/Wikipedia:Community_portal" title="About the project, what you can do, where to find things">Community portal</a></li>
+			<li id="n-recentchanges"><a href="/wiki/Special:RecentChanges" title="A list of recent changes in the wiki [r]" accesskey="r">Recent changes</a></li>
+			<li id="n-contact"><a href="/wiki/Wikipedia:Contact_us" title="How to contact Wikipedia">Contact Wikipedia</a></li>
+		</ul>
+	</div>
+</div>
+
+<!-- /interaction -->
+
+<!-- TOOLBOX -->
+<div class="portal" id='p-tb'>
+	<h5>Toolbox</h5>
+	<div class="body">
+		<ul>
+			<li id="t-whatlinkshere"><a href="/wiki/Special:WhatLinksHere/Go_(programming_language)" title="List of all English Wikipedia pages containing links to this page [j]" accesskey="j">What links here</a></li>
+			<li id="t-recentchangeslinked"><a href="/wiki/Special:RecentChangesLinked/Go_(programming_language)" title="Recent changes in pages linked from this page [k]" accesskey="k">Related changes</a></li>
+			<li id="t-upload"><a href="/wiki/Wikipedia:Upload" title="Upload files [u]" accesskey="u">Upload file</a></li>
+			<li id="t-specialpages"><a href="/wiki/Special:SpecialPages" title="A list of all special pages [q]" accesskey="q">Special pages</a></li>
+			<li id="t-permalink"><a href="/w/index.php?title=Go_(programming_language)&amp;oldid=508833010" title="Permanent link to this revision of the page">Permanent link</a></li>
+<li id="t-cite"><a href="/w/index.php?title=Special:Cite&amp;page=Go_%28programming_language%29&amp;id=508833010" title="Information on how to cite this page">Cite this page</a></li>		</ul>
+	</div>
+</div>
+
+<!-- /TOOLBOX -->
+
+<!-- coll-print_export -->
+<div class="portal" id='p-coll-print_export'>
+	<h5>Print/export</h5>
+	<div class="body">
+		<ul id="collectionPortletList"><li id="coll-create_a_book"><a href="/w/index.php?title=Special:Book&amp;bookcmd=book_creator&amp;referer=Go+%28programming+language%29" title="Create a book or page collection" rel="nofollow">Create a book</a></li><li id="coll-download-as-rl"><a href="/w/index.php?title=Special:Book&amp;bookcmd=render_article&amp;arttitle=Go+%28programming+language%29&amp;oldid=508833010&amp;writer=rl" title="Download a PDF version of this wiki page" rel="nofollow">Download as PDF</a></li><li id="t-print"><a href="/w/index.php?title=Go_(programming_language)&amp;printable=yes" title="Printable version of this page [p]" accesskey="p">Printable version</a></li></ul>	</div>
+</div>
+
+<!-- /coll-print_export -->
+
+<!-- LANGUAGES -->
+<div class="portal" id='p-lang'>
+	<h5>Languages</h5>
+	<div class="body">
+		<ul>
+			<li class="interwiki-ar"><a href="//ar.wikipedia.org/wiki/%D8%BA%D9%88_(%D9%84%D8%BA%D8%A9_%D8%A8%D8%B1%D9%85%D8%AC%D8%A9)" title="غو (لغة برمجة)" lang="ar" hreflang="ar">العربية</a></li>
+			<li class="interwiki-bg"><a href="//bg.wikipedia.org/wiki/Go_(%D0%B5%D0%B7%D0%B8%D0%BA_%D0%B7%D0%B0_%D0%BF%D1%80%D0%BE%D0%B3%D1%80%D0%B0%D0%BC%D0%B8%D1%80%D0%B0%D0%BD%D0%B5)" title="Go (език за програмиране)" lang="bg" hreflang="bg">Български</a></li>
+			<li class="interwiki-cs"><a href="//cs.wikipedia.org/wiki/Go_(programovac%C3%AD_jazyk)" title="Go (programovací jazyk)" lang="cs" hreflang="cs">Česky</a></li>
+			<li class="interwiki-da"><a href="//da.wikipedia.org/wiki/Go_(programmeringssprog)" title="Go (programmeringssprog)" lang="da" hreflang="da">Dansk</a></li>
+			<li class="interwiki-de"><a href="//de.wikipedia.org/wiki/Go_(Programmiersprache)" title="Go (Programmiersprache)" lang="de" hreflang="de">Deutsch</a></li>
+			<li class="interwiki-es"><a href="//es.wikipedia.org/wiki/Go_(lenguaje_de_programaci%C3%B3n)" title="Go (lenguaje de programación)" lang="es" hreflang="es">Español</a></li>
+			<li class="interwiki-fr"><a href="//fr.wikipedia.org/wiki/Go_(langage)" title="Go (langage)" lang="fr" hreflang="fr">Français</a></li>
+			<li class="interwiki-ko"><a href="//ko.wikipedia.org/wiki/Go_(%ED%94%84%EB%A1%9C%EA%B7%B8%EB%9E%98%EB%B0%8D_%EC%96%B8%EC%96%B4)" title="Go (프로그래밍 언어)" lang="ko" hreflang="ko">한국어</a></li>
+			<li class="interwiki-it"><a href="//it.wikipedia.org/wiki/Go_(linguaggio_di_programmazione)" title="Go (linguaggio di programmazione)" lang="it" hreflang="it">Italiano</a></li>
+			<li class="interwiki-he"><a href="//he.wikipedia.org/wiki/Go_(%D7%A9%D7%A4%D7%AA_%D7%AA%D7%9B%D7%A0%D7%95%D7%AA)" title="Go (שפת תכנות)" lang="he" hreflang="he">עברית</a></li>
+			<li class="interwiki-hu"><a href="//hu.wikipedia.org/wiki/Go_(programoz%C3%A1si_nyelv)" title="Go (programozási nyelv)" lang="hu" hreflang="hu">Magyar</a></li>
+			<li class="interwiki-ms"><a href="//ms.wikipedia.org/wiki/Go_(bahasa_pengaturcaraan)" title="Go (bahasa pengaturcaraan)" lang="ms" hreflang="ms">Bahasa Melayu</a></li>
+			<li class="interwiki-nl"><a href="//nl.wikipedia.org/wiki/Go_(programmeertaal)" title="Go (programmeertaal)" lang="nl" hreflang="nl">Nederlands</a></li>
+			<li class="interwiki-ja"><a href="//ja.wikipedia.org/wiki/Go_(%E3%83%97%E3%83%AD%E3%82%B0%E3%83%A9%E3%83%9F%E3%83%B3%E3%82%B0%E8%A8%80%E8%AA%9E)" title="Go (プログラミング言語)" lang="ja" hreflang="ja">日本語</a></li>
+			<li class="interwiki-no"><a href="//no.wikipedia.org/wiki/Go_(programmeringsspr%C3%A5k)" title="Go (programmeringsspråk)" lang="no" hreflang="no">‪norsk (bokmål)‬</a></li>
+			<li class="interwiki-pl"><a href="//pl.wikipedia.org/wiki/Go_(j%C4%99zyk_programowania)" title="Go (język programowania)" lang="pl" hreflang="pl">Polski</a></li>
+			<li class="interwiki-pt"><a href="//pt.wikipedia.org/wiki/Go_(linguagem_de_programa%C3%A7%C3%A3o)" title="Go (linguagem de programação)" lang="pt" hreflang="pt">Português</a></li>
+			<li class="interwiki-ru"><a href="//ru.wikipedia.org/wiki/Go" title="Go" lang="ru" hreflang="ru">Русский</a></li>
+			<li class="interwiki-sr"><a href="//sr.wikipedia.org/wiki/%D0%93%D0%BE%D1%83" title="Гоу" lang="sr" hreflang="sr">Српски / srpski</a></li>
+			<li class="interwiki-fi"><a href="//fi.wikipedia.org/wiki/Go_(ohjelmointikieli)" title="Go (ohjelmointikieli)" lang="fi" hreflang="fi">Suomi</a></li>
+			<li class="interwiki-sv"><a href="//sv.wikipedia.org/wiki/Go_(programspr%C3%A5k)" title="Go (programspråk)" lang="sv" hreflang="sv">Svenska</a></li>
+			<li class="interwiki-ta"><a href="//ta.wikipedia.org/wiki/%E0%AE%95%E0%AF%8B_(%E0%AE%A8%E0%AE%BF%E0%AE%B0%E0%AE%B2%E0%AE%BE%E0%AE%95%E0%AF%8D%E0%AE%95_%E0%AE%AE%E0%AF%8A%E0%AE%B4%E0%AE%BF)" title="கோ (நிரலாக்க மொழி)" lang="ta" hreflang="ta">தமிழ்</a></li>
+			<li class="interwiki-tr"><a href="//tr.wikipedia.org/wiki/Go_(programlama_dili)" title="Go (programlama dili)" lang="tr" hreflang="tr">Türkçe</a></li>
+			<li class="interwiki-uk"><a href="//uk.wikipedia.org/wiki/Go_(%D0%BC%D0%BE%D0%B2%D0%B0_%D0%BF%D1%80%D0%BE%D0%B3%D1%80%D0%B0%D0%BC%D1%83%D0%B2%D0%B0%D0%BD%D0%BD%D1%8F)" title="Go (мова програмування)" lang="uk" hreflang="uk">Українська</a></li>
+			<li class="interwiki-vi"><a href="//vi.wikipedia.org/wiki/Go_(ng%C3%B4n_ng%E1%BB%AF_l%E1%BA%ADp_tr%C3%ACnh)" title="Go (ngôn ngữ lập trình)" lang="vi" hreflang="vi">Tiếng Việt</a></li>
+			<li class="interwiki-zh"><a href="//zh.wikipedia.org/wiki/Go" title="Go" lang="zh" hreflang="zh">中文</a></li>
+		</ul>
+	</div>
+</div>
+
+<!-- /LANGUAGES -->
+			</div>
+		<!-- /panel -->
+		<!-- footer -->
+		<div id="footer">
+							<ul id="footer-info">
+											<li id="footer-info-lastmod"> This page was last modified on 23 August 2012 at 20:34.<br /></li>
+											<li id="footer-info-copyright">Text is available under the <a rel="license" href="//en.wikipedia.org/wiki/Wikipedia:Text_of_Creative_Commons_Attribution-ShareAlike_3.0_Unported_License">Creative Commons Attribution-ShareAlike License</a><a rel="license" href="//creativecommons.org/licenses/by-sa/3.0/" style="display:none;"></a>;
+additional terms may apply.
+See <a href="//wikimediafoundation.org/wiki/Terms_of_use">Terms of use</a> for details.<br/>
+Wikipedia&reg; is a registered trademark of the <a href="//www.wikimediafoundation.org/">Wikimedia Foundation, Inc.</a>, a non-profit organization.<br /></li><li class="noprint"><a class='internal' href="//en.wikipedia.org/wiki/Wikipedia:Contact_us">Contact us</a></li>
+									</ul>
+							<ul id="footer-places">
+											<li id="footer-places-privacy"><a href="//wikimediafoundation.org/wiki/Privacy_policy" title="wikimedia:Privacy policy">Privacy policy</a></li>
+											<li id="footer-places-about"><a href="/wiki/Wikipedia:About" title="Wikipedia:About">About Wikipedia</a></li>
+											<li id="footer-places-disclaimer"><a href="/wiki/Wikipedia:General_disclaimer" title="Wikipedia:General disclaimer">Disclaimers</a></li>
+											<li id="footer-places-mobileview"><a href="http://en.m.wikipedia.org/w/index.php?title=Golang&amp;mobileaction=toggle_view_mobile" class="noprint">Mobile view</a></li>
+									</ul>
+										<ul id="footer-icons" class="noprint">
+					<li id="footer-copyrightico">
+						<a href="//wikimediafoundation.org/"><img src="//bits.wikimedia.org/images/wikimedia-button.png" width="88" height="31" alt="Wikimedia Foundation"/></a>
+					</li>
+					<li id="footer-poweredbyico">
+						<a href="//www.mediawiki.org/"><img src="//bits.wikimedia.org/static-1.20wmf10/skins/common/images/poweredby_mediawiki_88x31.png" alt="Powered by MediaWiki" width="88" height="31" /></a>
+					</li>
+				</ul>
+						<div style="clear:both"></div>
+		</div>
+		<!-- /footer -->
+		<script type="text/javascript">if(window.mw){
+mw.loader.state({"site":"loading","user":"ready","user.groups":"ready"});
+}</script>
+<script src="//bits.wikimedia.org/en.wikipedia.org/load.php?debug=false&amp;lang=en&amp;modules=skins.vector&amp;only=scripts&amp;skin=vector&amp;*" type="text/javascript"></script>
+<script type="text/javascript">if(window.mw){
+mw.loader.load(["mediawiki.user","mediawiki.page.ready","mediawiki.legacy.mwsuggest","ext.gadget.teahouse","ext.gadget.ReferenceTooltips","ext.vector.collapsibleNav","ext.vector.collapsibleTabs","ext.vector.editWarning","ext.vector.simpleSearch","ext.UserBuckets","ext.articleFeedback.startup","ext.articleFeedbackv5.startup","ext.markAsHelpful","ext.Experiments.lib","ext.Experiments.experiments"], null, true);
+}</script>
+<script src="/w/index.php?title=MediaWiki:Gadget-ReferenceTooltips.js&amp;action=raw&amp;ctype=text/javascript&amp;508635914" type="text/javascript"></script>
+<script src="/w/index.php?title=MediaWiki:Gadget-DRN-wizard-loader.js&amp;action=raw&amp;ctype=text/javascript&amp;504341206" type="text/javascript"></script>
+<script type="text/javascript">
+window._reg = "";
+</script>
+<script src="//bits.wikimedia.org/en.wikipedia.org/load.php?debug=false&amp;lang=en&amp;modules=site&amp;only=scripts&amp;skin=vector&amp;*" type="text/javascript"></script>
+<!-- Served by srv270 in 0.127 secs. -->
+	</body>
+</html>
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/testdata/metalreview.html b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/testdata/metalreview.html
new file mode 100644
index 00000000..fc4a38fc
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/testdata/metalreview.html
@@ -0,0 +1,413 @@
+
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" >
+<head><meta http-equiv="X-UA-Compatible" content="IE=8" />
+    
+<meta name="keywords" content="metal, reviews, metalreview, metalreviews, heavy, rock, review, music, blogs, forums, community" />
+<meta name="description" content="Critical heavy metal album and dvd reviews, written by professional writers. Large community with forums, blogs, photos and commenting system." />
+
+<title>
+	
+    
+	Metal Reviews, News, Blogs, Interviews and Community | Metal Review
+
+
+</title><link rel="stylesheet" type="text/css" href="/Content/Css/reset-fonts-grids.css" /><link rel="stylesheet" type="text/css" href="/Content/Css/base.css" /><link rel="stylesheet" type="text/css" href="/Content/Css/core.css" /><link rel="stylesheet" type="text/css" href="/Content/Css/wt-rotator.css" />
+    <script src="/Scripts/jquery-1.4.2.min.js" type="text/javascript"></script>
+    </head>
+<body>
+    <script type="text/javascript">
+        var _comscore = _comscore || [];
+        _comscore.push({ c1: "2", c2: "9290245" });
+        (function () {
+            var s = document.createElement("script"), el = document.getElementsByTagName("script")[0]; s.async = true;
+            s.src = (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js";
+            el.parentNode.insertBefore(s, el);
+        })();
+    </script>
+    <noscript>
+    <img src="http://b.scorecardresearch.com/p?c1=2&c2=9290245&cv=2.0&cj=1" />
+    </noscript>
+
+    
+<div id="doc2" class="yui-t7">
+	<div id="hd">
+		
+
+<div id="main-logo"><a href="/" title="Home"><img src="/Content/Images/metal-review-logo.png" alt="Metal Review Home" border="0" /></a></div>
+<div id="leaderboard-banner">
+
+<script language="javascript" type="text/javascript"><!--
+    document.write('<scr' + 'ipt language="javascript1.1" src="http://adserver.adtechus.com/addyn/3.0/5110/73085/0/225/ADTECH;loc=100;target=_blank;key=key1+key2+key3+key4;grp=[group];misc=' + new Date().getTime() + '"></scri' + 'pt>');
+    //-->
+</script>
+
+<noscript>
+    <a href="http://adserver.adtechus.com/adlink/3.0/5110/73085/0/225/ADTECH;loc=300;key=key1+key2+key3+key4;grp=[group]" target="_blank">
+        <img src="http://adserver.adtechus.com/adserv/3.0/5110/73085/0/225/ADTECH;loc=300;key=key1+key2+key3+key4;grp=[group]" border="0" width="728" height="90" />
+    </a>
+</noscript>
+</div>
+<div id="header-menu-container">
+    <div id="header-menu">
+        <a href="/reviews/browse">REVIEWS</a>
+        <a href="http://community2.metalreview.com/blogs/editorials/default.aspx">FEATURES</a>
+        <a href="/artists/browse">ARTISTS</a>
+        <a href="/reviews/pipeline">PIPELINE</a>
+        <a href="http://community2.metalreview.com/forums">FORUMS</a>
+        <a href="http://community2.metalreview.com/blogs/">BLOGS</a>
+        <a href="/aboutus">ABOUT US</a>
+    </div>
+    
+        <div id="sign-in"><a href="https://metalreview.com/account/signin">SIGN IN</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="/account/register">JOIN US</a></div>
+    
+</div>
+	</div>
+	<div id="bd">
+        
+		<div id="yui-main">
+			<div class="yui-b">
+				<div class="yui-g">
+					<div class="yui-u first">
+						
+     
+
+<script src="/Scripts/jquery.wt-rotator.min.js" type="text/javascript"></script>
+<script src="/Scripts/jquery.wt-rotator-initialize.js" type="text/javascript"></script>
+<div id="review-showcase-wrapper">
+    <h2 id="showcase-heading">Reviews</h2>
+    <div id="review-showcase">
+        <div class="container">
+            <div class="wt-rotator">
+                <a href="#"></a>
+                <div class="desc">
+                </div>
+                <div class="preloader">
+                </div>
+                <div class="c-panel">
+                    <div class="buttons">
+                        <div class="prev-btn">
+                        </div>
+                        <div class="play-btn">
+                        </div>
+                        <div class="next-btn">
+                        </div>
+                    </div>
+                    <div class="thumbnails">
+                        <ul>
+                              
+                             <li><a href="artist.photo?mrx=4641" title="Serpentine Path - Serpentine Path"></a><a href="/reviews/6844/serpentine-path-serpentine-path"></a>
+                                 <p style="top: 130px; left: 22px; width: 305px; height:60px;">
+                                    <img class="rotator-cover-art" src="album.cover?art=6844" alt='Serpentine Path - Serpentine Path' title='Serpentine Path - Serpentine Path' />
+                                    <span class="title"><strong>Serpentine Path</strong></span><br />
+                                    Serpentine Path<br />
+                                    
+                                </p>
+                            </li>
+                             
+                             <li><a href="artist.photo?mrx=4635" title="Hunter's Ground - No God But the Wild"></a><a href="/reviews/6830/hunters-ground-no-god-but-the-wild"></a>
+                                 <p style="top: 130px; left: 22px; width: 305px; height:60px;">
+                                    <img class="rotator-cover-art" src="album.cover?art=6830" alt='Hunter's Ground - No God But the Wild' title='Hunter's Ground - No God But the Wild' />
+                                    <span class="title"><strong>Hunter's Ground</strong></span><br />
+                                    No God But the Wild<br />
+                                    
+                                </p>
+                            </li>
+                             
+                             <li><a href="artist.photo?mrx=1035" title="Blut Aus Nord - 777 - Cosmosophy"></a><a href="/reviews/6829/blut-aus-nord-777---cosmosophy"></a>
+                                 <p style="top: 130px; left: 22px; width: 305px; height:60px;">
+                                    <img class="rotator-cover-art" src="album.cover?art=6829" alt='Blut Aus Nord - 777 - Cosmosophy' title='Blut Aus Nord - 777 - Cosmosophy' />
+                                    <span class="title"><strong>Blut Aus Nord</strong></span><br />
+                                    777 - Cosmosophy<br />
+                                    <a href="/tags/10/black"><span class="tag">Black</span></a>
+                                </p>
+                            </li>
+                             
+                             <li><a href="artist.photo?mrx=1217" title="Ufomammut - Oro: Opus Alter"></a><a href="/reviews/6835/ufomammut-oro--opus-alter"></a>
+                                 <p style="top: 130px; left: 22px; width: 305px; height:60px;">
+                                    <img class="rotator-cover-art" src="album.cover?art=6835" alt='Ufomammut - Oro: Opus Alter' title='Ufomammut - Oro: Opus Alter' />
+                                    <span class="title"><strong>Ufomammut</strong></span><br />
+                                    Oro: Opus Alter<br />
+                                    <a href="/tags/2/doom"><span class="tag">Doom</span></a>
+                                </p>
+                            </li>
+                             
+                             <li><a href="artist.photo?mrx=4590" title="Resurgency - False Enlightenment"></a><a href="/reviews/6746/resurgency-false-enlightenment"></a>
+                                 <p style="top: 130px; left: 22px; width: 305px; height:60px;">
+                                    <img class="rotator-cover-art" src="album.cover?art=6746" alt='Resurgency - False Enlightenment' title='Resurgency - False Enlightenment' />
+                                    <span class="title"><strong>Resurgency</strong></span><br />
+                                    False Enlightenment<br />
+                                    <a href="/tags/1/death"><span class="tag">Death</span></a>
+                                </p>
+                            </li>
+                             
+                             <li><a href="artist.photo?mrx=1360" title="Morgoth - Cursed to Live"></a><a href="/reviews/6800/morgoth-cursed-to-live"></a>
+                                 <p style="top: 130px; left: 22px; width: 305px; height:60px;">
+                                    <img class="rotator-cover-art" src="album.cover?art=6800" alt='Morgoth - Cursed to Live' title='Morgoth - Cursed to Live' />
+                                    <span class="title"><strong>Morgoth</strong></span><br />
+                                    Cursed to Live<br />
+                                    <a href="/tags/1/death"><span class="tag">Death</span></a><a href="/tags/31/live"><span class="tag">Live</span></a>
+                                </p>
+                            </li>
+                             
+                             <li><a href="artist.photo?mrx=3879" title="Krallice - Years Past Matter"></a><a href="/reviews/6853/krallice-years-past-matter"></a>
+                                 <p style="top: 130px; left: 22px; width: 305px; height:60px;">
+                                    <img class="rotator-cover-art" src="album.cover?art=6853" alt='Krallice - Years Past Matter' title='Krallice - Years Past Matter' />
+                                    <span class="title"><strong>Krallice</strong></span><br />
+                                    Years Past Matter<br />
+                                    <a href="/tags/10/black"><span class="tag">Black</span></a>
+                                </p>
+                            </li>
+                             
+                             <li><a href="artist.photo?mrx=4243" title="Murder Construct - Results"></a><a href="/reviews/6782/murder-construct-results"></a>
+                                 <p style="top: 130px; left: 22px; width: 305px; height:60px;">
+                                    <img class="rotator-cover-art" src="album.cover?art=6782" alt='Murder Construct - Results' title='Murder Construct - Results' />
+                                    <span class="title"><strong>Murder Construct</strong></span><br />
+                                    Results<br />
+                                    <a href="/tags/13/grindcore"><span class="tag">Grindcore</span></a>
+                                </p>
+                            </li>
+                             
+                             <li><a href="artist.photo?mrx=251" title="Grave - Endless Procession of Souls"></a><a href="/reviews/6834/grave-endless-procession-of-souls"></a>
+                                 <p style="top: 130px; left: 22px; width: 305px; height:60px;">
+                                    <img class="rotator-cover-art" src="album.cover?art=6834" alt='Grave - Endless Procession of Souls' title='Grave - Endless Procession of Souls' />
+                                    <span class="title"><strong>Grave</strong></span><br />
+                                    Endless Procession of Souls<br />
+                                    <a href="/tags/1/death"><span class="tag">Death</span></a>
+                                </p>
+                            </li>
+                             
+                             <li><a href="artist.photo?mrx=3508" title="Master - The New Elite"></a><a href="/reviews/6774/master-the-new-elite"></a>
+                                 <p style="top: 130px; left: 22px; width: 305px; height:60px;">
+                                    <img class="rotator-cover-art" src="album.cover?art=6774" alt='Master - The New Elite' title='Master - The New Elite' />
+                                    <span class="title"><strong>Master</strong></span><br />
+                                    The New Elite<br />
+                                    <a href="/tags/1/death"><span class="tag">Death</span></a>
+                                </p>
+                            </li>
+                            
+                        </ul>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div id="showcase-all-artist-albums">
+        <a href="/reviews/6844/serpentine-path-serpentine-path"><img src="album.cover?art=6844" alt="Serpentine Path - Serpentine Path" /></a><a href="/reviews/6830/hunters-ground-no-god-but-the-wild"><img src="album.cover?art=6830" alt="Hunter's Ground - No God But the Wild" /></a><a href="/reviews/6829/blut-aus-nord-777---cosmosophy"><img src="album.cover?art=6829" alt="Blut Aus Nord - 777 - Cosmosophy" /></a><a href="/reviews/6835/ufomammut-oro--opus-alter"><img src="album.cover?art=6835" alt="Ufomammut - Oro: Opus Alter" /></a><a href="/reviews/6746/resurgency-false-enlightenment"><img src="album.cover?art=6746" alt="Resurgency - False Enlightenment" /></a><a href="/reviews/6800/morgoth-cursed-to-live"><img src="album.cover?art=6800" alt="Morgoth - Cursed to Live" /></a><a href="/reviews/6853/krallice-years-past-matter"><img src="album.cover?art=6853" alt="Krallice - Years Past Matter" /></a><a href="/reviews/6782/murder-construct-results"><img src="album.cover?art=6782" alt="Murder Construct - Results" /></a><a href="/reviews/6834/grave-endless-procession-of-souls"><img src="album.cover?art=6834" alt="Grave - Endless Procession of Souls" /></a><a href="/reviews/6774/master-the-new-elite"><img src="album.cover?art=6774" alt="Master - The New Elite" /></a>
+    </div>
+</div>
+					</div>
+					<div class="yui-u">
+						
+    
+
+<div id="feature-feed">
+<h2>Features</h2>
+<div class="feature-feed-line"><a href="http://community2.metalreview.com/blogs/editorials/archive/2012/08/15/corsair-interview.aspx"><span class="feature-link"><strong>Release The SkyKrakken: Corsair Interview</strong></span></a><br /><span class="publish-date">8/15/2012 by JW</span><img align="left" src="http://community2.metalreview.com/cfs-file.ashx/__key/CommunityServer.Components.Avatars/00.00.00.21.25/4TMR3E1CWERK.jpg" alt="JW's Avatar" width="36px" height="40px" border="0" /></div>
+<div class="feature-feed-line"><a href="http://community2.metalreview.com/blogs/editorials/archive/2012/08/09/riffology-kreative-evolution-part-iii.aspx"><span class="feature-link"><strong>Riffology: Kreative Evolution, Part III</strong></span></a><br /><span class="publish-date">8/9/2012 by Achilles</span><img align="left" src="http://community2.metalreview.com/cfs-file.ashx/__key/CommunityServer.Components.Avatars/00.00.00.21.44/4THUGH622I68.jpg" alt="Achilles's Avatar" width="40px" height="39px" border="0" /></div>
+<div class="feature-feed-line"><a href="http://community2.metalreview.com/blogs/editorials/archive/2012/08/02/reverend-s-bazaar-don-t-trend-on-me.aspx"><span class="feature-link"><strong>Reverend's Bazaar - Don't Trend On Me  </strong></span></a><br /><span class="publish-date">8/2/2012 by Reverend Campbell</span><img align="left" src="http://community2.metalreview.com/cfs-file.ashx/__key/CommunityServer.Components.Avatars/00.00.00.21.18/4TM06FD0ND4G.png" alt="Reverend Campbell's Avatar" width="34px" height="40px" border="0" /></div>
+<div class="feature-feed-line"><a href="http://community2.metalreview.com/blogs/editorials/archive/2012/08/01/grand-theft-metal-three-for-free.aspx"><span class="feature-link"><strong>Grand Theft Metal - Free Four All  </strong></span></a><br /><span class="publish-date">8/2/2012 by Dave</span><img align="left" src="http://community2.metalreview.com/cfs-file.ashx/__key/CommunityServer.Components.Avatars/00.00.00.22.16/4TKJCJQ00VFO.jpg" alt="Dave's Avatar" width="33px" height="40px" border="0" /></div>
+<div class="feature-feed-line"><a href="http://community2.metalreview.com/blogs/editorials/archive/2012/07/29/monday-with-moonspell-the-interview.aspx"><span class="feature-link"><strong>A Monday with Moonspell: The Interview</strong></span></a><br /><span class="publish-date">7/29/2012 by raetamacue</span><img align="left" src="http://community2.metalreview.com/cfs-file.ashx/__key/CommunityServer.Components.Avatars/00.00.00.71.26/4TLIHKLUSXF4.jpg" alt="raetamacue's Avatar" width="37px" height="40px" border="0" /></div>
+<div class="feature-feed-line"><a href="http://community2.metalreview.com/blogs/editorials/archive/2012/07/26/riffology-kreative-evolution-part-ii.aspx"><span class="feature-link"><strong>Riffology: Kreative Evolution Part II</strong></span></a><br /><span class="publish-date">7/26/2012 by Achilles</span><img align="left" src="http://community2.metalreview.com/cfs-file.ashx/__key/CommunityServer.Components.Avatars/00.00.00.21.44/4THUGH622I68.jpg" alt="Achilles's Avatar" width="40px" height="39px" border="0" /></div>
+<div class="feature-feed-line"><a href="http://community2.metalreview.com/blogs/editorials/archive/2012/07/24/shadow-kingdom-records-giveaway.aspx"><span class="feature-link"><strong>WINNERS ANNOUNCED -- Shadow Kingdom Records Give...</strong></span></a><br /><span class="publish-date">7/24/2012 by Metal Review</span><img align="left" src="http://community2.metalreview.com/cfs-file.ashx/__key/CommunityServer.Components.Avatars/00.00.00.59.06/4TFD2N58B7BS.png" alt="Metal Review's Avatar" width="34px" height="40px" border="0" /></div>
+
+<br />
+<a href="http://community2.metalreview.com/blogs/editorials/default.aspx"><strong>More Editorials</strong></a>
+</div>
+
+
+
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="yui-b">
+			
+    
+
+<script src="/Scripts/jquery.cycle.all.min.js" type="text/javascript"></script>
+<div id="slider-next-button"><img id="slider-next" src="/Content/Images/Backgrounds/rotator-next-button.png" alt="Goto Next Group" title="Goto Next Group" /></div>
+<div id="slider-back-button"><img id="slider-back" src="/Content/Images/Backgrounds/rotator-back-button.png" alt="Goto Previous Group" title="Goto Previous Group" /></div>
+<div id="latest-reviews-slider">
+<div class="slider-row">
+<div class="slider-item"><a href="/reviews/6795/midnight-complete-and-total-hell"><img src="album.cover?art=6795" alt="Midnight Complete and Total Hell" /><br /><strong>Midnight</strong><br /><em>Complete and Total Hell</em></a><div class="score">8.5</div></div>
+<div class="slider-item"><a href="/reviews/6842/over-your-threshold-facticity"><img src="album.cover?art=6842" alt="Over Your Threshold Facticity" /><br /><strong>Over Your Threshold</strong><br /><em>Facticity</em></a><div class="score">6.0</div></div>
+<div class="slider-item"><a href="/reviews/6813/nuclear-death-terror-chaos-reigns"><img src="album.cover?art=6813" alt="Nuclear Death Terror Chaos Reigns" /><br /><strong>Nuclear Death Terror</strong><br /><em>Chaos Reigns</em></a><div class="score">7.5</div></div>
+<div class="slider-item"><a href="/reviews/6811/evoken-atra-mors"><img src="album.cover?art=6811" alt="Evoken Atra Mors" /><br /><strong>Evoken</strong><br /><em>Atra Mors</em></a><div class="score">9.5</div></div>
+<div class="slider-item"><a href="/reviews/6807/blacklodge-machination"><img src="album.cover?art=6807" alt="Blacklodge MachinatioN" /><br /><strong>Blacklodge</strong><br /><em>MachinatioN</em></a><div class="score">5.5</div></div>
+<div class="slider-item"><a href="/reviews/6832/prototype-catalyst"><img src="album.cover?art=6832" alt="Prototype Catalyst" /><br /><strong>Prototype</strong><br /><em>Catalyst</em></a><div class="score">8.0</div></div>
+<div class="slider-item"><a href="/reviews/6822/hypnosia-horror-infernal"><img src="album.cover?art=6822" alt="Hypnosia Horror Infernal" /><br /><strong>Hypnosia</strong><br /><em>Horror Infernal</em></a><div class="score">7.0</div></div>
+<div class="slider-item"><a href="/reviews/6787/om-advaitic-songs"><img src="album.cover?art=6787" alt="OM Advaitic Songs" /><br /><strong>OM</strong><br /><em>Advaitic Songs</em></a><div class="score">8.0</div></div>
+<div class="slider-item"><a href="/reviews/6765/afgrund-the-age-of-dumb"><img src="album.cover?art=6765" alt="Afgrund The Age Of Dumb" /><br /><strong>Afgrund</strong><br /><em>The Age Of Dumb</em></a><div class="score">8.5</div></div>
+<div class="slider-item"><a href="/reviews/6773/binah-hallucinating-in-resurrecture"><img src="album.cover?art=6773" alt="Binah Hallucinating in Resurrecture" /><br /><strong>Binah</strong><br /><em>Hallucinating in Resurrecture</em></a><div class="score">8.5</div></div>
+</div>
+<div class="slider-row">
+<div class="slider-item"><a href="/reviews/6802/deiphago-satan-alpha-omega"><img src="album.cover?art=6802" alt="Deiphago Satan Alpha Omega" /><br /><strong>Deiphago</strong><br /><em>Satan Alpha Omega</em></a><div class="score">8.0</div></div>
+<div class="slider-item"><a href="/reviews/6719/conan-monnos"><img src="album.cover?art=6719" alt="Conan Monnos" /><br /><strong>Conan</strong><br /><em>Monnos</em></a><div class="score">8.0</div></div>
+<div class="slider-item"><a href="/reviews/6702/alaric-alaric-atriarch---split-lp"><img src="album.cover?art=6702" alt="Alaric Alaric/Atriarch - Split LP" /><br /><strong>Alaric</strong><br /><em>Alaric/Atriarch - Split LP</em></a><div class="score">8.5</div></div>
+<div class="slider-item"><a href="/reviews/6780/coven-worship-new-gods-(reissue)"><img src="album.cover?art=6780" alt="Coven Worship New Gods (Reissue)" /><br /><strong>Coven</strong><br /><em>Worship New Gods (Reissue)</em></a><div class="score">5.0</div></div>
+<div class="slider-item"><a href="/reviews/6831/the-foreshadowing-second-world"><img src="album.cover?art=6831" alt="The Foreshadowing Second World" /><br /><strong>The Foreshadowing</strong><br /><em>Second World</em></a><div class="score">5.5</div></div>
+<div class="slider-item"><a href="/reviews/6815/nether-regions-into-the-breach"><img src="album.cover?art=6815" alt="Nether Regions Into The Breach" /><br /><strong>Nether Regions</strong><br /><em>Into The Breach</em></a><div class="score">7.0</div></div>
+<div class="slider-item"><a href="/reviews/6824/agalloch-faustian-echoes"><img src="album.cover?art=6824" alt="Agalloch Faustian Echoes" /><br /><strong>Agalloch</strong><br /><em>Faustian Echoes</em></a><div class="score">9.0</div></div>
+<div class="slider-item"><a href="/reviews/6805/a-forest-of-stars-a-shadowplay-for-yesterdays"><img src="album.cover?art=6805" alt="A Forest Of Stars A Shadowplay For Yesterdays" /><br /><strong>A Forest Of Stars</strong><br /><em>A Shadowplay For Yesterdays</em></a><div class="score">9.0</div></div>
+<div class="slider-item"><a href="/reviews/6763/de-profundis-the-emptiness-within"><img src="album.cover?art=6763" alt="De Profundis The Emptiness Within" /><br /><strong>De Profundis</strong><br /><em>The Emptiness Within</em></a><div class="score">7.5</div></div>
+<div class="slider-item"><a href="/reviews/6826/ozzy-osbourne-speak-of-the-devil"><img src="album.cover?art=6826" alt="Ozzy Osbourne Speak of the Devil" /><br /><strong>Ozzy Osbourne</strong><br /><em>Speak of the Devil</em></a><div class="score">7.5</div></div>
+</div>
+<div class="slider-row">
+<div class="slider-item"><a href="/reviews/6825/testament-dark-roots-of-earth"><img src="album.cover?art=6825" alt="Testament Dark Roots of Earth" /><br /><strong>Testament</strong><br /><em>Dark Roots of Earth</em></a><div class="score">8.0</div></div>
+<div class="slider-item"><a href="/reviews/6796/eagle-twin-the-feather-tipped-the-serpents-scale"><img src="album.cover?art=6796" alt="Eagle Twin The Feather Tipped The Serpent's Scale" /><br /><strong>Eagle Twin</strong><br /><em>The Feather Tipped The Serpent's Scale</em></a><div class="score">8.5</div></div>
+<div class="slider-item"><a href="/reviews/6609/king-forged-by-satans-doctrine"><img src="album.cover?art=6609" alt="King Forged by Satan's Doctrine" /><br /><strong>King</strong><br /><em>Forged by Satan's Doctrine</em></a><div class="score">5.5</div></div>
+<div class="slider-item"><a href="/reviews/6798/khors-wisdom-of-centuries"><img src="album.cover?art=6798" alt="Khors Wisdom of Centuries" /><br /><strong>Khors</strong><br /><em>Wisdom of Centuries</em></a><div class="score">8.5</div></div>
+<div class="slider-item"><a href="/reviews/6776/samothrace-reverence-to-stone"><img src="album.cover?art=6776" alt="Samothrace Reverence To Stone" /><br /><strong>Samothrace</strong><br /><em>Reverence To Stone</em></a><div class="score">8.0</div></div>
+<div class="slider-item"><a href="/reviews/6784/horseback-on-the-eclipse"><img src="album.cover?art=6784" alt="Horseback On the Eclipse" /><br /><strong>Horseback</strong><br /><em>On the Eclipse</em></a><div class="score">8.0</div></div>
+<div class="slider-item"><a href="/reviews/6690/incoming-cerebral-overdrive-le-stelle--a-voyage-adrift"><img src="album.cover?art=6690" alt="Incoming Cerebral Overdrive Le Stelle: A Voyage Adrift" /><br /><strong>Incoming Cerebral Overdrive</strong><br /><em>Le Stelle: A Voyage Adrift</em></a><div class="score">7.5</div></div>
+<div class="slider-item"><a href="/reviews/6658/struck-by-lightning-true-predation"><img src="album.cover?art=6658" alt="Struck By Lightning True Predation" /><br /><strong>Struck By Lightning</strong><br /><em>True Predation</em></a><div class="score">7.0</div></div>
+<div class="slider-item"><a href="/reviews/6772/offending-age-of-perversion"><img src="album.cover?art=6772" alt="Offending Age of Perversion" /><br /><strong>Offending</strong><br /><em>Age of Perversion</em></a><div class="score">7.5</div></div>
+<div class="slider-item"><a href="/reviews/6804/king-of-asgard----to-north"><img src="album.cover?art=6804" alt="King Of Asgard ...to North" /><br /><strong>King Of Asgard</strong><br /><em>...to North</em></a><div class="score">7.5</div></div>
+</div>
+<div class="slider-row">
+<div class="slider-item"><a href="/reviews/6783/burning-love-rotten-thing-to-say"><img src="album.cover?art=6783" alt="Burning Love Rotten Thing to Say" /><br /><strong>Burning Love</strong><br /><em>Rotten Thing to Say</em></a><div class="score">7.0</div></div>
+<div class="slider-item"><a href="/reviews/6770/high-on-fire-the-art-of-self-defense-(reissue)"><img src="album.cover?art=6770" alt="High On Fire The Art Of Self Defense (Reissue)" /><br /><strong>High On Fire</strong><br /><em>The Art Of Self Defense (Reissue)</em></a><div class="score">7.5</div></div>
+<div class="slider-item"><a href="/reviews/6660/horseback-half-blood"><img src="album.cover?art=6660" alt="Horseback Half Blood" /><br /><strong>Horseback</strong><br /><em>Half Blood</em></a><div class="score">6.5</div></div>
+<div class="slider-item"><a href="/reviews/6732/aldebaran-embracing-the-lightless-depths"><img src="album.cover?art=6732" alt="Aldebaran Embracing the Lightless Depths" /><br /><strong>Aldebaran</strong><br /><em>Embracing the Lightless Depths</em></a><div class="score">8.0</div></div>
+<div class="slider-item"><a href="/reviews/6778/tank-war-nation"><img src="album.cover?art=6778" alt="Tank War Nation" /><br /><strong>Tank</strong><br /><em>War Nation</em></a><div class="score">6.5</div></div>
+<div class="slider-item"><a href="/reviews/6793/satanic-bloodspraying-at-the-mercy-of-satan"><img src="album.cover?art=6793" alt="Satanic Bloodspraying At the Mercy of Satan" /><br /><strong>Satanic Bloodspraying</strong><br /><em>At the Mercy of Satan</em></a><div class="score">8.5</div></div>
+<div class="slider-item"><a href="/reviews/6791/from-ashes-rise-rejoice-the-end---rage-of-sanity"><img src="album.cover?art=6791" alt="From Ashes Rise Rejoice The End / Rage Of Sanity" /><br /><strong>From Ashes Rise</strong><br /><em>Rejoice The End / Rage Of Sanity</em></a><div class="score">8.0</div></div>
+<div class="slider-item"><a href="/reviews/6743/ereb-altor-gastrike"><img src="album.cover?art=6743" alt="Ereb Altor Gastrike" /><br /><strong>Ereb Altor</strong><br /><em>Gastrike</em></a><div class="score">8.0</div></div>
+<div class="slider-item"><a href="/reviews/6794/catheter-southwest-doom-violence"><img src="album.cover?art=6794" alt="Catheter Southwest Doom Violence" /><br /><strong>Catheter</strong><br /><em>Southwest Doom Violence</em></a><div class="score">7.0</div></div>
+<div class="slider-item"><a href="/reviews/6759/power-theory-an-axe-to-grind"><img src="album.cover?art=6759" alt="Power Theory An Axe to Grind" /><br /><strong>Power Theory</strong><br /><em>An Axe to Grind</em></a><div class="score">6.0</div></div>
+</div>
+
+ </div>
+  
+
+ <script type="text/javascript">
+     $(document).ready(function () {
+         $('#latest-reviews-slider').cycle({
+             fx: 'scrollRight',
+             speed: 'fast',
+             timeout: 0,
+             next: '#slider-next-button',
+             prev: '#slider-back-button'
+         });
+     });
+</script>
+
+<div id="homepage-mid-horizontal-zone">
+    <script language="javascript" type="text/javascript" src="http://metalreview.com/bannermgr/abm.aspx?z=1"></script>
+</div>
+
+
+
+
+<div id="news-feed">
+<h2>News</h2><div class="news-feed-line"><a href="http://www.bravewords.com/news/190057" target="_blank"><span class="news-link"><strong><span class="new-news">NEW</span> CENTURIAN To Release Contra Rationem Album This Winter</strong></span></a><br /><span class="publish-date">9/12/2012</span></div><br />
+<div class="news-feed-line"><a href="http://www.bravewords.com/news/190056" target="_blank"><span class="news-link"><strong><span class="new-news">NEW</span> Southwest Terror Fest 2012 - Lineup Changes Announced</strong></span></a><br /><span class="publish-date">9/12/2012</span></div><br />
+<div class="news-feed-line"><a href="http://www.bravewords.com/news/190055" target="_blank"><span class="news-link"><strong><span class="new-news">NEW</span> ROB ZOMBIE Premiers The Lords Of Salem At TIFF; Q&A Video Posted</strong></span></a><br /><span class="publish-date">9/12/2012</span></div><br />
+<div class="news-feed-line"><a href="http://www.bravewords.com/news/190054" target="_blank"><span class="news-link"><strong><span class="new-news">NEW</span> THIN LIZZY Keyboardist Darren Wharton's DARE - Calm Before The Storm 2 Album Details Revealed</strong></span></a><br /><span class="publish-date">9/12/2012</span></div><br />
+<div class="news-feed-line"><a href="http://www.bravewords.com/news/190053" target="_blank"><span class="news-link"><strong><span class="new-news">NEW</span> Japan's LIV MOON To Release Fourth Album; Features Past/Present Members Of EUROPE, ANGRA, HAMMERFALL</strong></span></a><br /><span class="publish-date">9/12/2012</span></div><br />
+<div class="news-feed-line"><a href="http://www.bravewords.com/news/190052" target="_blank"><span class="news-link"><strong><span class="new-news">NEW</span> SLASH - Sydney Show To Premier This Friday, Free And In HD; Trailer Posted</strong></span></a><br /><span class="publish-date">9/12/2012</span></div><br />
+<div class="news-feed-line"><a href="http://www.bravewords.com/news/190051" target="_blank"><span class="news-link"><strong><span class="new-news">NEW</span> KHAØS - New Band Featuring Members Of OUTLOUD, TRIBAL, JORN And ELIS To Release New EP In October; Teaser Posted </strong></span></a><br /><span class="publish-date">9/12/2012</span></div><br />
+<div class="news-feed-line"><a href="http://www.bravewords.com/news/190050" target="_blank"><span class="news-link"><strong><span class="new-news">NEW</span> RECKLESS LOVE Confirm Guests For London Residency Shows In October</strong></span></a><br /><span class="publish-date">9/12/2012</span></div><br />
+<div class="news-feed-line"><a href="http://www.bravewords.com/news/190049" target="_blank"><span class="news-link"><strong>NASHVILLE PUSSY Add Dates In France, Sweden To European Tour Schedule; Bassist Karen Cuda Sidelined With Back Injury	</strong></span></a><br /><span class="publish-date">9/12/2012</span></div><br />
+<div class="news-feed-line"><a href="http://www.bravewords.com/news/190048" target="_blank"><span class="news-link"><strong>CALIBAN Post Behind-The-Scenes Tour Footage</strong></span></a><br /><span class="publish-date">9/12/2012</span></div><br />
+<div class="news-feed-line"><a href="http://www.bravewords.com/news/190047" target="_blank"><span class="news-link"><strong>Ex-MERCYFUL FATE Drummer Kim Ruzz Forms New Band METALRUZZ</strong></span></a><br /><span class="publish-date">9/12/2012</span></div><br />
+<div class="news-feed-line"><a href="http://www.bravewords.com/news/190046" target="_blank"><span class="news-link"><strong>GRAVE Mainman On Endless Procession Of Souls - "These Are The Most ‘Song-Oriented’ Tracks We’ve Done In A Long Time"</strong></span></a><br /><span class="publish-date">9/12/2012</span></div><br />
+
+</div>
+
+
+<div id="lashes-feed">
+<h2>Lashes</h2>
+<div class="lashes-feed-line"><a href="/reviews/6855/katatonia-dead-end-kings#81760"><span class="new-lash">NEW</span> <span class="lashes-link"><strong>Katatonia - Dead End Kings</strong></span></a><br /><span class="publish-date">45 minutes ago by Chaosjunkie</span></div>
+<div class="lashes-feed-line"><a href="/reviews/6855/katatonia-dead-end-kings#81759"><span class="lashes-link"><strong>Katatonia - Dead End Kings</strong></span></a><br /><span class="publish-date">1 hour ago by Harry Dick Rotten</span></div>
+<div class="lashes-feed-line"><a href="/reviews/6746/resurgency-false-enlightenment#81758"><span class="lashes-link"><strong>Resurgency - False Enlightenment</strong></span></a><br /><span class="publish-date">3 hours ago by Anonymous</span></div>
+<div class="lashes-feed-line"><a href="/reviews/4095/witchcraft-the-alchemist#81757"><span class="lashes-link"><strong>Witchcraft - The Alchemist</strong></span></a><br /><span class="publish-date">5 hours ago by Luke_22</span></div>
+<div class="lashes-feed-line"><a href="/reviews/6855/katatonia-dead-end-kings#81756"><span class="lashes-link"><strong>Katatonia - Dead End Kings</strong></span></a><br /><span class="publish-date">9 hours ago by chaosjunkie</span></div>
+<div class="lashes-feed-line"><a href="/reviews/6855/katatonia-dead-end-kings#81755"><span class="lashes-link"><strong>Katatonia - Dead End Kings</strong></span></a><br /><span class="publish-date">10 hours ago by Compeller</span></div>
+<div class="lashes-feed-line"><a href="/reviews/6827/manetheren-time#81754"><span class="lashes-link"><strong>Manetheren - Time</strong></span></a><br /><span class="publish-date">10 hours ago by xpmule</span></div>
+<div class="lashes-feed-line"><a href="/reviews/6835/ufomammut-oro--opus-alter#81753"><span class="lashes-link"><strong>Ufomammut - Oro: Opus Alter</strong></span></a><br /><span class="publish-date">16 hours ago by Anonymous</span></div>
+<div class="lashes-feed-line"><a href="/reviews/6835/ufomammut-oro--opus-alter#81752"><span class="lashes-link"><strong>Ufomammut - Oro: Opus Alter</strong></span></a><br /><span class="publish-date">17 hours ago by Harry Dick Rotten</span></div>
+<div class="lashes-feed-line"><a href="/reviews/6855/katatonia-dead-end-kings#81751"><span class="lashes-link"><strong>Katatonia - Dead End Kings</strong></span></a><br /><span class="publish-date">yesterday by Chaosjunkie</span></div>
+<div class="lashes-feed-line"><a href="/reviews/6855/katatonia-dead-end-kings#81750"><span class="lashes-link"><strong>Katatonia - Dead End Kings</strong></span></a><br /><span class="publish-date">yesterday by Anonymous</span></div>
+<div class="lashes-feed-line"><a href="/reviews/6855/katatonia-dead-end-kings#81749"><span class="lashes-link"><strong>Katatonia - Dead End Kings</strong></span></a><br /><span class="publish-date">yesterday by Anonymous</span></div>
+<div class="lashes-feed-line"><a href="/reviews/6855/katatonia-dead-end-kings#81748"><span class="lashes-link"><strong>Katatonia - Dead End Kings</strong></span></a><br /><span class="publish-date">yesterday by Anonymous</span></div>
+<div class="lashes-feed-line"><a href="/reviews/6855/katatonia-dead-end-kings#81747"><span class="lashes-link"><strong>Katatonia - Dead End Kings</strong></span></a><br /><span class="publish-date">yesterday by frantic</span></div>
+<div class="lashes-feed-line"><a href="/reviews/6829/blut-aus-nord-777---cosmosophy#81746"><span class="lashes-link"><strong>Blut Aus Nord - 777 - Cosmosophy</strong></span></a><br /><span class="publish-date">yesterday by Dimensional Bleedthrough</span></div>
+
+ </div>
+
+		</div>
+	</div>
+	<div id="ft">
+		
+
+<div id="template-footer">
+    <div class="left-column">
+        <ul>
+            <li><a href="/">Home</a></li>
+            <li><a href="/reviews/browse">Reviews</a></li>
+            <li><a href="/tags">Genre Tags</a></li>
+            <li><a href="http://community2.metalreview.com/blogs/editorials/default.aspx">Features</a></li>
+            <li><a href="/artists/browse">Artists</a></li>
+            <li><a href="/reviews/pipeline">Pipeline</a></li>
+            <li><a href="http://community2.metalreview.com/forums">Forums</a></li>
+            <li><a href="/aboutus">About Us</a></li>
+        </ul>
+    </div>
+    <div class="middle-column">
+        <ul>
+            <li><a href="/aboutus/disclaimer">Disclaimer</a></li>
+            <li><a href="/aboutus/privacypolicy">Privacy Policy</a></li>
+            <li><a href="/aboutus/advertising">Advertising</a></li>
+            <li><a href="http://community2.metalreview.com/blogs/eminor/archive/2008/10/27/write-for-metal-review.aspx">Write For Us</a></li>
+            <li><a href="/contactus">Contact Us</a></li>
+            <li><a href="/contactus">Digital Promos</a></li>
+            <li><a href="/contactus">Mailing Address</a></li>
+        </ul>
+    </div>
+    <div class="right-column">
+        <ul>
+            <li><a href="http://feeds.feedburner.com/metalreviews">Reviews RSS Feed</a></li>
+            <li><a href="http://twitter.com/metalreview">Twitter</a></li>
+            <li><a href="http://www.myspace.com/metalreviewdotcom">MySpace</a></li>
+            <li><a href="http://www.last.fm/group/MetalReview.com">Last.fm</a></li>
+            <li><a href="http://www.facebook.com/pages/MetalReviewcom/48371319443">Facebook</a></li>
+        </ul>
+    </div>
+    <div class="square-ad">
+        
+
+<!--JavaScript Tag // Tag for network 5110: Fixion Media // Website: Metalreview // Page: ROS // Placement: ROS-Middle-300 x 250 (1127996) // created at: Oct 19, 2009 6:48:27 PM-->
+<script type="text/javascript" language="javascript"><!--
+    document.write('<scr' + 'ipt language="javascript1.1" src="http://adserver.adtechus.com/addyn/3.0/5110/1127996/0/170/ADTECH;loc=100;target=_blank;key=key1+key2+key3+key4;grp=[group];misc=' + new Date().getTime() + '"></scri' + 'pt>');
+//-->
+</script><noscript><a href="http://adserver.adtechus.com/adlink/3.0/5110/1127996/0/170/ADTECH;loc=300;key=key1+key2+key3+key4;grp=[group]" target="_blank"><img src="http://adserver.adtechus.com/adserv/3.0/5110/1127996/0/170/ADTECH;loc=300;key=key1+key2+key3+key4;grp=[group]" border="0" width="300" height="250"></a></noscript>
+<!-- End of JavaScript Tag -->
+    </div>
+</div>
+	</div>
+</div>
+
+    <script type="text/javascript">
+        var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+        document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+    </script>
+
+    <script type="text/javascript">
+        var pageTracker = _gat._getTracker("UA-3455310-1");
+        pageTracker._initData();
+        pageTracker._trackPageview();
+    </script>
+
+    <!--JavaScript Tag // Tag for network 5110: Fixion Media // Website: Metalreview // Page: BACKGROUND ADS // Placement: BACKGROUND ADS-Top-1 x 1 (2186116) // created at: Aug 18, 2011 7:20:38 PM-->
+    <script language="javascript"><!--
+        document.write('<scr' + 'ipt language="javascript1.1" src="http://adserver.adtechus.com/addyn/3.0/5110/2186116/0/16/ADTECH;loc=100;target=_blank;key=key1+key2+key3+key4;grp=[group];misc=' + new Date().getTime() + '"></scri' + 'pt>');
+    //-->
+    </script><noscript><a href="http://adserver.adtechus.com/adlink/3.0/5110/2186116/0/16/ADTECH;loc=300;key=key1+key2+key3+key4;grp=[group]" target="_blank"><img src="http://adserver.adtechus.com/adserv/3.0/5110/2186116/0/16/ADTECH;loc=300;key=key1+key2+key3+key4;grp=[group]" border="0" width="1" height="1"></a></noscript>
+    <!-- End of JavaScript Tag -->
+    
+</body>
+</html>
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/testdata/page.html b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/testdata/page.html
new file mode 100644
index 00000000..92ec74ee
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/testdata/page.html
@@ -0,0 +1,102 @@
+<!DOCTYPE html>
+<html lang="en" ng-app="app">
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <title>
+            Provok.in
+        </title>
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <meta name="description" content="Provok.in - Prove your point. State an affirmation, back it up with evidence, unveil the truth.">
+        <meta name="author" content="Martin Angers">
+        <link href="http://fonts.googleapis.com/css?family=Belgrano" rel="stylesheet" type="text/css">
+        <!--[if lt IE 9]><link href="http://fonts.googleapis.com/css?family=Belgrano" rel="stylesheet" type="text/css"><link href="http://fonts.googleapis.com/css?family=Belgrano:400italic" rel="stylesheet" type="text/css"><link href="http://fonts.googleapis.com/css?family=Belgrano:700" rel="stylesheet" type="text/css"><link href="http://fonts.googleapis.com/css?family=Belgrano:700italic" rel="stylesheet" type="text/css"><![endif]-->
+        <link href="/css/pvk.min.css" rel="stylesheet" type="text/css">
+    </head>
+    <body>
+        <div class="container-fluid" id="cf1">
+            <div class="row-fluid">
+                <div class="pvk-gutter">
+                    &nbsp;
+                </div>
+                <div class="pvk-content" id="pc1">
+                    <div ng-controller="HeroCtrl" class="hero-unit">
+                        <div class="container-fluid" id="cf2">
+                            <div class="row-fluid" id="cf2-1">
+                                <div class="span12">
+                                    <h1>
+                                        <a href="/">Provok<span class="green">.</span><span class="red">i</span>n</a>
+                                    </h1>
+                                    <p>
+                                        Prove your point.
+                                    </p>
+                                </div>
+                            </div>
+                            <div class="row-fluid" id="cf2-2">
+                                <div class="span12 alert alert-error">
+                                    <strong>Beta Version.</strong> Things may change. Or disappear. Or fail miserably. If it's the latter, <a href="https://github.com/PuerkitoBio/Provok.in-issues" target="_blank" class="link">please file an issue.</a>
+                                </div>
+                            </div>
+                            <div ng-cloak="" ng-show="isLoggedOut() &amp;&amp; !hideLogin" class="row-fluid" id="cf2-3">
+                                <a ng-href="{{ROUTES.login}}" class="btn btn-primary">Sign in. Painless.</a> <span>or</span> <a ng-href="{{ROUTES.help}}" class="link">learn more about provok.in.</a>
+                            </div>
+                            <div ng-cloak="" ng-show="isLoggedIn()" class="row-fluid logged-in-state" id="cf2-4">
+                                <span>Welcome,</span> <a ng-href="{{ROUTES.profile}}" class="link">{{getUserName()}}</a> <span>(</span> <a ng-click="doLogout($event)" class="link">logout</a> <span>)</span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="pvk-gutter">
+                    &nbsp;
+                </div>
+            </div>
+            <div class="row-fluid">
+                <div class="pvk-gutter">
+                    &nbsp;
+                </div>
+                <div class="pvk-content" id="pc2">
+                    <div class="container-fluid" id="cf3">
+                        <div class="row-fluid">
+                            <div ng-cloak="" view-on-display="" ng-controller="MsgCtrl" ng-class="{'displayed': blockIsDisplayed}" class="message-box">
+                                <div ng-class="{'alert-info': isInfo, 'alert-error': !isInfo, 'displayed': isDisplayed}" class="alert">
+                                    <a ng-click="hideMessage(true, $event)" class="close">×</a>
+                                    <h4 class="alert-heading">
+                                        {{ title }}
+                                    </h4>
+                                    <p>
+                                        {{ message }}
+                                    </p>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="container-fluid" id="cf4">
+                        <div ng-controller="ShareCtrl" ng-hide="isHidden" class="row-fluid center-content"></div>
+                    </div>
+                    <div ng-view=""></div>
+                </div>
+                <div class="pvk-gutter">
+                    &nbsp;
+                </div>
+            </div>
+            <div class="row-fluid">
+                <div class="pvk-gutter">
+                    &nbsp;
+                </div>
+                <div class="pvk-content">
+                    <div class="footer">
+                        <p>
+                            <a href="/" class="link">Home</a> <span>|</span> <a href="/about" class="link">About</a> <span>|</span> <a href="/help" class="link">Help</a>
+                        </p>
+                        <p>
+                            <small>© 2012 Martin Angers</small>
+                        </p>
+                    </div>
+                </div>
+                <div class="pvk-gutter">
+                    &nbsp;
+                </div>
+            </div>
+        </div>
+    </body>
+</html>
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/testdata/page2.html b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/testdata/page2.html
new file mode 100644
index 00000000..4c2f92f4
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/testdata/page2.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Tests for siblings</title>
+  </head>
+  <BODY>
+    <div id="main">
+      <div id="n1" class="one even row"></div>
+      <div id="n2" class="two odd row"></div>
+      <div id="n3" class="three even row"></div>
+      <div id="n4" class="four odd row"></div>
+      <div id="n5" class="five even row"></div>
+      <div id="n6" class="six odd row"></div>
+    </div>
+    <div id="foot">
+      <div id="nf1" class="one even row"></div>
+      <div id="nf2" class="two odd row"></div>
+      <div id="nf3" class="three even row"></div>
+      <div id="nf4" class="four odd row"></div>
+      <div id="nf5" class="five even row odder"></div>
+      <div id="nf6" class="six odd row"></div>
+    </div>
+  </BODY>
+</html>
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/testdata/page3.html b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/testdata/page3.html
new file mode 100644
index 00000000..17e86241
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/testdata/page3.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Tests for siblings</title>
+  </head>
+  <BODY>
+    <div id="main">
+      <div id="n1" class="one even row">hello</div>
+      <div id="n2" class="two odd row"></div>
+      <div id="n3" class="three even row"></div>
+      <div id="n4" class="four odd row"></div>
+      <div id="n5" class="five even row"></div>
+      <div id="n6" class="six odd row"></div>
+    </div>
+    <div id="foot">
+      <div id="nf1" class="one even row">text</div>
+      <div id="nf2" class="two odd row"></div>
+      <div id="nf3" class="three even row"></div>
+      <div id="nf4" class="four odd row"></div>
+      <div id="nf5" class="five even row odder"></div>
+      <div id="nf6" class="six odd row"></div>
+    </div>
+  </BODY>
+</html>
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/traversal.go b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/traversal.go
new file mode 100644
index 00000000..4f3d1921
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/traversal.go
@@ -0,0 +1,696 @@
+package goquery
+
+import (
+	"github.com/andybalholm/cascadia"
+	"golang.org/x/net/html"
+)
+
+type siblingType int
+
+// Sibling type, used internally when iterating over children at the same
+// level (siblings) to specify which nodes are requested.
+const (
+	siblingPrevUntil siblingType = iota - 3
+	siblingPrevAll
+	siblingPrev
+	siblingAll
+	siblingNext
+	siblingNextAll
+	siblingNextUntil
+	siblingAllIncludingNonElements
+)
+
+// Find gets the descendants of each element in the current set of matched
+// elements, filtered by a selector. It returns a new Selection object
+// containing these matched elements.
+func (s *Selection) Find(selector string) *Selection {
+	return pushStack(s, findWithMatcher(s.Nodes, cascadia.MustCompile(selector)))
+}
+
+// FindMatcher gets the descendants of each element in the current set of matched
+// elements, filtered by the matcher. It returns a new Selection object
+// containing these matched elements.
+func (s *Selection) FindMatcher(m Matcher) *Selection {
+	return pushStack(s, findWithMatcher(s.Nodes, m))
+}
+
+// FindSelection gets the descendants of each element in the current
+// Selection, filtered by a Selection. It returns a new Selection object
+// containing these matched elements.
+func (s *Selection) FindSelection(sel *Selection) *Selection {
+	if sel == nil {
+		return pushStack(s, nil)
+	}
+	return s.FindNodes(sel.Nodes...)
+}
+
+// FindNodes gets the descendants of each element in the current
+// Selection, filtered by some nodes. It returns a new Selection object
+// containing these matched elements.
+func (s *Selection) FindNodes(nodes ...*html.Node) *Selection {
+	return pushStack(s, mapNodes(nodes, func(i int, n *html.Node) []*html.Node {
+		if sliceContains(s.Nodes, n) {
+			return []*html.Node{n}
+		}
+		return nil
+	}))
+}
+
+// Contents gets the children of each element in the Selection,
+// including text and comment nodes. It returns a new Selection object
+// containing these elements.
+func (s *Selection) Contents() *Selection {
+	return pushStack(s, getChildrenNodes(s.Nodes, siblingAllIncludingNonElements))
+}
+
+// ContentsFiltered gets the children of each element in the Selection,
+// filtered by the specified selector. It returns a new Selection
+// object containing these elements. Since selectors only act on Element nodes,
+// this function is an alias to ChildrenFiltered unless the selector is empty,
+// in which case it is an alias to Contents.
+func (s *Selection) ContentsFiltered(selector string) *Selection {
+	if selector != "" {
+		return s.ChildrenFiltered(selector)
+	}
+	return s.Contents()
+}
+
+// ContentsMatcher gets the children of each element in the Selection,
+// filtered by the specified matcher. It returns a new Selection
+// object containing these elements. Since matchers only act on Element nodes,
+// this function is an alias to ChildrenMatcher.
+func (s *Selection) ContentsMatcher(m Matcher) *Selection {
+	return s.ChildrenMatcher(m)
+}
+
+// Children gets the child elements of each element in the Selection.
+// It returns a new Selection object containing these elements.
+func (s *Selection) Children() *Selection {
+	return pushStack(s, getChildrenNodes(s.Nodes, siblingAll))
+}
+
+// ChildrenFiltered gets the child elements of each element in the Selection,
+// filtered by the specified selector. It returns a new
+// Selection object containing these elements.
+func (s *Selection) ChildrenFiltered(selector string) *Selection {
+	return filterAndPush(s, getChildrenNodes(s.Nodes, siblingAll), cascadia.MustCompile(selector))
+}
+
+// ChildrenMatcher gets the child elements of each element in the Selection,
+// filtered by the specified matcher. It returns a new
+// Selection object containing these elements.
+func (s *Selection) ChildrenMatcher(m Matcher) *Selection {
+	return filterAndPush(s, getChildrenNodes(s.Nodes, siblingAll), m)
+}
+
+// Parent gets the parent of each element in the Selection. It returns a
+// new Selection object containing the matched elements.
+func (s *Selection) Parent() *Selection {
+	return pushStack(s, getParentNodes(s.Nodes))
+}
+
+// ParentFiltered gets the parent of each element in the Selection filtered by a
+// selector. It returns a new Selection object containing the matched elements.
+func (s *Selection) ParentFiltered(selector string) *Selection {
+	return filterAndPush(s, getParentNodes(s.Nodes), cascadia.MustCompile(selector))
+}
+
+// ParentMatcher gets the parent of each element in the Selection filtered by a
+// matcher. It returns a new Selection object containing the matched elements.
+func (s *Selection) ParentMatcher(m Matcher) *Selection {
+	return filterAndPush(s, getParentNodes(s.Nodes), m)
+}
+
+// Closest gets the first element that matches the selector by testing the
+// element itself and traversing up through its ancestors in the DOM tree.
+func (s *Selection) Closest(selector string) *Selection {
+	cs := cascadia.MustCompile(selector)
+	return s.ClosestMatcher(cs)
+}
+
+// ClosestMatcher gets the first element that matches the matcher by testing the
+// element itself and traversing up through its ancestors in the DOM tree.
+func (s *Selection) ClosestMatcher(m Matcher) *Selection {
+	return pushStack(s, mapNodes(s.Nodes, func(i int, n *html.Node) []*html.Node {
+		// For each node in the selection, test the node itself, then each parent
+		// until a match is found.
+		for ; n != nil; n = n.Parent {
+			if m.Match(n) {
+				return []*html.Node{n}
+			}
+		}
+		return nil
+	}))
+}
+
+// ClosestNodes gets the first element that matches one of the nodes by testing the
+// element itself and traversing up through its ancestors in the DOM tree.
+func (s *Selection) ClosestNodes(nodes ...*html.Node) *Selection {
+	return pushStack(s, mapNodes(s.Nodes, func(i int, n *html.Node) []*html.Node {
+		// For each node in the selection, test the node itself, then each parent
+		// until a match is found.
+		for ; n != nil; n = n.Parent {
+			if isInSlice(nodes, n) {
+				return []*html.Node{n}
+			}
+		}
+		return nil
+	}))
+}
+
+// ClosestSelection gets the first element that matches one of the nodes in the
+// Selection by testing the element itself and traversing up through its ancestors
+// in the DOM tree.
+func (s *Selection) ClosestSelection(sel *Selection) *Selection {
+	if sel == nil {
+		return pushStack(s, nil)
+	}
+	return s.ClosestNodes(sel.Nodes...)
+}
+
+// Parents gets the ancestors of each element in the current Selection. It
+// returns a new Selection object with the matched elements.
+func (s *Selection) Parents() *Selection {
+	return pushStack(s, getParentsNodes(s.Nodes, nil, nil))
+}
+
+// ParentsFiltered gets the ancestors of each element in the current
+// Selection. It returns a new Selection object with the matched elements.
+func (s *Selection) ParentsFiltered(selector string) *Selection {
+	return filterAndPush(s, getParentsNodes(s.Nodes, nil, nil), cascadia.MustCompile(selector))
+}
+
+// ParentsMatcher gets the ancestors of each element in the current
+// Selection. It returns a new Selection object with the matched elements.
+func (s *Selection) ParentsMatcher(m Matcher) *Selection {
+	return filterAndPush(s, getParentsNodes(s.Nodes, nil, nil), m)
+}
+
+// ParentsUntil gets the ancestors of each element in the Selection, up to but
+// not including the element matched by the selector. It returns a new Selection
+// object containing the matched elements.
+func (s *Selection) ParentsUntil(selector string) *Selection {
+	return pushStack(s, getParentsNodes(s.Nodes, cascadia.MustCompile(selector), nil))
+}
+
+// ParentsUntilMatcher gets the ancestors of each element in the Selection, up to but
+// not including the element matched by the matcher. It returns a new Selection
+// object containing the matched elements.
+func (s *Selection) ParentsUntilMatcher(m Matcher) *Selection {
+	return pushStack(s, getParentsNodes(s.Nodes, m, nil))
+}
+
+// ParentsUntilSelection gets the ancestors of each element in the Selection,
+// up to but not including the elements in the specified Selection. It returns a
+// new Selection object containing the matched elements.
+func (s *Selection) ParentsUntilSelection(sel *Selection) *Selection {
+	if sel == nil {
+		return s.Parents()
+	}
+	return s.ParentsUntilNodes(sel.Nodes...)
+}
+
+// ParentsUntilNodes gets the ancestors of each element in the Selection,
+// up to but not including the specified nodes. It returns a
+// new Selection object containing the matched elements.
+func (s *Selection) ParentsUntilNodes(nodes ...*html.Node) *Selection {
+	return pushStack(s, getParentsNodes(s.Nodes, nil, nodes))
+}
+
+// ParentsFilteredUntil is like ParentsUntil, with the option to filter the
+// results based on a selector string. It returns a new Selection
+// object containing the matched elements.
+func (s *Selection) ParentsFilteredUntil(filterSelector, untilSelector string) *Selection {
+	return filterAndPush(s, getParentsNodes(s.Nodes, cascadia.MustCompile(untilSelector), nil), cascadia.MustCompile(filterSelector))
+}
+
+// ParentsFilteredUntilMatcher is like ParentsUntilMatcher, with the option to filter the
+// results based on a matcher. It returns a new Selection object containing the matched elements.
+func (s *Selection) ParentsFilteredUntilMatcher(filter, until Matcher) *Selection {
+	return filterAndPush(s, getParentsNodes(s.Nodes, until, nil), filter)
+}
+
+// ParentsFilteredUntilSelection is like ParentsUntilSelection, with the
+// option to filter the results based on a selector string. It returns a new
+// Selection object containing the matched elements.
+func (s *Selection) ParentsFilteredUntilSelection(filterSelector string, sel *Selection) *Selection {
+	return s.ParentsMatcherUntilSelection(cascadia.MustCompile(filterSelector), sel)
+}
+
+// ParentsMatcherUntilSelection is like ParentsUntilSelection, with the
+// option to filter the results based on a matcher. It returns a new
+// Selection object containing the matched elements.
+func (s *Selection) ParentsMatcherUntilSelection(filter Matcher, sel *Selection) *Selection {
+	if sel == nil {
+		return s.ParentsMatcher(filter)
+	}
+	return s.ParentsMatcherUntilNodes(filter, sel.Nodes...)
+}
+
+// ParentsFilteredUntilNodes is like ParentsUntilNodes, with the
+// option to filter the results based on a selector string. It returns a new
+// Selection object containing the matched elements.
+func (s *Selection) ParentsFilteredUntilNodes(filterSelector string, nodes ...*html.Node) *Selection {
+	return filterAndPush(s, getParentsNodes(s.Nodes, nil, nodes), cascadia.MustCompile(filterSelector))
+}
+
+// ParentsMatcherUntilNodes is like ParentsUntilNodes, with the
+// option to filter the results based on a matcher. It returns a new
+// Selection object containing the matched elements.
+func (s *Selection) ParentsMatcherUntilNodes(filter Matcher, nodes ...*html.Node) *Selection {
+	return filterAndPush(s, getParentsNodes(s.Nodes, nil, nodes), filter)
+}
+
+// Siblings gets the siblings of each element in the Selection. It returns
+// a new Selection object containing the matched elements.
+func (s *Selection) Siblings() *Selection {
+	return pushStack(s, getSiblingNodes(s.Nodes, siblingAll, nil, nil))
+}
+
+// SiblingsFiltered gets the siblings of each element in the Selection
+// filtered by a selector. It returns a new Selection object containing the
+// matched elements.
+func (s *Selection) SiblingsFiltered(selector string) *Selection {
+	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingAll, nil, nil), cascadia.MustCompile(selector))
+}
+
+// SiblingsMatcher gets the siblings of each element in the Selection
+// filtered by a matcher. It returns a new Selection object containing the
+// matched elements.
+func (s *Selection) SiblingsMatcher(m Matcher) *Selection {
+	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingAll, nil, nil), m)
+}
+
+// Next gets the immediately following sibling of each element in the
+// Selection. It returns a new Selection object containing the matched elements.
+func (s *Selection) Next() *Selection {
+	return pushStack(s, getSiblingNodes(s.Nodes, siblingNext, nil, nil))
+}
+
+// NextFiltered gets the immediately following sibling of each element in the
+// Selection filtered by a selector. It returns a new Selection object
+// containing the matched elements.
+func (s *Selection) NextFiltered(selector string) *Selection {
+	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingNext, nil, nil), cascadia.MustCompile(selector))
+}
+
+// NextMatcher gets the immediately following sibling of each element in the
+// Selection filtered by a matcher. It returns a new Selection object
+// containing the matched elements.
+func (s *Selection) NextMatcher(m Matcher) *Selection {
+	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingNext, nil, nil), m)
+}
+
+// NextAll gets all the following siblings of each element in the
+// Selection. It returns a new Selection object containing the matched elements.
+func (s *Selection) NextAll() *Selection {
+	return pushStack(s, getSiblingNodes(s.Nodes, siblingNextAll, nil, nil))
+}
+
+// NextAllFiltered gets all the following siblings of each element in the
+// Selection filtered by a selector. It returns a new Selection object
+// containing the matched elements.
+func (s *Selection) NextAllFiltered(selector string) *Selection {
+	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingNextAll, nil, nil), cascadia.MustCompile(selector))
+}
+
+// NextAllMatcher gets all the following siblings of each element in the
+// Selection filtered by a matcher. It returns a new Selection object
+// containing the matched elements.
+func (s *Selection) NextAllMatcher(m Matcher) *Selection {
+	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingNextAll, nil, nil), m)
+}
+
+// Prev gets the immediately preceding sibling of each element in the
+// Selection. It returns a new Selection object containing the matched elements.
+func (s *Selection) Prev() *Selection {
+	return pushStack(s, getSiblingNodes(s.Nodes, siblingPrev, nil, nil))
+}
+
+// PrevFiltered gets the immediately preceding sibling of each element in the
+// Selection filtered by a selector. It returns a new Selection object
+// containing the matched elements.
+func (s *Selection) PrevFiltered(selector string) *Selection {
+	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingPrev, nil, nil), cascadia.MustCompile(selector))
+}
+
+// PrevMatcher gets the immediately preceding sibling of each element in the
+// Selection filtered by a matcher. It returns a new Selection object
+// containing the matched elements.
+func (s *Selection) PrevMatcher(m Matcher) *Selection {
+	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingPrev, nil, nil), m)
+}
+
+// PrevAll gets all the preceding siblings of each element in the
+// Selection. It returns a new Selection object containing the matched elements.
+func (s *Selection) PrevAll() *Selection {
+	return pushStack(s, getSiblingNodes(s.Nodes, siblingPrevAll, nil, nil))
+}
+
+// PrevAllFiltered gets all the preceding siblings of each element in the
+// Selection filtered by a selector. It returns a new Selection object
+// containing the matched elements.
+func (s *Selection) PrevAllFiltered(selector string) *Selection {
+	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingPrevAll, nil, nil), cascadia.MustCompile(selector))
+}
+
+// PrevAllMatcher gets all the preceding siblings of each element in the
+// Selection filtered by a matcher. It returns a new Selection object
+// containing the matched elements.
+func (s *Selection) PrevAllMatcher(m Matcher) *Selection {
+	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingPrevAll, nil, nil), m)
+}
+
+// NextUntil gets all following siblings of each element up to but not
+// including the element matched by the selector. It returns a new Selection
+// object containing the matched elements.
+func (s *Selection) NextUntil(selector string) *Selection {
+	return pushStack(s, getSiblingNodes(s.Nodes, siblingNextUntil,
+		cascadia.MustCompile(selector), nil))
+}
+
+// NextUntilMatcher gets all following siblings of each element up to but not
+// including the element matched by the matcher. It returns a new Selection
+// object containing the matched elements.
+func (s *Selection) NextUntilMatcher(m Matcher) *Selection {
+	return pushStack(s, getSiblingNodes(s.Nodes, siblingNextUntil,
+		m, nil))
+}
+
+// NextUntilSelection gets all following siblings of each element up to but not
+// including the element matched by the Selection. It returns a new Selection
+// object containing the matched elements.
+func (s *Selection) NextUntilSelection(sel *Selection) *Selection {
+	if sel == nil {
+		return s.NextAll()
+	}
+	return s.NextUntilNodes(sel.Nodes...)
+}
+
+// NextUntilNodes gets all following siblings of each element up to but not
+// including the element matched by the nodes. It returns a new Selection
+// object containing the matched elements.
+func (s *Selection) NextUntilNodes(nodes ...*html.Node) *Selection {
+	return pushStack(s, getSiblingNodes(s.Nodes, siblingNextUntil,
+		nil, nodes))
+}
+
+// PrevUntil gets all preceding siblings of each element up to but not
+// including the element matched by the selector. It returns a new Selection
+// object containing the matched elements.
+func (s *Selection) PrevUntil(selector string) *Selection {
+	return pushStack(s, getSiblingNodes(s.Nodes, siblingPrevUntil,
+		cascadia.MustCompile(selector), nil))
+}
+
+// PrevUntilMatcher gets all preceding siblings of each element up to but not
+// including the element matched by the matcher. It returns a new Selection
+// object containing the matched elements.
+func (s *Selection) PrevUntilMatcher(m Matcher) *Selection {
+	return pushStack(s, getSiblingNodes(s.Nodes, siblingPrevUntil,
+		m, nil))
+}
+
+// PrevUntilSelection gets all preceding siblings of each element up to but not
+// including the element matched by the Selection. It returns a new Selection
+// object containing the matched elements.
+func (s *Selection) PrevUntilSelection(sel *Selection) *Selection {
+	if sel == nil {
+		return s.PrevAll()
+	}
+	return s.PrevUntilNodes(sel.Nodes...)
+}
+
+// PrevUntilNodes gets all preceding siblings of each element up to but not
+// including the element matched by the nodes. It returns a new Selection
+// object containing the matched elements.
+func (s *Selection) PrevUntilNodes(nodes ...*html.Node) *Selection {
+	return pushStack(s, getSiblingNodes(s.Nodes, siblingPrevUntil,
+		nil, nodes))
+}
+
+// NextFilteredUntil is like NextUntil, with the option to filter
+// the results based on a selector string.
+// It returns a new Selection object containing the matched elements.
+func (s *Selection) NextFilteredUntil(filterSelector, untilSelector string) *Selection {
+	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingNextUntil,
+		cascadia.MustCompile(untilSelector), nil), cascadia.MustCompile(filterSelector))
+}
+
+// NextFilteredUntilMatcher is like NextUntilMatcher, with the option to filter
+// the results based on a matcher.
+// It returns a new Selection object containing the matched elements.
+func (s *Selection) NextFilteredUntilMatcher(filter, until Matcher) *Selection {
+	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingNextUntil,
+		until, nil), filter)
+}
+
+// NextFilteredUntilSelection is like NextUntilSelection, with the
+// option to filter the results based on a selector string. It returns a new
+// Selection object containing the matched elements.
+func (s *Selection) NextFilteredUntilSelection(filterSelector string, sel *Selection) *Selection {
+	return s.NextMatcherUntilSelection(cascadia.MustCompile(filterSelector), sel)
+}
+
+// NextMatcherUntilSelection is like NextUntilSelection, with the
+// option to filter the results based on a matcher. It returns a new
+// Selection object containing the matched elements.
+func (s *Selection) NextMatcherUntilSelection(filter Matcher, sel *Selection) *Selection {
+	if sel == nil {
+		return s.NextMatcher(filter)
+	}
+	return s.NextMatcherUntilNodes(filter, sel.Nodes...)
+}
+
+// NextFilteredUntilNodes is like NextUntilNodes, with the
+// option to filter the results based on a selector string. It returns a new
+// Selection object containing the matched elements.
+func (s *Selection) NextFilteredUntilNodes(filterSelector string, nodes ...*html.Node) *Selection {
+	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingNextUntil,
+		nil, nodes), cascadia.MustCompile(filterSelector))
+}
+
+// NextMatcherUntilNodes is like NextUntilNodes, with the
+// option to filter the results based on a matcher. It returns a new
+// Selection object containing the matched elements.
+func (s *Selection) NextMatcherUntilNodes(filter Matcher, nodes ...*html.Node) *Selection {
+	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingNextUntil,
+		nil, nodes), filter)
+}
+
+// PrevFilteredUntil is like PrevUntil, with the option to filter
+// the results based on a selector string.
+// It returns a new Selection object containing the matched elements.
+func (s *Selection) PrevFilteredUntil(filterSelector, untilSelector string) *Selection {
+	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingPrevUntil,
+		cascadia.MustCompile(untilSelector), nil), cascadia.MustCompile(filterSelector))
+}
+
+// PrevFilteredUntilMatcher is like PrevUntilMatcher, with the option to filter
+// the results based on a matcher.
+// It returns a new Selection object containing the matched elements.
+func (s *Selection) PrevFilteredUntilMatcher(filter, until Matcher) *Selection {
+	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingPrevUntil,
+		until, nil), filter)
+}
+
+// PrevFilteredUntilSelection is like PrevUntilSelection, with the
+// option to filter the results based on a selector string. It returns a new
+// Selection object containing the matched elements.
+func (s *Selection) PrevFilteredUntilSelection(filterSelector string, sel *Selection) *Selection {
+	return s.PrevMatcherUntilSelection(cascadia.MustCompile(filterSelector), sel)
+}
+
+// PrevMatcherUntilSelection is like PrevUntilSelection, with the
+// option to filter the results based on a matcher. It returns a new
+// Selection object containing the matched elements.
+func (s *Selection) PrevMatcherUntilSelection(filter Matcher, sel *Selection) *Selection {
+	if sel == nil {
+		return s.PrevMatcher(filter)
+	}
+	return s.PrevMatcherUntilNodes(filter, sel.Nodes...)
+}
+
+// PrevFilteredUntilNodes is like PrevUntilNodes, with the
+// option to filter the results based on a selector string. It returns a new
+// Selection object containing the matched elements.
+func (s *Selection) PrevFilteredUntilNodes(filterSelector string, nodes ...*html.Node) *Selection {
+	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingPrevUntil,
+		nil, nodes), cascadia.MustCompile(filterSelector))
+}
+
+// PrevMatcherUntilNodes is like PrevUntilNodes, with the
+// option to filter the results based on a matcher. It returns a new
+// Selection object containing the matched elements.
+func (s *Selection) PrevMatcherUntilNodes(filter Matcher, nodes ...*html.Node) *Selection {
+	return filterAndPush(s, getSiblingNodes(s.Nodes, siblingPrevUntil,
+		nil, nodes), filter)
+}
+
+// Filter and push filters the nodes based on a matcher, and pushes the results
+// on the stack, with the srcSel as previous selection.
+func filterAndPush(srcSel *Selection, nodes []*html.Node, m Matcher) *Selection {
+	// Create a temporary Selection with the specified nodes to filter using winnow
+	sel := &Selection{nodes, srcSel.document, nil}
+	// Filter based on matcher and push on stack
+	return pushStack(srcSel, winnow(sel, m, true))
+}
+
+// Internal implementation of Find that return raw nodes.
+func findWithMatcher(nodes []*html.Node, m Matcher) []*html.Node {
+	// Map nodes to find the matches within the children of each node
+	return mapNodes(nodes, func(i int, n *html.Node) (result []*html.Node) {
+		// Go down one level, becausejQuery's Find selects only within descendants
+		for c := n.FirstChild; c != nil; c = c.NextSibling {
+			if c.Type == html.ElementNode {
+				result = append(result, m.MatchAll(c)...)
+			}
+		}
+		return
+	})
+}
+
+// Internal implementation to get all parent nodes, stopping at the specified
+// node (or nil if no stop).
+func getParentsNodes(nodes []*html.Node, stopm Matcher, stopNodes []*html.Node) []*html.Node {
+	return mapNodes(nodes, func(i int, n *html.Node) (result []*html.Node) {
+		for p := n.Parent; p != nil; p = p.Parent {
+			sel := newSingleSelection(p, nil)
+			if stopm != nil {
+				if sel.IsMatcher(stopm) {
+					break
+				}
+			} else if len(stopNodes) > 0 {
+				if sel.IsNodes(stopNodes...) {
+					break
+				}
+			}
+			if p.Type == html.ElementNode {
+				result = append(result, p)
+			}
+		}
+		return
+	})
+}
+
+// Internal implementation of sibling nodes that return a raw slice of matches.
+func getSiblingNodes(nodes []*html.Node, st siblingType, untilm Matcher, untilNodes []*html.Node) []*html.Node {
+	var f func(*html.Node) bool
+
+	// If the requested siblings are ...Until, create the test function to
+	// determine if the until condition is reached (returns true if it is)
+	if st == siblingNextUntil || st == siblingPrevUntil {
+		f = func(n *html.Node) bool {
+			if untilm != nil {
+				// Matcher-based condition
+				sel := newSingleSelection(n, nil)
+				return sel.IsMatcher(untilm)
+			} else if len(untilNodes) > 0 {
+				// Nodes-based condition
+				sel := newSingleSelection(n, nil)
+				return sel.IsNodes(untilNodes...)
+			}
+			return false
+		}
+	}
+
+	return mapNodes(nodes, func(i int, n *html.Node) []*html.Node {
+		return getChildrenWithSiblingType(n.Parent, st, n, f)
+	})
+}
+
+// Gets the children nodes of each node in the specified slice of nodes,
+// based on the sibling type request.
+func getChildrenNodes(nodes []*html.Node, st siblingType) []*html.Node {
+	return mapNodes(nodes, func(i int, n *html.Node) []*html.Node {
+		return getChildrenWithSiblingType(n, st, nil, nil)
+	})
+}
+
+// Gets the children of the specified parent, based on the requested sibling
+// type, skipping a specified node if required.
+func getChildrenWithSiblingType(parent *html.Node, st siblingType, skipNode *html.Node,
+	untilFunc func(*html.Node) bool) (result []*html.Node) {
+
+	// Create the iterator function
+	var iter = func(cur *html.Node) (ret *html.Node) {
+		// Based on the sibling type requested, iterate the right way
+		for {
+			switch st {
+			case siblingAll, siblingAllIncludingNonElements:
+				if cur == nil {
+					// First iteration, start with first child of parent
+					// Skip node if required
+					if ret = parent.FirstChild; ret == skipNode && skipNode != nil {
+						ret = skipNode.NextSibling
+					}
+				} else {
+					// Skip node if required
+					if ret = cur.NextSibling; ret == skipNode && skipNode != nil {
+						ret = skipNode.NextSibling
+					}
+				}
+			case siblingPrev, siblingPrevAll, siblingPrevUntil:
+				if cur == nil {
+					// Start with previous sibling of the skip node
+					ret = skipNode.PrevSibling
+				} else {
+					ret = cur.PrevSibling
+				}
+			case siblingNext, siblingNextAll, siblingNextUntil:
+				if cur == nil {
+					// Start with next sibling of the skip node
+					ret = skipNode.NextSibling
+				} else {
+					ret = cur.NextSibling
+				}
+			default:
+				panic("Invalid sibling type.")
+			}
+			if ret == nil || ret.Type == html.ElementNode || st == siblingAllIncludingNonElements {
+				return
+			}
+			// Not a valid node, try again from this one
+			cur = ret
+		}
+	}
+
+	for c := iter(nil); c != nil; c = iter(c) {
+		// If this is an ...Until case, test before append (returns true
+		// if the until condition is reached)
+		if st == siblingNextUntil || st == siblingPrevUntil {
+			if untilFunc(c) {
+				return
+			}
+		}
+		result = append(result, c)
+		if st == siblingNext || st == siblingPrev {
+			// Only one node was requested (immediate next or previous), so exit
+			return
+		}
+	}
+	return
+}
+
+// Internal implementation of parent nodes that return a raw slice of Nodes.
+func getParentNodes(nodes []*html.Node) []*html.Node {
+	return mapNodes(nodes, func(i int, n *html.Node) []*html.Node {
+		if n.Parent != nil && n.Parent.Type == html.ElementNode {
+			return []*html.Node{n.Parent}
+		}
+		return nil
+	})
+}
+
+// Internal map function used by many traversing methods. Takes the source nodes
+// to iterate on and the mapping function that returns an array of nodes.
+// Returns an array of nodes mapped by calling the callback function once for
+// each node in the source nodes.
+func mapNodes(nodes []*html.Node, f func(int, *html.Node) []*html.Node) (result []*html.Node) {
+	for i, n := range nodes {
+		if vals := f(i, n); len(vals) > 0 {
+			result = appendWithoutDuplicates(result, vals)
+		}
+	}
+	return
+}
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/traversal_test.go b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/traversal_test.go
new file mode 100644
index 00000000..00fb5cd5
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/traversal_test.go
@@ -0,0 +1,697 @@
+package goquery
+
+import (
+	"strings"
+	"testing"
+)
+
+func TestFind(t *testing.T) {
+	sel := Doc().Find("div.row-fluid")
+	assertLength(t, sel.Nodes, 9)
+}
+
+func TestFindRollback(t *testing.T) {
+	sel := Doc().Find("div.row-fluid")
+	sel2 := sel.Find("a").End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestFindNotSelf(t *testing.T) {
+	sel := Doc().Find("h1").Find("h1")
+	assertLength(t, sel.Nodes, 0)
+}
+
+func TestFindInvalidSelector(t *testing.T) {
+	defer assertPanic(t)
+	Doc().Find(":+ ^")
+}
+
+func TestChainedFind(t *testing.T) {
+	sel := Doc().Find("div.hero-unit").Find(".row-fluid")
+	assertLength(t, sel.Nodes, 4)
+}
+
+func TestChildren(t *testing.T) {
+	sel := Doc().Find(".pvk-content").Children()
+	assertLength(t, sel.Nodes, 5)
+}
+
+func TestChildrenRollback(t *testing.T) {
+	sel := Doc().Find(".pvk-content")
+	sel2 := sel.Children().End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestContents(t *testing.T) {
+	sel := Doc().Find(".pvk-content").Contents()
+	assertLength(t, sel.Nodes, 13)
+}
+
+func TestContentsRollback(t *testing.T) {
+	sel := Doc().Find(".pvk-content")
+	sel2 := sel.Contents().End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestChildrenFiltered(t *testing.T) {
+	sel := Doc().Find(".pvk-content").ChildrenFiltered(".hero-unit")
+	assertLength(t, sel.Nodes, 1)
+}
+
+func TestChildrenFilteredRollback(t *testing.T) {
+	sel := Doc().Find(".pvk-content")
+	sel2 := sel.ChildrenFiltered(".hero-unit").End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestContentsFiltered(t *testing.T) {
+	sel := Doc().Find(".pvk-content").ContentsFiltered(".hero-unit")
+	assertLength(t, sel.Nodes, 1)
+}
+
+func TestContentsFilteredRollback(t *testing.T) {
+	sel := Doc().Find(".pvk-content")
+	sel2 := sel.ContentsFiltered(".hero-unit").End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestChildrenFilteredNone(t *testing.T) {
+	sel := Doc().Find(".pvk-content").ChildrenFiltered("a.btn")
+	assertLength(t, sel.Nodes, 0)
+}
+
+func TestParent(t *testing.T) {
+	sel := Doc().Find(".container-fluid").Parent()
+	assertLength(t, sel.Nodes, 3)
+}
+
+func TestParentRollback(t *testing.T) {
+	sel := Doc().Find(".container-fluid")
+	sel2 := sel.Parent().End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestParentBody(t *testing.T) {
+	sel := Doc().Find("body").Parent()
+	assertLength(t, sel.Nodes, 1)
+}
+
+func TestParentFiltered(t *testing.T) {
+	sel := Doc().Find(".container-fluid").ParentFiltered(".hero-unit")
+	assertLength(t, sel.Nodes, 1)
+	assertClass(t, sel, "hero-unit")
+}
+
+func TestParentFilteredRollback(t *testing.T) {
+	sel := Doc().Find(".container-fluid")
+	sel2 := sel.ParentFiltered(".hero-unit").End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestParents(t *testing.T) {
+	sel := Doc().Find(".container-fluid").Parents()
+	assertLength(t, sel.Nodes, 8)
+}
+
+func TestParentsOrder(t *testing.T) {
+	sel := Doc().Find("#cf2").Parents()
+	assertLength(t, sel.Nodes, 6)
+	assertSelectionIs(t, sel, ".hero-unit", ".pvk-content", "div.row-fluid", "#cf1", "body", "html")
+}
+
+func TestParentsRollback(t *testing.T) {
+	sel := Doc().Find(".container-fluid")
+	sel2 := sel.Parents().End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestParentsFiltered(t *testing.T) {
+	sel := Doc().Find(".container-fluid").ParentsFiltered("body")
+	assertLength(t, sel.Nodes, 1)
+}
+
+func TestParentsFilteredRollback(t *testing.T) {
+	sel := Doc().Find(".container-fluid")
+	sel2 := sel.ParentsFiltered("body").End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestParentsUntil(t *testing.T) {
+	sel := Doc().Find(".container-fluid").ParentsUntil("body")
+	assertLength(t, sel.Nodes, 6)
+}
+
+func TestParentsUntilRollback(t *testing.T) {
+	sel := Doc().Find(".container-fluid")
+	sel2 := sel.ParentsUntil("body").End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestParentsUntilSelection(t *testing.T) {
+	sel := Doc().Find(".container-fluid")
+	sel2 := Doc().Find(".pvk-content")
+	sel = sel.ParentsUntilSelection(sel2)
+	assertLength(t, sel.Nodes, 3)
+}
+
+func TestParentsUntilSelectionRollback(t *testing.T) {
+	sel := Doc().Find(".container-fluid")
+	sel2 := Doc().Find(".pvk-content")
+	sel2 = sel.ParentsUntilSelection(sel2).End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestParentsUntilNodes(t *testing.T) {
+	sel := Doc().Find(".container-fluid")
+	sel2 := Doc().Find(".pvk-content, .hero-unit")
+	sel = sel.ParentsUntilNodes(sel2.Nodes...)
+	assertLength(t, sel.Nodes, 2)
+}
+
+func TestParentsUntilNodesRollback(t *testing.T) {
+	sel := Doc().Find(".container-fluid")
+	sel2 := Doc().Find(".pvk-content, .hero-unit")
+	sel2 = sel.ParentsUntilNodes(sel2.Nodes...).End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestParentsFilteredUntil(t *testing.T) {
+	sel := Doc().Find(".container-fluid").ParentsFilteredUntil(".pvk-content", "body")
+	assertLength(t, sel.Nodes, 2)
+}
+
+func TestParentsFilteredUntilRollback(t *testing.T) {
+	sel := Doc().Find(".container-fluid")
+	sel2 := sel.ParentsFilteredUntil(".pvk-content", "body").End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestParentsFilteredUntilSelection(t *testing.T) {
+	sel := Doc().Find(".container-fluid")
+	sel2 := Doc().Find(".row-fluid")
+	sel = sel.ParentsFilteredUntilSelection("div", sel2)
+	assertLength(t, sel.Nodes, 3)
+}
+
+func TestParentsFilteredUntilSelectionRollback(t *testing.T) {
+	sel := Doc().Find(".container-fluid")
+	sel2 := Doc().Find(".row-fluid")
+	sel2 = sel.ParentsFilteredUntilSelection("div", sel2).End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestParentsFilteredUntilNodes(t *testing.T) {
+	sel := Doc().Find(".container-fluid")
+	sel2 := Doc().Find(".row-fluid")
+	sel = sel.ParentsFilteredUntilNodes("body", sel2.Nodes...)
+	assertLength(t, sel.Nodes, 1)
+}
+
+func TestParentsFilteredUntilNodesRollback(t *testing.T) {
+	sel := Doc().Find(".container-fluid")
+	sel2 := Doc().Find(".row-fluid")
+	sel2 = sel.ParentsFilteredUntilNodes("body", sel2.Nodes...).End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestSiblings(t *testing.T) {
+	sel := Doc().Find("h1").Siblings()
+	assertLength(t, sel.Nodes, 1)
+}
+
+func TestSiblingsRollback(t *testing.T) {
+	sel := Doc().Find("h1")
+	sel2 := sel.Siblings().End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestSiblings2(t *testing.T) {
+	sel := Doc().Find(".pvk-gutter").Siblings()
+	assertLength(t, sel.Nodes, 9)
+}
+
+func TestSiblings3(t *testing.T) {
+	sel := Doc().Find("body>.container-fluid").Siblings()
+	assertLength(t, sel.Nodes, 0)
+}
+
+func TestSiblingsFiltered(t *testing.T) {
+	sel := Doc().Find(".pvk-gutter").SiblingsFiltered(".pvk-content")
+	assertLength(t, sel.Nodes, 3)
+}
+
+func TestSiblingsFilteredRollback(t *testing.T) {
+	sel := Doc().Find(".pvk-gutter")
+	sel2 := sel.SiblingsFiltered(".pvk-content").End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestNext(t *testing.T) {
+	sel := Doc().Find("h1").Next()
+	assertLength(t, sel.Nodes, 1)
+}
+
+func TestNextRollback(t *testing.T) {
+	sel := Doc().Find("h1")
+	sel2 := sel.Next().End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestNext2(t *testing.T) {
+	sel := Doc().Find(".close").Next()
+	assertLength(t, sel.Nodes, 1)
+}
+
+func TestNextNone(t *testing.T) {
+	sel := Doc().Find("small").Next()
+	assertLength(t, sel.Nodes, 0)
+}
+
+func TestNextFiltered(t *testing.T) {
+	sel := Doc().Find(".container-fluid").NextFiltered("div")
+	assertLength(t, sel.Nodes, 2)
+}
+
+func TestNextFilteredRollback(t *testing.T) {
+	sel := Doc().Find(".container-fluid")
+	sel2 := sel.NextFiltered("div").End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestNextFiltered2(t *testing.T) {
+	sel := Doc().Find(".container-fluid").NextFiltered("[ng-view]")
+	assertLength(t, sel.Nodes, 1)
+}
+
+func TestPrev(t *testing.T) {
+	sel := Doc().Find(".red").Prev()
+	assertLength(t, sel.Nodes, 1)
+	assertClass(t, sel, "green")
+}
+
+func TestPrevRollback(t *testing.T) {
+	sel := Doc().Find(".red")
+	sel2 := sel.Prev().End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestPrev2(t *testing.T) {
+	sel := Doc().Find(".row-fluid").Prev()
+	assertLength(t, sel.Nodes, 5)
+}
+
+func TestPrevNone(t *testing.T) {
+	sel := Doc().Find("h2").Prev()
+	assertLength(t, sel.Nodes, 0)
+}
+
+func TestPrevFiltered(t *testing.T) {
+	sel := Doc().Find(".row-fluid").PrevFiltered(".row-fluid")
+	assertLength(t, sel.Nodes, 5)
+}
+
+func TestPrevFilteredRollback(t *testing.T) {
+	sel := Doc().Find(".row-fluid")
+	sel2 := sel.PrevFiltered(".row-fluid").End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestNextAll(t *testing.T) {
+	sel := Doc().Find("#cf2 div:nth-child(1)").NextAll()
+	assertLength(t, sel.Nodes, 3)
+}
+
+func TestNextAllRollback(t *testing.T) {
+	sel := Doc().Find("#cf2 div:nth-child(1)")
+	sel2 := sel.NextAll().End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestNextAll2(t *testing.T) {
+	sel := Doc().Find("div[ng-cloak]").NextAll()
+	assertLength(t, sel.Nodes, 1)
+}
+
+func TestNextAllNone(t *testing.T) {
+	sel := Doc().Find(".footer").NextAll()
+	assertLength(t, sel.Nodes, 0)
+}
+
+func TestNextAllFiltered(t *testing.T) {
+	sel := Doc().Find("#cf2 .row-fluid").NextAllFiltered("[ng-cloak]")
+	assertLength(t, sel.Nodes, 2)
+}
+
+func TestNextAllFilteredRollback(t *testing.T) {
+	sel := Doc().Find("#cf2 .row-fluid")
+	sel2 := sel.NextAllFiltered("[ng-cloak]").End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestNextAllFiltered2(t *testing.T) {
+	sel := Doc().Find(".close").NextAllFiltered("h4")
+	assertLength(t, sel.Nodes, 1)
+}
+
+func TestPrevAll(t *testing.T) {
+	sel := Doc().Find("[ng-view]").PrevAll()
+	assertLength(t, sel.Nodes, 2)
+}
+
+func TestPrevAllOrder(t *testing.T) {
+	sel := Doc().Find("[ng-view]").PrevAll()
+	assertLength(t, sel.Nodes, 2)
+	assertSelectionIs(t, sel, "#cf4", "#cf3")
+}
+
+func TestPrevAllRollback(t *testing.T) {
+	sel := Doc().Find("[ng-view]")
+	sel2 := sel.PrevAll().End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestPrevAll2(t *testing.T) {
+	sel := Doc().Find(".pvk-gutter").PrevAll()
+	assertLength(t, sel.Nodes, 6)
+}
+
+func TestPrevAllFiltered(t *testing.T) {
+	sel := Doc().Find(".pvk-gutter").PrevAllFiltered(".pvk-content")
+	assertLength(t, sel.Nodes, 3)
+}
+
+func TestPrevAllFilteredRollback(t *testing.T) {
+	sel := Doc().Find(".pvk-gutter")
+	sel2 := sel.PrevAllFiltered(".pvk-content").End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestNextUntil(t *testing.T) {
+	sel := Doc().Find(".alert a").NextUntil("p")
+	assertLength(t, sel.Nodes, 1)
+	assertSelectionIs(t, sel, "h4")
+}
+
+func TestNextUntil2(t *testing.T) {
+	sel := Doc().Find("#cf2-1").NextUntil("[ng-cloak]")
+	assertLength(t, sel.Nodes, 1)
+	assertSelectionIs(t, sel, "#cf2-2")
+}
+
+func TestNextUntilOrder(t *testing.T) {
+	sel := Doc().Find("#cf2-1").NextUntil("#cf2-4")
+	assertLength(t, sel.Nodes, 2)
+	assertSelectionIs(t, sel, "#cf2-2", "#cf2-3")
+}
+
+func TestNextUntilRollback(t *testing.T) {
+	sel := Doc().Find("#cf2-1")
+	sel2 := sel.PrevUntil("#cf2-4").End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestNextUntilSelection(t *testing.T) {
+	sel := Doc2().Find("#n2")
+	sel2 := Doc2().Find("#n4")
+	sel2 = sel.NextUntilSelection(sel2)
+	assertLength(t, sel2.Nodes, 1)
+	assertSelectionIs(t, sel2, "#n3")
+}
+
+func TestNextUntilSelectionRollback(t *testing.T) {
+	sel := Doc2().Find("#n2")
+	sel2 := Doc2().Find("#n4")
+	sel2 = sel.NextUntilSelection(sel2).End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestNextUntilNodes(t *testing.T) {
+	sel := Doc2().Find("#n2")
+	sel2 := Doc2().Find("#n5")
+	sel2 = sel.NextUntilNodes(sel2.Nodes...)
+	assertLength(t, sel2.Nodes, 2)
+	assertSelectionIs(t, sel2, "#n3", "#n4")
+}
+
+func TestNextUntilNodesRollback(t *testing.T) {
+	sel := Doc2().Find("#n2")
+	sel2 := Doc2().Find("#n5")
+	sel2 = sel.NextUntilNodes(sel2.Nodes...).End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestPrevUntil(t *testing.T) {
+	sel := Doc().Find(".alert p").PrevUntil("a")
+	assertLength(t, sel.Nodes, 1)
+	assertSelectionIs(t, sel, "h4")
+}
+
+func TestPrevUntil2(t *testing.T) {
+	sel := Doc().Find("[ng-cloak]").PrevUntil(":not([ng-cloak])")
+	assertLength(t, sel.Nodes, 1)
+	assertSelectionIs(t, sel, "[ng-cloak]")
+}
+
+func TestPrevUntilOrder(t *testing.T) {
+	sel := Doc().Find("#cf2-4").PrevUntil("#cf2-1")
+	assertLength(t, sel.Nodes, 2)
+	assertSelectionIs(t, sel, "#cf2-3", "#cf2-2")
+}
+
+func TestPrevUntilRollback(t *testing.T) {
+	sel := Doc().Find("#cf2-4")
+	sel2 := sel.PrevUntil("#cf2-1").End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestPrevUntilSelection(t *testing.T) {
+	sel := Doc2().Find("#n4")
+	sel2 := Doc2().Find("#n2")
+	sel2 = sel.PrevUntilSelection(sel2)
+	assertLength(t, sel2.Nodes, 1)
+	assertSelectionIs(t, sel2, "#n3")
+}
+
+func TestPrevUntilSelectionRollback(t *testing.T) {
+	sel := Doc2().Find("#n4")
+	sel2 := Doc2().Find("#n2")
+	sel2 = sel.PrevUntilSelection(sel2).End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestPrevUntilNodes(t *testing.T) {
+	sel := Doc2().Find("#n5")
+	sel2 := Doc2().Find("#n2")
+	sel2 = sel.PrevUntilNodes(sel2.Nodes...)
+	assertLength(t, sel2.Nodes, 2)
+	assertSelectionIs(t, sel2, "#n4", "#n3")
+}
+
+func TestPrevUntilNodesRollback(t *testing.T) {
+	sel := Doc2().Find("#n5")
+	sel2 := Doc2().Find("#n2")
+	sel2 = sel.PrevUntilNodes(sel2.Nodes...).End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestNextFilteredUntil(t *testing.T) {
+	sel := Doc2().Find(".two").NextFilteredUntil(".even", ".six")
+	assertLength(t, sel.Nodes, 4)
+	assertSelectionIs(t, sel, "#n3", "#n5", "#nf3", "#nf5")
+}
+
+func TestNextFilteredUntilRollback(t *testing.T) {
+	sel := Doc2().Find(".two")
+	sel2 := sel.NextFilteredUntil(".even", ".six").End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestNextFilteredUntilSelection(t *testing.T) {
+	sel := Doc2().Find(".even")
+	sel2 := Doc2().Find(".five")
+	sel = sel.NextFilteredUntilSelection(".even", sel2)
+	assertLength(t, sel.Nodes, 2)
+	assertSelectionIs(t, sel, "#n3", "#nf3")
+}
+
+func TestNextFilteredUntilSelectionRollback(t *testing.T) {
+	sel := Doc2().Find(".even")
+	sel2 := Doc2().Find(".five")
+	sel3 := sel.NextFilteredUntilSelection(".even", sel2).End()
+	assertEqual(t, sel, sel3)
+}
+
+func TestNextFilteredUntilNodes(t *testing.T) {
+	sel := Doc2().Find(".even")
+	sel2 := Doc2().Find(".four")
+	sel = sel.NextFilteredUntilNodes(".odd", sel2.Nodes...)
+	assertLength(t, sel.Nodes, 4)
+	assertSelectionIs(t, sel, "#n2", "#n6", "#nf2", "#nf6")
+}
+
+func TestNextFilteredUntilNodesRollback(t *testing.T) {
+	sel := Doc2().Find(".even")
+	sel2 := Doc2().Find(".four")
+	sel3 := sel.NextFilteredUntilNodes(".odd", sel2.Nodes...).End()
+	assertEqual(t, sel, sel3)
+}
+
+func TestPrevFilteredUntil(t *testing.T) {
+	sel := Doc2().Find(".five").PrevFilteredUntil(".odd", ".one")
+	assertLength(t, sel.Nodes, 4)
+	assertSelectionIs(t, sel, "#n4", "#n2", "#nf4", "#nf2")
+}
+
+func TestPrevFilteredUntilRollback(t *testing.T) {
+	sel := Doc2().Find(".four")
+	sel2 := sel.PrevFilteredUntil(".odd", ".one").End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestPrevFilteredUntilSelection(t *testing.T) {
+	sel := Doc2().Find(".odd")
+	sel2 := Doc2().Find(".two")
+	sel = sel.PrevFilteredUntilSelection(".odd", sel2)
+	assertLength(t, sel.Nodes, 2)
+	assertSelectionIs(t, sel, "#n4", "#nf4")
+}
+
+func TestPrevFilteredUntilSelectionRollback(t *testing.T) {
+	sel := Doc2().Find(".even")
+	sel2 := Doc2().Find(".five")
+	sel3 := sel.PrevFilteredUntilSelection(".even", sel2).End()
+	assertEqual(t, sel, sel3)
+}
+
+func TestPrevFilteredUntilNodes(t *testing.T) {
+	sel := Doc2().Find(".even")
+	sel2 := Doc2().Find(".four")
+	sel = sel.PrevFilteredUntilNodes(".odd", sel2.Nodes...)
+	assertLength(t, sel.Nodes, 2)
+	assertSelectionIs(t, sel, "#n2", "#nf2")
+}
+
+func TestPrevFilteredUntilNodesRollback(t *testing.T) {
+	sel := Doc2().Find(".even")
+	sel2 := Doc2().Find(".four")
+	sel3 := sel.PrevFilteredUntilNodes(".odd", sel2.Nodes...).End()
+	assertEqual(t, sel, sel3)
+}
+
+func TestClosestItself(t *testing.T) {
+	sel := Doc2().Find(".three")
+	sel2 := sel.Closest(".row")
+	assertLength(t, sel2.Nodes, sel.Length())
+	assertSelectionIs(t, sel2, "#n3", "#nf3")
+}
+
+func TestClosestNoDupes(t *testing.T) {
+	sel := Doc().Find(".span12")
+	sel2 := sel.Closest(".pvk-content")
+	assertLength(t, sel2.Nodes, 1)
+	assertClass(t, sel2, "pvk-content")
+}
+
+func TestClosestNone(t *testing.T) {
+	sel := Doc().Find("h4")
+	sel2 := sel.Closest("a")
+	assertLength(t, sel2.Nodes, 0)
+}
+
+func TestClosestMany(t *testing.T) {
+	sel := Doc().Find(".container-fluid")
+	sel2 := sel.Closest(".pvk-content")
+	assertLength(t, sel2.Nodes, 2)
+	assertSelectionIs(t, sel2, "#pc1", "#pc2")
+}
+
+func TestClosestRollback(t *testing.T) {
+	sel := Doc().Find(".container-fluid")
+	sel2 := sel.Closest(".pvk-content").End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestClosestSelectionItself(t *testing.T) {
+	sel := Doc2().Find(".three")
+	sel2 := sel.ClosestSelection(Doc2().Find(".row"))
+	assertLength(t, sel2.Nodes, sel.Length())
+}
+
+func TestClosestSelectionNoDupes(t *testing.T) {
+	sel := Doc().Find(".span12")
+	sel2 := sel.ClosestSelection(Doc().Find(".pvk-content"))
+	assertLength(t, sel2.Nodes, 1)
+	assertClass(t, sel2, "pvk-content")
+}
+
+func TestClosestSelectionNone(t *testing.T) {
+	sel := Doc().Find("h4")
+	sel2 := sel.ClosestSelection(Doc().Find("a"))
+	assertLength(t, sel2.Nodes, 0)
+}
+
+func TestClosestSelectionMany(t *testing.T) {
+	sel := Doc().Find(".container-fluid")
+	sel2 := sel.ClosestSelection(Doc().Find(".pvk-content"))
+	assertLength(t, sel2.Nodes, 2)
+	assertSelectionIs(t, sel2, "#pc1", "#pc2")
+}
+
+func TestClosestSelectionRollback(t *testing.T) {
+	sel := Doc().Find(".container-fluid")
+	sel2 := sel.ClosestSelection(Doc().Find(".pvk-content")).End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestClosestNodesItself(t *testing.T) {
+	sel := Doc2().Find(".three")
+	sel2 := sel.ClosestNodes(Doc2().Find(".row").Nodes...)
+	assertLength(t, sel2.Nodes, sel.Length())
+}
+
+func TestClosestNodesNoDupes(t *testing.T) {
+	sel := Doc().Find(".span12")
+	sel2 := sel.ClosestNodes(Doc().Find(".pvk-content").Nodes...)
+	assertLength(t, sel2.Nodes, 1)
+	assertClass(t, sel2, "pvk-content")
+}
+
+func TestClosestNodesNone(t *testing.T) {
+	sel := Doc().Find("h4")
+	sel2 := sel.ClosestNodes(Doc().Find("a").Nodes...)
+	assertLength(t, sel2.Nodes, 0)
+}
+
+func TestClosestNodesMany(t *testing.T) {
+	sel := Doc().Find(".container-fluid")
+	sel2 := sel.ClosestNodes(Doc().Find(".pvk-content").Nodes...)
+	assertLength(t, sel2.Nodes, 2)
+	assertSelectionIs(t, sel2, "#pc1", "#pc2")
+}
+
+func TestClosestNodesRollback(t *testing.T) {
+	sel := Doc().Find(".container-fluid")
+	sel2 := sel.ClosestNodes(Doc().Find(".pvk-content").Nodes...).End()
+	assertEqual(t, sel, sel2)
+}
+
+func TestIssue26(t *testing.T) {
+	img1 := `<img src="assets/images/gallery/thumb-1.jpg" alt="150x150" />`
+	img2 := `<img alt="150x150" src="assets/images/gallery/thumb-1.jpg" />`
+	cases := []struct {
+		s string
+		l int
+	}{
+		{s: img1 + img2, l: 2},
+		{s: img1, l: 1},
+		{s: img2, l: 1},
+	}
+	for _, c := range cases {
+		doc, err := NewDocumentFromReader(strings.NewReader(c.s))
+		if err != nil {
+			t.Fatal(err)
+		}
+		sel := doc.Find("img[src]")
+		assertLength(t, sel.Nodes, c.l)
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/type.go b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/type.go
new file mode 100644
index 00000000..a879ad4a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/type.go
@@ -0,0 +1,113 @@
+package goquery
+
+import (
+	"errors"
+	"io"
+	"net/http"
+	"net/url"
+
+	"golang.org/x/net/html"
+)
+
+// Document represents an HTML document to be manipulated. Unlike jQuery, which
+// is loaded as part of a DOM document, and thus acts upon its containing
+// document, GoQuery doesn't know which HTML document to act upon. So it needs
+// to be told, and that's what the Document class is for. It holds the root
+// document node to manipulate, and can make selections on this document.
+type Document struct {
+	*Selection
+	Url      *url.URL
+	rootNode *html.Node
+}
+
+// NewDocumentFromNode is a Document constructor that takes a root html Node
+// as argument.
+func NewDocumentFromNode(root *html.Node) *Document {
+	return newDocument(root, nil)
+}
+
+// NewDocument is a Document constructor that takes a string URL as argument.
+// It loads the specified document, parses it, and stores the root Document
+// node, ready to be manipulated.
+func NewDocument(url string) (*Document, error) {
+	// Load the URL
+	res, e := http.Get(url)
+	if e != nil {
+		return nil, e
+	}
+	return NewDocumentFromResponse(res)
+}
+
+// NewDocumentFromReader returns a Document from a generic reader.
+// It returns an error as second value if the reader's data cannot be parsed
+// as html. It does *not* check if the reader is also an io.Closer, so the
+// provided reader is never closed by this call, it is the responsibility
+// of the caller to close it if required.
+func NewDocumentFromReader(r io.Reader) (*Document, error) {
+	root, e := html.Parse(r)
+	if e != nil {
+		return nil, e
+	}
+	return newDocument(root, nil), nil
+}
+
+// NewDocumentFromResponse is another Document constructor that takes an http response as argument.
+// It loads the specified response's document, parses it, and stores the root Document
+// node, ready to be manipulated. The response's body is closed on return.
+func NewDocumentFromResponse(res *http.Response) (*Document, error) {
+	if res == nil {
+		return nil, errors.New("Response is nil pointer")
+	}
+
+	defer res.Body.Close()
+
+	// Parse the HTML into nodes
+	root, e := html.Parse(res.Body)
+	if e != nil {
+		return nil, e
+	}
+
+	// Create and fill the document
+	return newDocument(root, res.Request.URL), nil
+}
+
+// CloneDocument creates a deep-clone of a document.
+func CloneDocument(doc *Document) *Document {
+	return newDocument(cloneNode(doc.rootNode), doc.Url)
+}
+
+// Private constructor, make sure all fields are correctly filled.
+func newDocument(root *html.Node, url *url.URL) *Document {
+	// Create and fill the document
+	d := &Document{nil, url, root}
+	d.Selection = newSingleSelection(root, d)
+	return d
+}
+
+// Selection represents a collection of nodes matching some criteria. The
+// initial Selection can be created by using Document.Find, and then
+// manipulated using the jQuery-like chainable syntax and methods.
+type Selection struct {
+	Nodes    []*html.Node
+	document *Document
+	prevSel  *Selection
+}
+
+// Helper constructor to create an empty selection
+func newEmptySelection(doc *Document) *Selection {
+	return &Selection{nil, doc, nil}
+}
+
+// Helper constructor to create a selection of only one node
+func newSingleSelection(node *html.Node, doc *Document) *Selection {
+	return &Selection{[]*html.Node{node}, doc, nil}
+}
+
+// Matcher is an interface that defines the methods to match
+// HTML nodes against a compiled selector string. Cascadia's
+// Selector implements this interface.
+type Matcher interface {
+	Match(*html.Node) bool
+	MatchAll(*html.Node) []*html.Node
+	Filter([]*html.Node) []*html.Node
+}
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/type_test.go b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/type_test.go
new file mode 100644
index 00000000..98ee3a64
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/type_test.go
@@ -0,0 +1,192 @@
+package goquery
+
+import (
+	"bytes"
+	"fmt"
+	"os"
+	"testing"
+
+	"golang.org/x/net/html"
+)
+
+// Test helper functions and members
+var doc *Document
+var doc2 *Document
+var doc3 *Document
+var docB *Document
+var docW *Document
+
+func Doc() *Document {
+	if doc == nil {
+		doc = loadDoc("page.html")
+	}
+	return doc
+}
+func DocClone() *Document {
+	return CloneDocument(Doc())
+}
+func Doc2() *Document {
+	if doc2 == nil {
+		doc2 = loadDoc("page2.html")
+	}
+	return doc2
+}
+func Doc2Clone() *Document {
+	return CloneDocument(Doc2())
+}
+func Doc3() *Document {
+	if doc3 == nil {
+		doc3 = loadDoc("page3.html")
+	}
+	return doc3
+}
+func Doc3Clone() *Document {
+	return CloneDocument(Doc3())
+}
+func DocB() *Document {
+	if docB == nil {
+		docB = loadDoc("gotesting.html")
+	}
+	return docB
+}
+func DocBClone() *Document {
+	return CloneDocument(DocB())
+}
+func DocW() *Document {
+	if docW == nil {
+		docW = loadDoc("gowiki.html")
+	}
+	return docW
+}
+func DocWClone() *Document {
+	return CloneDocument(DocW())
+}
+
+func assertLength(t *testing.T, nodes []*html.Node, length int) {
+	if len(nodes) != length {
+		t.Errorf("Expected %d nodes, found %d.", length, len(nodes))
+		for i, n := range nodes {
+			t.Logf("Node %d: %+v.", i, n)
+		}
+	}
+}
+
+func assertClass(t *testing.T, sel *Selection, class string) {
+	if !sel.HasClass(class) {
+		t.Errorf("Expected node to have class %s, found %+v.", class, sel.Get(0))
+	}
+}
+
+func assertPanic(t *testing.T) {
+	if e := recover(); e == nil {
+		t.Error("Expected a panic.")
+	}
+}
+
+func assertEqual(t *testing.T, s1 *Selection, s2 *Selection) {
+	if s1 != s2 {
+		t.Error("Expected selection objects to be the same.")
+	}
+}
+
+func assertSelectionIs(t *testing.T, sel *Selection, is ...string) {
+	for i := 0; i < sel.Length(); i++ {
+		if !sel.Eq(i).Is(is[i]) {
+			t.Errorf("Expected node %d to be %s, found %+v", i, is[i], sel.Get(i))
+		}
+	}
+}
+
+func printSel(t *testing.T, sel *Selection) {
+	if testing.Verbose() {
+		h, err := sel.Html()
+		if err != nil {
+			t.Fatal(err)
+		}
+		t.Log(h)
+	}
+}
+
+func loadDoc(page string) *Document {
+	var f *os.File
+	var e error
+
+	if f, e = os.Open(fmt.Sprintf("./testdata/%s", page)); e != nil {
+		panic(e.Error())
+	}
+	defer f.Close()
+
+	var node *html.Node
+	if node, e = html.Parse(f); e != nil {
+		panic(e.Error())
+	}
+	return NewDocumentFromNode(node)
+}
+
+func TestNewDocument(t *testing.T) {
+	if f, e := os.Open("./testdata/page.html"); e != nil {
+		t.Error(e.Error())
+	} else {
+		defer f.Close()
+		if node, e := html.Parse(f); e != nil {
+			t.Error(e.Error())
+		} else {
+			doc = NewDocumentFromNode(node)
+		}
+	}
+}
+
+func TestNewDocumentFromReader(t *testing.T) {
+	cases := []struct {
+		src string
+		err bool
+		sel string
+		cnt int
+	}{
+		0: {
+			src: `
+<html>
+<head>
+<title>Test</title>
+<body>
+<h1>Hi</h1>
+</body>
+</html>`,
+			sel: "h1",
+			cnt: 1,
+		},
+		1: {
+			// Actually pretty hard to make html.Parse return an error
+			// based on content...
+			src: `<html><body><aef<eqf>>>qq></body></ht>`,
+		},
+	}
+	buf := bytes.NewBuffer(nil)
+
+	for i, c := range cases {
+		buf.Reset()
+		buf.WriteString(c.src)
+
+		d, e := NewDocumentFromReader(buf)
+		if (e != nil) != c.err {
+			if c.err {
+				t.Errorf("[%d] - expected error, got none", i)
+			} else {
+				t.Errorf("[%d] - expected no error, got %s", i, e)
+			}
+		}
+		if c.sel != "" {
+			s := d.Find(c.sel)
+			if s.Length() != c.cnt {
+				t.Errorf("[%d] - expected %d nodes, found %d", i, c.cnt, s.Length())
+			}
+		}
+	}
+}
+
+func TestNewDocumentFromResponseNil(t *testing.T) {
+	_, e := NewDocumentFromResponse(nil)
+	if e == nil {
+		t.Error("Expected error, got none")
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/utilities.go b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/utilities.go
new file mode 100644
index 00000000..aa509e6a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/PuerkitoBio/goquery/utilities.go
@@ -0,0 +1,84 @@
+package goquery
+
+import (
+	"golang.org/x/net/html"
+)
+
+func getChildren(n *html.Node) (result []*html.Node) {
+	for c := n.FirstChild; c != nil; c = c.NextSibling {
+		result = append(result, c)
+	}
+	return result
+}
+
+// Loop through all container nodes to search for the target node.
+func sliceContains(container []*html.Node, contained *html.Node) bool {
+	for _, n := range container {
+		if nodeContains(n, contained) {
+			return true
+		}
+	}
+
+	return false
+}
+
+// Checks if the contained node is within the container node.
+func nodeContains(container *html.Node, contained *html.Node) bool {
+	// Check if the parent of the contained node is the container node, traversing
+	// upward until the top is reached, or the container is found.
+	for contained = contained.Parent; contained != nil; contained = contained.Parent {
+		if container == contained {
+			return true
+		}
+	}
+	return false
+}
+
+// Checks if the target node is in the slice of nodes.
+func isInSlice(slice []*html.Node, node *html.Node) bool {
+	return indexInSlice(slice, node) > -1
+}
+
+// Returns the index of the target node in the slice, or -1.
+func indexInSlice(slice []*html.Node, node *html.Node) int {
+	if node != nil {
+		for i, n := range slice {
+			if n == node {
+				return i
+			}
+		}
+	}
+	return -1
+}
+
+// Appends the new nodes to the target slice, making sure no duplicate is added.
+// There is no check to the original state of the target slice, so it may still
+// contain duplicates. The target slice is returned because append() may create
+// a new underlying array.
+func appendWithoutDuplicates(target []*html.Node, nodes []*html.Node) []*html.Node {
+	for _, n := range nodes {
+		if !isInSlice(target, n) {
+			target = append(target, n)
+		}
+	}
+
+	return target
+}
+
+// Loop through a selection, returning only those nodes that pass the predicate
+// function.
+func grep(sel *Selection, predicate func(i int, s *Selection) bool) (result []*html.Node) {
+	for i, n := range sel.Nodes {
+		if predicate(i, newSingleSelection(n, sel.document)) {
+			result = append(result, n)
+		}
+	}
+	return result
+}
+
+// Creates a new Selection object based on the specified nodes, and keeps the
+// source Selection object on the stack (linked list).
+func pushStack(fromSel *Selection, nodes []*html.Node) *Selection {
+	result := &Selection{nodes, fromSel.document, fromSel}
+	return result
+}
diff --git a/Godeps/_workspace/src/github.com/andybalholm/cascadia/.travis.yml b/Godeps/_workspace/src/github.com/andybalholm/cascadia/.travis.yml
new file mode 100644
index 00000000..6f227517
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/andybalholm/cascadia/.travis.yml
@@ -0,0 +1,14 @@
+language: go
+
+go:
+  - 1.3
+  - 1.4
+
+install:
+  - go get github.com/andybalholm/cascadia
+
+script:
+ - go test -v
+
+notifications:
+  email: false
diff --git a/Godeps/_workspace/src/github.com/andybalholm/cascadia/LICENSE b/Godeps/_workspace/src/github.com/andybalholm/cascadia/LICENSE
new file mode 100644
index 00000000..ee5ad35a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/andybalholm/cascadia/LICENSE
@@ -0,0 +1,24 @@
+Copyright (c) 2011 Andy Balholm. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/andybalholm/cascadia/README.md b/Godeps/_workspace/src/github.com/andybalholm/cascadia/README.md
new file mode 100644
index 00000000..c4c2ded3
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/andybalholm/cascadia/README.md
@@ -0,0 +1,5 @@
+# cascadia
+
+[![](https://travis-ci.org/andybalholm/cascadia.svg)](https://travis-ci.org/andybalholm/cascadia)
+
+The Cascadia package implements CSS selectors for use with the parse trees produced by the html package.
diff --git a/Godeps/_workspace/src/github.com/andybalholm/cascadia/benchmark_test.go b/Godeps/_workspace/src/github.com/andybalholm/cascadia/benchmark_test.go
new file mode 100644
index 00000000..42bf5000
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/andybalholm/cascadia/benchmark_test.go
@@ -0,0 +1,53 @@
+package cascadia
+
+import (
+	"strings"
+	"testing"
+
+	"golang.org/x/net/html"
+)
+
+func MustParseHTML(doc string) *html.Node {
+	dom, err := html.Parse(strings.NewReader(doc))
+	if err != nil {
+		panic(err)
+	}
+	return dom
+}
+
+var selector = MustCompile(`div.matched`)
+var doc = `<!DOCTYPE html>
+<html>
+<body>
+<div class="matched">
+  <div>
+    <div class="matched"></div>
+    <div class="matched"></div>
+    <div class="matched"></div>
+    <div class="matched"></div>
+    <div class="matched"></div>
+    <div class="matched"></div>
+    <div class="matched"></div>
+    <div class="matched"></div>
+    <div class="matched"></div>
+    <div class="matched"></div>
+    <div class="matched"></div>
+    <div class="matched"></div>
+    <div class="matched"></div>
+    <div class="matched"></div>
+    <div class="matched"></div>
+    <div class="matched"></div>
+  </div>
+</div>
+</body>
+</html>
+`
+var dom = MustParseHTML(doc)
+
+func BenchmarkMatchAll(b *testing.B) {
+	var matches []*html.Node
+	for i := 0; i < b.N; i++ {
+		matches = selector.MatchAll(dom)
+	}
+	_ = matches
+}
diff --git a/Godeps/_workspace/src/github.com/andybalholm/cascadia/parser.go b/Godeps/_workspace/src/github.com/andybalholm/cascadia/parser.go
new file mode 100644
index 00000000..8a1900d7
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/andybalholm/cascadia/parser.go
@@ -0,0 +1,815 @@
+// The cascadia package is an implementation of CSS selectors.
+package cascadia
+
+import (
+	"errors"
+	"fmt"
+	"regexp"
+	"strconv"
+	"strings"
+
+	"golang.org/x/net/html"
+)
+
+// a parser for CSS selectors
+type parser struct {
+	s string // the source text
+	i int    // the current position
+}
+
+// parseEscape parses a backslash escape.
+func (p *parser) parseEscape() (result string, err error) {
+	if len(p.s) < p.i+2 || p.s[p.i] != '\\' {
+		return "", errors.New("invalid escape sequence")
+	}
+
+	start := p.i + 1
+	c := p.s[start]
+	switch {
+	case c == '\r' || c == '\n' || c == '\f':
+		return "", errors.New("escaped line ending outside string")
+	case hexDigit(c):
+		// unicode escape (hex)
+		var i int
+		for i = start; i < p.i+6 && i < len(p.s) && hexDigit(p.s[i]); i++ {
+			// empty
+		}
+		v, _ := strconv.ParseUint(p.s[start:i], 16, 21)
+		if len(p.s) > i {
+			switch p.s[i] {
+			case '\r':
+				i++
+				if len(p.s) > i && p.s[i] == '\n' {
+					i++
+				}
+			case ' ', '\t', '\n', '\f':
+				i++
+			}
+		}
+		p.i = i
+		return string(rune(v)), nil
+	}
+
+	// Return the literal character after the backslash.
+	result = p.s[start : start+1]
+	p.i += 2
+	return result, nil
+}
+
+func hexDigit(c byte) bool {
+	return '0' <= c && c <= '9' || 'a' <= c && c <= 'f' || 'A' <= c && c <= 'F'
+}
+
+// nameStart returns whether c can be the first character of an identifier
+// (not counting an initial hyphen, or an escape sequence).
+func nameStart(c byte) bool {
+	return 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' || c == '_' || c > 127
+}
+
+// nameChar returns whether c can be a character within an identifier
+// (not counting an escape sequence).
+func nameChar(c byte) bool {
+	return 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' || c == '_' || c > 127 ||
+		c == '-' || '0' <= c && c <= '9'
+}
+
+// parseIdentifier parses an identifier.
+func (p *parser) parseIdentifier() (result string, err error) {
+	startingDash := false
+	if len(p.s) > p.i && p.s[p.i] == '-' {
+		startingDash = true
+		p.i++
+	}
+
+	if len(p.s) <= p.i {
+		return "", errors.New("expected identifier, found EOF instead")
+	}
+
+	if c := p.s[p.i]; !(nameStart(c) || c == '\\') {
+		return "", fmt.Errorf("expected identifier, found %c instead", c)
+	}
+
+	result, err = p.parseName()
+	if startingDash && err == nil {
+		result = "-" + result
+	}
+	return
+}
+
+// parseName parses a name (which is like an identifier, but doesn't have
+// extra restrictions on the first character).
+func (p *parser) parseName() (result string, err error) {
+	i := p.i
+loop:
+	for i < len(p.s) {
+		c := p.s[i]
+		switch {
+		case nameChar(c):
+			start := i
+			for i < len(p.s) && nameChar(p.s[i]) {
+				i++
+			}
+			result += p.s[start:i]
+		case c == '\\':
+			p.i = i
+			val, err := p.parseEscape()
+			if err != nil {
+				return "", err
+			}
+			i = p.i
+			result += val
+		default:
+			break loop
+		}
+	}
+
+	if result == "" {
+		return "", errors.New("expected name, found EOF instead")
+	}
+
+	p.i = i
+	return result, nil
+}
+
+// parseString parses a single- or double-quoted string.
+func (p *parser) parseString() (result string, err error) {
+	i := p.i
+	if len(p.s) < i+2 {
+		return "", errors.New("expected string, found EOF instead")
+	}
+
+	quote := p.s[i]
+	i++
+
+loop:
+	for i < len(p.s) {
+		switch p.s[i] {
+		case '\\':
+			if len(p.s) > i+1 {
+				switch c := p.s[i+1]; c {
+				case '\r':
+					if len(p.s) > i+2 && p.s[i+2] == '\n' {
+						i += 3
+						continue loop
+					}
+					fallthrough
+				case '\n', '\f':
+					i += 2
+					continue loop
+				}
+			}
+			p.i = i
+			val, err := p.parseEscape()
+			if err != nil {
+				return "", err
+			}
+			i = p.i
+			result += val
+		case quote:
+			break loop
+		case '\r', '\n', '\f':
+			return "", errors.New("unexpected end of line in string")
+		default:
+			start := i
+			for i < len(p.s) {
+				if c := p.s[i]; c == quote || c == '\\' || c == '\r' || c == '\n' || c == '\f' {
+					break
+				}
+				i++
+			}
+			result += p.s[start:i]
+		}
+	}
+
+	if i >= len(p.s) {
+		return "", errors.New("EOF in string")
+	}
+
+	// Consume the final quote.
+	i++
+
+	p.i = i
+	return result, nil
+}
+
+// parseRegex parses a regular expression; the end is defined by encountering an
+// unmatched closing ')' or ']' which is not consumed
+func (p *parser) parseRegex() (rx *regexp.Regexp, err error) {
+	i := p.i
+	if len(p.s) < i+2 {
+		return nil, errors.New("expected regular expression, found EOF instead")
+	}
+
+	// number of open parens or brackets;
+	// when it becomes negative, finished parsing regex
+	open := 0
+
+loop:
+	for i < len(p.s) {
+		switch p.s[i] {
+		case '(', '[':
+			open++
+		case ')', ']':
+			open--
+			if open < 0 {
+				break loop
+			}
+		}
+		i++
+	}
+
+	if i >= len(p.s) {
+		return nil, errors.New("EOF in regular expression")
+	}
+	rx, err = regexp.Compile(p.s[p.i:i])
+	p.i = i
+	return rx, err
+}
+
+// skipWhitespace consumes whitespace characters and comments.
+// It returns true if there was actually anything to skip.
+func (p *parser) skipWhitespace() bool {
+	i := p.i
+	for i < len(p.s) {
+		switch p.s[i] {
+		case ' ', '\t', '\r', '\n', '\f':
+			i++
+			continue
+		case '/':
+			if strings.HasPrefix(p.s[i:], "/*") {
+				end := strings.Index(p.s[i+len("/*"):], "*/")
+				if end != -1 {
+					i += end + len("/**/")
+					continue
+				}
+			}
+		}
+		break
+	}
+
+	if i > p.i {
+		p.i = i
+		return true
+	}
+
+	return false
+}
+
+// consumeParenthesis consumes an opening parenthesis and any following
+// whitespace. It returns true if there was actually a parenthesis to skip.
+func (p *parser) consumeParenthesis() bool {
+	if p.i < len(p.s) && p.s[p.i] == '(' {
+		p.i++
+		p.skipWhitespace()
+		return true
+	}
+	return false
+}
+
+// consumeClosingParenthesis consumes a closing parenthesis and any preceding
+// whitespace. It returns true if there was actually a parenthesis to skip.
+func (p *parser) consumeClosingParenthesis() bool {
+	i := p.i
+	p.skipWhitespace()
+	if p.i < len(p.s) && p.s[p.i] == ')' {
+		p.i++
+		return true
+	}
+	p.i = i
+	return false
+}
+
+// parseTypeSelector parses a type selector (one that matches by tag name).
+func (p *parser) parseTypeSelector() (result Selector, err error) {
+	tag, err := p.parseIdentifier()
+	if err != nil {
+		return nil, err
+	}
+
+	return typeSelector(tag), nil
+}
+
+// parseIDSelector parses a selector that matches by id attribute.
+func (p *parser) parseIDSelector() (Selector, error) {
+	if p.i >= len(p.s) {
+		return nil, fmt.Errorf("expected id selector (#id), found EOF instead")
+	}
+	if p.s[p.i] != '#' {
+		return nil, fmt.Errorf("expected id selector (#id), found '%c' instead", p.s[p.i])
+	}
+
+	p.i++
+	id, err := p.parseName()
+	if err != nil {
+		return nil, err
+	}
+
+	return attributeEqualsSelector("id", id), nil
+}
+
+// parseClassSelector parses a selector that matches by class attribute.
+func (p *parser) parseClassSelector() (Selector, error) {
+	if p.i >= len(p.s) {
+		return nil, fmt.Errorf("expected class selector (.class), found EOF instead")
+	}
+	if p.s[p.i] != '.' {
+		return nil, fmt.Errorf("expected class selector (.class), found '%c' instead", p.s[p.i])
+	}
+
+	p.i++
+	class, err := p.parseIdentifier()
+	if err != nil {
+		return nil, err
+	}
+
+	return attributeIncludesSelector("class", class), nil
+}
+
+// parseAttributeSelector parses a selector that matches by attribute value.
+func (p *parser) parseAttributeSelector() (Selector, error) {
+	if p.i >= len(p.s) {
+		return nil, fmt.Errorf("expected attribute selector ([attribute]), found EOF instead")
+	}
+	if p.s[p.i] != '[' {
+		return nil, fmt.Errorf("expected attribute selector ([attribute]), found '%c' instead", p.s[p.i])
+	}
+
+	p.i++
+	p.skipWhitespace()
+	key, err := p.parseIdentifier()
+	if err != nil {
+		return nil, err
+	}
+
+	p.skipWhitespace()
+	if p.i >= len(p.s) {
+		return nil, errors.New("unexpected EOF in attribute selector")
+	}
+
+	if p.s[p.i] == ']' {
+		p.i++
+		return attributeExistsSelector(key), nil
+	}
+
+	if p.i+2 >= len(p.s) {
+		return nil, errors.New("unexpected EOF in attribute selector")
+	}
+
+	op := p.s[p.i : p.i+2]
+	if op[0] == '=' {
+		op = "="
+	} else if op[1] != '=' {
+		return nil, fmt.Errorf(`expected equality operator, found "%s" instead`, op)
+	}
+	p.i += len(op)
+
+	p.skipWhitespace()
+	if p.i >= len(p.s) {
+		return nil, errors.New("unexpected EOF in attribute selector")
+	}
+	var val string
+	var rx *regexp.Regexp
+	if op == "#=" {
+		rx, err = p.parseRegex()
+	} else {
+		switch p.s[p.i] {
+		case '\'', '"':
+			val, err = p.parseString()
+		default:
+			val, err = p.parseIdentifier()
+		}
+	}
+	if err != nil {
+		return nil, err
+	}
+
+	p.skipWhitespace()
+	if p.i >= len(p.s) {
+		return nil, errors.New("unexpected EOF in attribute selector")
+	}
+	if p.s[p.i] != ']' {
+		return nil, fmt.Errorf("expected ']', found '%c' instead", p.s[p.i])
+	}
+	p.i++
+
+	switch op {
+	case "=":
+		return attributeEqualsSelector(key, val), nil
+	case "~=":
+		return attributeIncludesSelector(key, val), nil
+	case "|=":
+		return attributeDashmatchSelector(key, val), nil
+	case "^=":
+		return attributePrefixSelector(key, val), nil
+	case "$=":
+		return attributeSuffixSelector(key, val), nil
+	case "*=":
+		return attributeSubstringSelector(key, val), nil
+	case "#=":
+		return attributeRegexSelector(key, rx), nil
+	}
+
+	return nil, fmt.Errorf("attribute operator %q is not supported", op)
+}
+
+var expectedParenthesis = errors.New("expected '(' but didn't find it")
+var expectedClosingParenthesis = errors.New("expected ')' but didn't find it")
+
+// parsePseudoclassSelector parses a pseudoclass selector like :not(p).
+func (p *parser) parsePseudoclassSelector() (Selector, error) {
+	if p.i >= len(p.s) {
+		return nil, fmt.Errorf("expected pseudoclass selector (:pseudoclass), found EOF instead")
+	}
+	if p.s[p.i] != ':' {
+		return nil, fmt.Errorf("expected attribute selector (:pseudoclass), found '%c' instead", p.s[p.i])
+	}
+
+	p.i++
+	name, err := p.parseIdentifier()
+	if err != nil {
+		return nil, err
+	}
+	name = toLowerASCII(name)
+
+	switch name {
+	case "not", "has", "haschild":
+		if !p.consumeParenthesis() {
+			return nil, expectedParenthesis
+		}
+		sel, err := p.parseSelectorGroup()
+		if err != nil {
+			return nil, err
+		}
+		if !p.consumeClosingParenthesis() {
+			return nil, expectedClosingParenthesis
+		}
+
+		switch name {
+		case "not":
+			return negatedSelector(sel), nil
+		case "has":
+			return hasDescendantSelector(sel), nil
+		case "haschild":
+			return hasChildSelector(sel), nil
+		}
+
+	case "contains", "containsown":
+		if !p.consumeParenthesis() {
+			return nil, expectedParenthesis
+		}
+		var val string
+		switch p.s[p.i] {
+		case '\'', '"':
+			val, err = p.parseString()
+		default:
+			val, err = p.parseIdentifier()
+		}
+		if err != nil {
+			return nil, err
+		}
+		val = strings.ToLower(val)
+		p.skipWhitespace()
+		if p.i >= len(p.s) {
+			return nil, errors.New("unexpected EOF in pseudo selector")
+		}
+		if !p.consumeClosingParenthesis() {
+			return nil, expectedClosingParenthesis
+		}
+
+		switch name {
+		case "contains":
+			return textSubstrSelector(val), nil
+		case "containsown":
+			return ownTextSubstrSelector(val), nil
+		}
+
+	case "matches", "matchesown":
+		if !p.consumeParenthesis() {
+			return nil, expectedParenthesis
+		}
+		rx, err := p.parseRegex()
+		if err != nil {
+			return nil, err
+		}
+		if p.i >= len(p.s) {
+			return nil, errors.New("unexpected EOF in pseudo selector")
+		}
+		if !p.consumeClosingParenthesis() {
+			return nil, expectedClosingParenthesis
+		}
+
+		switch name {
+		case "matches":
+			return textRegexSelector(rx), nil
+		case "matchesown":
+			return ownTextRegexSelector(rx), nil
+		}
+
+	case "nth-child", "nth-last-child", "nth-of-type", "nth-last-of-type":
+		if !p.consumeParenthesis() {
+			return nil, expectedParenthesis
+		}
+		a, b, err := p.parseNth()
+		if err != nil {
+			return nil, err
+		}
+		if !p.consumeClosingParenthesis() {
+			return nil, expectedClosingParenthesis
+		}
+		return nthChildSelector(a, b,
+				name == "nth-last-child" || name == "nth-last-of-type",
+				name == "nth-of-type" || name == "nth-last-of-type"),
+			nil
+
+	case "first-child":
+		return nthChildSelector(0, 1, false, false), nil
+	case "last-child":
+		return nthChildSelector(0, 1, true, false), nil
+	case "first-of-type":
+		return nthChildSelector(0, 1, false, true), nil
+	case "last-of-type":
+		return nthChildSelector(0, 1, true, true), nil
+	case "only-child":
+		return onlyChildSelector(false), nil
+	case "only-of-type":
+		return onlyChildSelector(true), nil
+	case "input":
+		return inputSelector, nil
+	case "empty":
+		return emptyElementSelector, nil
+	}
+
+	return nil, fmt.Errorf("unknown pseudoclass :%s", name)
+}
+
+// parseInteger parses a  decimal integer.
+func (p *parser) parseInteger() (int, error) {
+	i := p.i
+	start := i
+	for i < len(p.s) && '0' <= p.s[i] && p.s[i] <= '9' {
+		i++
+	}
+	if i == start {
+		return 0, errors.New("expected integer, but didn't find it.")
+	}
+	p.i = i
+
+	val, err := strconv.Atoi(p.s[start:i])
+	if err != nil {
+		return 0, err
+	}
+
+	return val, nil
+}
+
+// parseNth parses the argument for :nth-child (normally of the form an+b).
+func (p *parser) parseNth() (a, b int, err error) {
+	// initial state
+	if p.i >= len(p.s) {
+		goto eof
+	}
+	switch p.s[p.i] {
+	case '-':
+		p.i++
+		goto negativeA
+	case '+':
+		p.i++
+		goto positiveA
+	case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9':
+		goto positiveA
+	case 'n', 'N':
+		a = 1
+		p.i++
+		goto readN
+	case 'o', 'O', 'e', 'E':
+		id, err := p.parseName()
+		if err != nil {
+			return 0, 0, err
+		}
+		id = toLowerASCII(id)
+		if id == "odd" {
+			return 2, 1, nil
+		}
+		if id == "even" {
+			return 2, 0, nil
+		}
+		return 0, 0, fmt.Errorf("expected 'odd' or 'even', but found '%s' instead", id)
+	default:
+		goto invalid
+	}
+
+positiveA:
+	if p.i >= len(p.s) {
+		goto eof
+	}
+	switch p.s[p.i] {
+	case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9':
+		a, err = p.parseInteger()
+		if err != nil {
+			return 0, 0, err
+		}
+		goto readA
+	case 'n', 'N':
+		a = 1
+		p.i++
+		goto readN
+	default:
+		goto invalid
+	}
+
+negativeA:
+	if p.i >= len(p.s) {
+		goto eof
+	}
+	switch p.s[p.i] {
+	case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9':
+		a, err = p.parseInteger()
+		if err != nil {
+			return 0, 0, err
+		}
+		a = -a
+		goto readA
+	case 'n', 'N':
+		a = -1
+		p.i++
+		goto readN
+	default:
+		goto invalid
+	}
+
+readA:
+	if p.i >= len(p.s) {
+		goto eof
+	}
+	switch p.s[p.i] {
+	case 'n', 'N':
+		p.i++
+		goto readN
+	default:
+		// The number we read as a is actually b.
+		return 0, a, nil
+	}
+
+readN:
+	p.skipWhitespace()
+	if p.i >= len(p.s) {
+		goto eof
+	}
+	switch p.s[p.i] {
+	case '+':
+		p.i++
+		p.skipWhitespace()
+		b, err = p.parseInteger()
+		if err != nil {
+			return 0, 0, err
+		}
+		return a, b, nil
+	case '-':
+		p.i++
+		p.skipWhitespace()
+		b, err = p.parseInteger()
+		if err != nil {
+			return 0, 0, err
+		}
+		return a, -b, nil
+	default:
+		return a, 0, nil
+	}
+
+eof:
+	return 0, 0, errors.New("unexpected EOF while attempting to parse expression of form an+b")
+
+invalid:
+	return 0, 0, errors.New("unexpected character while attempting to parse expression of form an+b")
+}
+
+// parseSimpleSelectorSequence parses a selector sequence that applies to
+// a single element.
+func (p *parser) parseSimpleSelectorSequence() (Selector, error) {
+	var result Selector
+
+	if p.i >= len(p.s) {
+		return nil, errors.New("expected selector, found EOF instead")
+	}
+
+	switch p.s[p.i] {
+	case '*':
+		// It's the universal selector. Just skip over it, since it doesn't affect the meaning.
+		p.i++
+	case '#', '.', '[', ':':
+		// There's no type selector. Wait to process the other till the main loop.
+	default:
+		r, err := p.parseTypeSelector()
+		if err != nil {
+			return nil, err
+		}
+		result = r
+	}
+
+loop:
+	for p.i < len(p.s) {
+		var ns Selector
+		var err error
+		switch p.s[p.i] {
+		case '#':
+			ns, err = p.parseIDSelector()
+		case '.':
+			ns, err = p.parseClassSelector()
+		case '[':
+			ns, err = p.parseAttributeSelector()
+		case ':':
+			ns, err = p.parsePseudoclassSelector()
+		default:
+			break loop
+		}
+		if err != nil {
+			return nil, err
+		}
+		if result == nil {
+			result = ns
+		} else {
+			result = intersectionSelector(result, ns)
+		}
+	}
+
+	if result == nil {
+		result = func(n *html.Node) bool {
+			return true
+		}
+	}
+
+	return result, nil
+}
+
+// parseSelector parses a selector that may include combinators.
+func (p *parser) parseSelector() (result Selector, err error) {
+	p.skipWhitespace()
+	result, err = p.parseSimpleSelectorSequence()
+	if err != nil {
+		return
+	}
+
+	for {
+		var combinator byte
+		if p.skipWhitespace() {
+			combinator = ' '
+		}
+		if p.i >= len(p.s) {
+			return
+		}
+
+		switch p.s[p.i] {
+		case '+', '>', '~':
+			combinator = p.s[p.i]
+			p.i++
+			p.skipWhitespace()
+		case ',', ')':
+			// These characters can't begin a selector, but they can legally occur after one.
+			return
+		}
+
+		if combinator == 0 {
+			return
+		}
+
+		c, err := p.parseSimpleSelectorSequence()
+		if err != nil {
+			return nil, err
+		}
+
+		switch combinator {
+		case ' ':
+			result = descendantSelector(result, c)
+		case '>':
+			result = childSelector(result, c)
+		case '+':
+			result = siblingSelector(result, c, true)
+		case '~':
+			result = siblingSelector(result, c, false)
+		}
+	}
+
+	panic("unreachable")
+}
+
+// parseSelectorGroup parses a group of selectors, separated by commas.
+func (p *parser) parseSelectorGroup() (result Selector, err error) {
+	result, err = p.parseSelector()
+	if err != nil {
+		return
+	}
+
+	for p.i < len(p.s) {
+		if p.s[p.i] != ',' {
+			return result, nil
+		}
+		p.i++
+		c, err := p.parseSelector()
+		if err != nil {
+			return nil, err
+		}
+		result = unionSelector(result, c)
+	}
+
+	return
+}
diff --git a/Godeps/_workspace/src/github.com/andybalholm/cascadia/parser_test.go b/Godeps/_workspace/src/github.com/andybalholm/cascadia/parser_test.go
new file mode 100644
index 00000000..47dd4a69
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/andybalholm/cascadia/parser_test.go
@@ -0,0 +1,86 @@
+package cascadia
+
+import (
+	"testing"
+)
+
+var identifierTests = map[string]string{
+	"x":         "x",
+	"96":        "",
+	"-x":        "-x",
+	`r\e9 sumé`: "résumé",
+	`a\"b`:      `a"b`,
+}
+
+func TestParseIdentifier(t *testing.T) {
+	for source, want := range identifierTests {
+		p := &parser{s: source}
+		got, err := p.parseIdentifier()
+
+		if err != nil {
+			if want == "" {
+				// It was supposed to be an error.
+				continue
+			}
+			t.Errorf("parsing %q: got error (%s), want %q", source, err, want)
+			continue
+		}
+
+		if want == "" {
+			if err == nil {
+				t.Errorf("parsing %q: got %q, want error", source, got)
+			}
+			continue
+		}
+
+		if p.i < len(source) {
+			t.Errorf("parsing %q: %d bytes left over", source, len(source)-p.i)
+			continue
+		}
+
+		if got != want {
+			t.Errorf("parsing %q: got %q, want %q", source, got, want)
+		}
+	}
+}
+
+var stringTests = map[string]string{
+	`"x"`:         "x",
+	`'x'`:         "x",
+	`'x`:          "",
+	"'x\\\r\nx'":  "xx",
+	`"r\e9 sumé"`: "résumé",
+	`"a\"b"`:      `a"b`,
+}
+
+func TestParseString(t *testing.T) {
+	for source, want := range stringTests {
+		p := &parser{s: source}
+		got, err := p.parseString()
+
+		if err != nil {
+			if want == "" {
+				// It was supposed to be an error.
+				continue
+			}
+			t.Errorf("parsing %q: got error (%s), want %q", source, err, want)
+			continue
+		}
+
+		if want == "" {
+			if err == nil {
+				t.Errorf("parsing %q: got %q, want error", source, got)
+			}
+			continue
+		}
+
+		if p.i < len(source) {
+			t.Errorf("parsing %q: %d bytes left over", source, len(source)-p.i)
+			continue
+		}
+
+		if got != want {
+			t.Errorf("parsing %q: got %q, want %q", source, got, want)
+		}
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/andybalholm/cascadia/selector.go b/Godeps/_workspace/src/github.com/andybalholm/cascadia/selector.go
new file mode 100644
index 00000000..aeffdbd5
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/andybalholm/cascadia/selector.go
@@ -0,0 +1,508 @@
+package cascadia
+
+import (
+	"bytes"
+	"fmt"
+	"regexp"
+	"strings"
+
+	"golang.org/x/net/html"
+)
+
+// the Selector type, and functions for creating them
+
+// A Selector is a function which tells whether a node matches or not.
+type Selector func(*html.Node) bool
+
+// hasChildMatch returns whether n has any child that matches a.
+func hasChildMatch(n *html.Node, a Selector) bool {
+	for c := n.FirstChild; c != nil; c = c.NextSibling {
+		if a(c) {
+			return true
+		}
+	}
+	return false
+}
+
+// hasDescendantMatch performs a depth-first search of n's descendants,
+// testing whether any of them match a. It returns true as soon as a match is
+// found, or false if no match is found.
+func hasDescendantMatch(n *html.Node, a Selector) bool {
+	for c := n.FirstChild; c != nil; c = c.NextSibling {
+		if a(c) || (c.Type == html.ElementNode && hasDescendantMatch(c, a)) {
+			return true
+		}
+	}
+	return false
+}
+
+// Compile parses a selector and returns, if successful, a Selector object
+// that can be used to match against html.Node objects.
+func Compile(sel string) (Selector, error) {
+	p := &parser{s: sel}
+	compiled, err := p.parseSelectorGroup()
+	if err != nil {
+		return nil, err
+	}
+
+	if p.i < len(sel) {
+		return nil, fmt.Errorf("parsing %q: %d bytes left over", sel, len(sel)-p.i)
+	}
+
+	return compiled, nil
+}
+
+// MustCompile is like Compile, but panics instead of returning an error.
+func MustCompile(sel string) Selector {
+	compiled, err := Compile(sel)
+	if err != nil {
+		panic(err)
+	}
+	return compiled
+}
+
+// MatchAll returns a slice of the nodes that match the selector,
+// from n and its children.
+func (s Selector) MatchAll(n *html.Node) []*html.Node {
+	return s.matchAllInto(n, nil)
+}
+
+func (s Selector) matchAllInto(n *html.Node, storage []*html.Node) []*html.Node {
+	if s(n) {
+		storage = append(storage, n)
+	}
+
+	for child := n.FirstChild; child != nil; child = child.NextSibling {
+		storage = s.matchAllInto(child, storage)
+	}
+
+	return storage
+}
+
+// Match returns true if the node matches the selector.
+func (s Selector) Match(n *html.Node) bool {
+	return s(n)
+}
+
+// MatchFirst returns the first node that matches s, from n and its children.
+func (s Selector) MatchFirst(n *html.Node) *html.Node {
+	if s.Match(n) {
+		return n
+	}
+
+	for c := n.FirstChild; c != nil; c = c.NextSibling {
+		m := s.MatchFirst(c)
+		if m != nil {
+			return m
+		}
+	}
+	return nil
+}
+
+// Filter returns the nodes in nodes that match the selector.
+func (s Selector) Filter(nodes []*html.Node) (result []*html.Node) {
+	for _, n := range nodes {
+		if s(n) {
+			result = append(result, n)
+		}
+	}
+	return result
+}
+
+// typeSelector returns a Selector that matches elements with a given tag name.
+func typeSelector(tag string) Selector {
+	tag = toLowerASCII(tag)
+	return func(n *html.Node) bool {
+		return n.Type == html.ElementNode && n.Data == tag
+	}
+}
+
+// toLowerASCII returns s with all ASCII capital letters lowercased.
+func toLowerASCII(s string) string {
+	var b []byte
+	for i := 0; i < len(s); i++ {
+		if c := s[i]; 'A' <= c && c <= 'Z' {
+			if b == nil {
+				b = make([]byte, len(s))
+				copy(b, s)
+			}
+			b[i] = s[i] + ('a' - 'A')
+		}
+	}
+
+	if b == nil {
+		return s
+	}
+
+	return string(b)
+}
+
+// attributeSelector returns a Selector that matches elements
+// where the attribute named key satisifes the function f.
+func attributeSelector(key string, f func(string) bool) Selector {
+	key = toLowerASCII(key)
+	return func(n *html.Node) bool {
+		if n.Type != html.ElementNode {
+			return false
+		}
+		for _, a := range n.Attr {
+			if a.Key == key && f(a.Val) {
+				return true
+			}
+		}
+		return false
+	}
+}
+
+// attributeExistsSelector returns a Selector that matches elements that have
+// an attribute named key.
+func attributeExistsSelector(key string) Selector {
+	return attributeSelector(key, func(string) bool { return true })
+}
+
+// attributeEqualsSelector returns a Selector that matches elements where
+// the attribute named key has the value val.
+func attributeEqualsSelector(key, val string) Selector {
+	return attributeSelector(key,
+		func(s string) bool {
+			return s == val
+		})
+}
+
+// attributeIncludesSelector returns a Selector that matches elements where
+// the attribute named key is a whitespace-separated list that includes val.
+func attributeIncludesSelector(key, val string) Selector {
+	return attributeSelector(key,
+		func(s string) bool {
+			for s != "" {
+				i := strings.IndexAny(s, " \t\r\n\f")
+				if i == -1 {
+					return s == val
+				}
+				if s[:i] == val {
+					return true
+				}
+				s = s[i+1:]
+			}
+			return false
+		})
+}
+
+// attributeDashmatchSelector returns a Selector that matches elements where
+// the attribute named key equals val or starts with val plus a hyphen.
+func attributeDashmatchSelector(key, val string) Selector {
+	return attributeSelector(key,
+		func(s string) bool {
+			if s == val {
+				return true
+			}
+			if len(s) <= len(val) {
+				return false
+			}
+			if s[:len(val)] == val && s[len(val)] == '-' {
+				return true
+			}
+			return false
+		})
+}
+
+// attributePrefixSelector returns a Selector that matches elements where
+// the attribute named key starts with val.
+func attributePrefixSelector(key, val string) Selector {
+	return attributeSelector(key,
+		func(s string) bool {
+			return strings.HasPrefix(s, val)
+		})
+}
+
+// attributeSuffixSelector returns a Selector that matches elements where
+// the attribute named key ends with val.
+func attributeSuffixSelector(key, val string) Selector {
+	return attributeSelector(key,
+		func(s string) bool {
+			return strings.HasSuffix(s, val)
+		})
+}
+
+// attributeSubstringSelector returns a Selector that matches nodes where
+// the attribute named key contains val.
+func attributeSubstringSelector(key, val string) Selector {
+	return attributeSelector(key,
+		func(s string) bool {
+			return strings.Contains(s, val)
+		})
+}
+
+// attributeRegexSelector returns a Selector that matches nodes where
+// the attribute named key matches the regular expression rx
+func attributeRegexSelector(key string, rx *regexp.Regexp) Selector {
+	return attributeSelector(key,
+		func(s string) bool {
+			return rx.MatchString(s)
+		})
+}
+
+// intersectionSelector returns a selector that matches nodes that match
+// both a and b.
+func intersectionSelector(a, b Selector) Selector {
+	return func(n *html.Node) bool {
+		return a(n) && b(n)
+	}
+}
+
+// unionSelector returns a selector that matches elements that match
+// either a or b.
+func unionSelector(a, b Selector) Selector {
+	return func(n *html.Node) bool {
+		return a(n) || b(n)
+	}
+}
+
+// negatedSelector returns a selector that matches elements that do not match a.
+func negatedSelector(a Selector) Selector {
+	return func(n *html.Node) bool {
+		if n.Type != html.ElementNode {
+			return false
+		}
+		return !a(n)
+	}
+}
+
+// writeNodeText writes the text contained in n and its descendants to b.
+func writeNodeText(n *html.Node, b *bytes.Buffer) {
+	switch n.Type {
+	case html.TextNode:
+		b.WriteString(n.Data)
+	case html.ElementNode:
+		for c := n.FirstChild; c != nil; c = c.NextSibling {
+			writeNodeText(c, b)
+		}
+	}
+}
+
+// nodeText returns the text contained in n and its descendants.
+func nodeText(n *html.Node) string {
+	var b bytes.Buffer
+	writeNodeText(n, &b)
+	return b.String()
+}
+
+// nodeOwnText returns the contents of the text nodes that are direct
+// children of n.
+func nodeOwnText(n *html.Node) string {
+	var b bytes.Buffer
+	for c := n.FirstChild; c != nil; c = c.NextSibling {
+		if c.Type == html.TextNode {
+			b.WriteString(c.Data)
+		}
+	}
+	return b.String()
+}
+
+// textSubstrSelector returns a selector that matches nodes that
+// contain the given text.
+func textSubstrSelector(val string) Selector {
+	return func(n *html.Node) bool {
+		text := strings.ToLower(nodeText(n))
+		return strings.Contains(text, val)
+	}
+}
+
+// ownTextSubstrSelector returns a selector that matches nodes that
+// directly contain the given text
+func ownTextSubstrSelector(val string) Selector {
+	return func(n *html.Node) bool {
+		text := strings.ToLower(nodeOwnText(n))
+		return strings.Contains(text, val)
+	}
+}
+
+// textRegexSelector returns a selector that matches nodes whose text matches
+// the specified regular expression
+func textRegexSelector(rx *regexp.Regexp) Selector {
+	return func(n *html.Node) bool {
+		return rx.MatchString(nodeText(n))
+	}
+}
+
+// ownTextRegexSelector returns a selector that matches nodes whose text
+// directly matches the specified regular expression
+func ownTextRegexSelector(rx *regexp.Regexp) Selector {
+	return func(n *html.Node) bool {
+		return rx.MatchString(nodeOwnText(n))
+	}
+}
+
+// hasChildSelector returns a selector that matches elements
+// with a child that matches a.
+func hasChildSelector(a Selector) Selector {
+	return func(n *html.Node) bool {
+		if n.Type != html.ElementNode {
+			return false
+		}
+		return hasChildMatch(n, a)
+	}
+}
+
+// hasDescendantSelector returns a selector that matches elements
+// with any descendant that matches a.
+func hasDescendantSelector(a Selector) Selector {
+	return func(n *html.Node) bool {
+		if n.Type != html.ElementNode {
+			return false
+		}
+		return hasDescendantMatch(n, a)
+	}
+}
+
+// nthChildSelector returns a selector that implements :nth-child(an+b).
+// If last is true, implements :nth-last-child instead.
+// If ofType is true, implements :nth-of-type instead.
+func nthChildSelector(a, b int, last, ofType bool) Selector {
+	return func(n *html.Node) bool {
+		if n.Type != html.ElementNode {
+			return false
+		}
+
+		parent := n.Parent
+		if parent == nil {
+			return false
+		}
+
+		i := -1
+		count := 0
+		for c := parent.FirstChild; c != nil; c = c.NextSibling {
+			if (c.Type != html.ElementNode) || (ofType && c.Data != n.Data) {
+				continue
+			}
+			count++
+			if c == n {
+				i = count
+				if !last {
+					break
+				}
+			}
+		}
+
+		if i == -1 {
+			// This shouldn't happen, since n should always be one of its parent's children.
+			return false
+		}
+
+		if last {
+			i = count - i + 1
+		}
+
+		i -= b
+		if a == 0 {
+			return i == 0
+		}
+
+		return i%a == 0 && i/a >= 0
+	}
+}
+
+// onlyChildSelector returns a selector that implements :only-child.
+// If ofType is true, it implements :only-of-type instead.
+func onlyChildSelector(ofType bool) Selector {
+	return func(n *html.Node) bool {
+		if n.Type != html.ElementNode {
+			return false
+		}
+
+		parent := n.Parent
+		if parent == nil {
+			return false
+		}
+
+		count := 0
+		for c := parent.FirstChild; c != nil; c = c.NextSibling {
+			if (c.Type != html.ElementNode) || (ofType && c.Data != n.Data) {
+				continue
+			}
+			count++
+			if count > 1 {
+				return false
+			}
+		}
+
+		return count == 1
+	}
+}
+
+// inputSelector is a Selector that matches input, select, textarea and button elements.
+func inputSelector(n *html.Node) bool {
+	return n.Type == html.ElementNode && (n.Data == "input" || n.Data == "select" || n.Data == "textarea" || n.Data == "button")
+}
+
+// emptyElementSelector is a Selector that matches empty elements.
+func emptyElementSelector(n *html.Node) bool {
+	if n.Type != html.ElementNode {
+		return false
+	}
+
+	for c := n.FirstChild; c != nil; c = c.NextSibling {
+		switch c.Type {
+		case html.ElementNode, html.TextNode:
+			return false
+		}
+	}
+
+	return true
+}
+
+// descendantSelector returns a Selector that matches an element if
+// it matches d and has an ancestor that matches a.
+func descendantSelector(a, d Selector) Selector {
+	return func(n *html.Node) bool {
+		if !d(n) {
+			return false
+		}
+
+		for p := n.Parent; p != nil; p = p.Parent {
+			if a(p) {
+				return true
+			}
+		}
+
+		return false
+	}
+}
+
+// childSelector returns a Selector that matches an element if
+// it matches d and its parent matches a.
+func childSelector(a, d Selector) Selector {
+	return func(n *html.Node) bool {
+		return d(n) && n.Parent != nil && a(n.Parent)
+	}
+}
+
+// siblingSelector returns a Selector that matches an element
+// if it matches s2 and in is preceded by an element that matches s1.
+// If adjacent is true, the sibling must be immediately before the element.
+func siblingSelector(s1, s2 Selector, adjacent bool) Selector {
+	return func(n *html.Node) bool {
+		if !s2(n) {
+			return false
+		}
+
+		if adjacent {
+			for n = n.PrevSibling; n != nil; n = n.PrevSibling {
+				if n.Type == html.TextNode || n.Type == html.CommentNode {
+					continue
+				}
+				return s1(n)
+			}
+			return false
+		}
+
+		// Walk backwards looking for element that matches s1
+		for c := n.PrevSibling; c != nil; c = c.PrevSibling {
+			if s1(c) {
+				return true
+			}
+		}
+
+		return false
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/andybalholm/cascadia/selector_test.go b/Godeps/_workspace/src/github.com/andybalholm/cascadia/selector_test.go
new file mode 100644
index 00000000..8438d384
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/andybalholm/cascadia/selector_test.go
@@ -0,0 +1,559 @@
+package cascadia
+
+import (
+	"strings"
+	"testing"
+
+	"golang.org/x/net/html"
+)
+
+type selectorTest struct {
+	HTML, selector string
+	results        []string
+}
+
+func nodeString(n *html.Node) string {
+	switch n.Type {
+	case html.TextNode:
+		return n.Data
+	case html.ElementNode:
+		return html.Token{
+			Type: html.StartTagToken,
+			Data: n.Data,
+			Attr: n.Attr,
+		}.String()
+	}
+	return ""
+}
+
+var selectorTests = []selectorTest{
+	{
+		`<body><address>This address...</address></body>`,
+		"address",
+		[]string{
+			"<address>",
+		},
+	},
+	{
+		`<html><head></head><body></body></html>`,
+		"*",
+		[]string{
+			"",
+			"<html>",
+			"<head>",
+			"<body>",
+		},
+	},
+	{
+		`<p id="foo"><p id="bar">`,
+		"#foo",
+		[]string{
+			`<p id="foo">`,
+		},
+	},
+	{
+		`<ul><li id="t1"><p id="t1">`,
+		"li#t1",
+		[]string{
+			`<li id="t1">`,
+		},
+	},
+	{
+		`<ol><li id="t4"><li id="t44">`,
+		"*#t4",
+		[]string{
+			`<li id="t4">`,
+		},
+	},
+	{
+		`<ul><li class="t1"><li class="t2">`,
+		".t1",
+		[]string{
+			`<li class="t1">`,
+		},
+	},
+	{
+		`<p class="t1 t2">`,
+		"p.t1",
+		[]string{
+			`<p class="t1 t2">`,
+		},
+	},
+	{
+		`<div class="test">`,
+		"div.teST",
+		[]string{},
+	},
+	{
+		`<p class="t1 t2">`,
+		".t1.fail",
+		[]string{},
+	},
+	{
+		`<p class="t1 t2">`,
+		"p.t1.t2",
+		[]string{
+			`<p class="t1 t2">`,
+		},
+	},
+	{
+		`<p><p title="title">`,
+		"p[title]",
+		[]string{
+			`<p title="title">`,
+		},
+	},
+	{
+		`<address><address title="foo"><address title="bar">`,
+		`address[title="foo"]`,
+		[]string{
+			`<address title="foo">`,
+		},
+	},
+	{
+		`<p title="tot foo bar">`,
+		`[    	title        ~=       foo    ]`,
+		[]string{
+			`<p title="tot foo bar">`,
+		},
+	},
+	{
+		`<p title="hello world">`,
+		`[title~="hello world"]`,
+		[]string{},
+	},
+	{
+		`<p lang="en"><p lang="en-gb"><p lang="enough"><p lang="fr-en">`,
+		`[lang|="en"]`,
+		[]string{
+			`<p lang="en">`,
+			`<p lang="en-gb">`,
+		},
+	},
+	{
+		`<p title="foobar"><p title="barfoo">`,
+		`[title^="foo"]`,
+		[]string{
+			`<p title="foobar">`,
+		},
+	},
+	{
+		`<p title="foobar"><p title="barfoo">`,
+		`[title$="bar"]`,
+		[]string{
+			`<p title="foobar">`,
+		},
+	},
+	{
+		`<p title="foobarufoo">`,
+		`[title*="bar"]`,
+		[]string{
+			`<p title="foobarufoo">`,
+		},
+	},
+	{
+		`<p class="t1 t2">`,
+		".t1:not(.t2)",
+		[]string{},
+	},
+	{
+		`<div class="t3">`,
+		`div:not(.t1)`,
+		[]string{
+			`<div class="t3">`,
+		},
+	},
+	{
+		`<ol><li id=1><li id=2><li id=3></ol>`,
+		`li:nth-child(odd)`,
+		[]string{
+			`<li id="1">`,
+			`<li id="3">`,
+		},
+	},
+	{
+		`<ol><li id=1><li id=2><li id=3></ol>`,
+		`li:nth-child(even)`,
+		[]string{
+			`<li id="2">`,
+		},
+	},
+	{
+		`<ol><li id=1><li id=2><li id=3></ol>`,
+		`li:nth-child(-n+2)`,
+		[]string{
+			`<li id="1">`,
+			`<li id="2">`,
+		},
+	},
+	{
+		`<ol><li id=1><li id=2><li id=3></ol>`,
+		`li:nth-child(3n+1)`,
+		[]string{
+			`<li id="1">`,
+		},
+	},
+	{
+		`<ol><li id=1><li id=2><li id=3><li id=4></ol>`,
+		`li:nth-last-child(odd)`,
+		[]string{
+			`<li id="2">`,
+			`<li id="4">`,
+		},
+	},
+	{
+		`<ol><li id=1><li id=2><li id=3><li id=4></ol>`,
+		`li:nth-last-child(even)`,
+		[]string{
+			`<li id="1">`,
+			`<li id="3">`,
+		},
+	},
+	{
+		`<ol><li id=1><li id=2><li id=3><li id=4></ol>`,
+		`li:nth-last-child(-n+2)`,
+		[]string{
+			`<li id="3">`,
+			`<li id="4">`,
+		},
+	},
+	{
+		`<ol><li id=1><li id=2><li id=3><li id=4></ol>`,
+		`li:nth-last-child(3n+1)`,
+		[]string{
+			`<li id="1">`,
+			`<li id="4">`,
+		},
+	},
+	{
+		`<p>some text <span id="1">and a span</span><span id="2"> and another</span></p>`,
+		`span:first-child`,
+		[]string{
+			`<span id="1">`,
+		},
+	},
+	{
+		`<span>a span</span> and some text`,
+		`span:last-child`,
+		[]string{
+			`<span>`,
+		},
+	},
+	{
+		`<address></address><p id=1><p id=2>`,
+		`p:nth-of-type(2)`,
+		[]string{
+			`<p id="2">`,
+		},
+	},
+	{
+		`<address></address><p id=1><p id=2></p><a>`,
+		`p:nth-last-of-type(2)`,
+		[]string{
+			`<p id="1">`,
+		},
+	},
+	{
+		`<address></address><p id=1><p id=2></p><a>`,
+		`p:last-of-type`,
+		[]string{
+			`<p id="2">`,
+		},
+	},
+	{
+		`<address></address><p id=1><p id=2></p><a>`,
+		`p:first-of-type`,
+		[]string{
+			`<p id="1">`,
+		},
+	},
+	{
+		`<div><p id="1"></p><a></a></div><div><p id="2"></p></div>`,
+		`p:only-child`,
+		[]string{
+			`<p id="2">`,
+		},
+	},
+	{
+		`<div><p id="1"></p><a></a></div><div><p id="2"></p><p id="3"></p></div>`,
+		`p:only-of-type`,
+		[]string{
+			`<p id="1">`,
+		},
+	},
+	{
+		`<p id="1"><!-- --><p id="2">Hello<p id="3"><span>`,
+		`:empty`,
+		[]string{
+			`<head>`,
+			`<p id="1">`,
+			`<span>`,
+		},
+	},
+	{
+		`<div><p id="1"><table><tr><td><p id="2"></table></div><p id="3">`,
+		`div p`,
+		[]string{
+			`<p id="1">`,
+			`<p id="2">`,
+		},
+	},
+	{
+		`<div><p id="1"><table><tr><td><p id="2"></table></div><p id="3">`,
+		`div table p`,
+		[]string{
+			`<p id="2">`,
+		},
+	},
+	{
+		`<div><p id="1"><div><p id="2"></div><table><tr><td><p id="3"></table></div>`,
+		`div > p`,
+		[]string{
+			`<p id="1">`,
+			`<p id="2">`,
+		},
+	},
+	{
+		`<p id="1"><p id="2"></p><address></address><p id="3">`,
+		`p ~ p`,
+		[]string{
+			`<p id="2">`,
+			`<p id="3">`,
+		},
+	},
+	{
+		`<p id="1"></p>
+		 <!--comment-->
+		 <p id="2"></p><address></address><p id="3">`,
+		`p + p`,
+		[]string{
+			`<p id="2">`,
+		},
+	},
+	{
+		`<ul><li></li><li></li></ul><p>`,
+		`li, p`,
+		[]string{
+			"<li>",
+			"<li>",
+			"<p>",
+		},
+	},
+	{
+		`<p id="1"><p id="2"></p><address></address><p id="3">`,
+		`p +/*This is a comment*/ p`,
+		[]string{
+			`<p id="2">`,
+		},
+	},
+	{
+		`<p>Text block that <span>wraps inner text</span> and continues</p>`,
+		`p:contains("that wraps")`,
+		[]string{
+			`<p>`,
+		},
+	},
+	{
+		`<p>Text block that <span>wraps inner text</span> and continues</p>`,
+		`p:containsOwn("that wraps")`,
+		[]string{},
+	},
+	{
+		`<p>Text block that <span>wraps inner text</span> and continues</p>`,
+		`:containsOwn("inner")`,
+		[]string{
+			`<span>`,
+		},
+	},
+	{
+		`<p>Text block that <span>wraps inner text</span> and continues</p>`,
+		`p:containsOwn("block")`,
+		[]string{
+			`<p>`,
+		},
+	},
+	{
+		`<div id="d1"><p id="p1"><span>text content</span></p></div><div id="d2"/>`,
+		`div:has(#p1)`,
+		[]string{
+			`<div id="d1">`,
+		},
+	},
+	{
+		`<div id="d1"><p id="p1"><span>contents 1</span></p></div>
+		<div id="d2"><p>contents <em>2</em></p></div>`,
+		`div:has(:containsOwn("2"))`,
+		[]string{
+			`<div id="d2">`,
+		},
+	},
+	{
+		`<body><div id="d1"><p id="p1"><span>contents 1</span></p></div>
+		<div id="d2"><p id="p2">contents <em>2</em></p></div></body>`,
+		`body :has(:containsOwn("2"))`,
+		[]string{
+			`<div id="d2">`,
+			`<p id="p2">`,
+		},
+	},
+	{
+		`<body><div id="d1"><p id="p1"><span>contents 1</span></p></div>
+		<div id="d2"><p id="p2">contents <em>2</em></p></div></body>`,
+		`body :haschild(:containsOwn("2"))`,
+		[]string{
+			`<p id="p2">`,
+		},
+	},
+	{
+		`<p id="p1">0123456789</p><p id="p2">abcdef</p><p id="p3">0123ABCD</p>`,
+		`p:matches([\d])`,
+		[]string{
+			`<p id="p1">`,
+			`<p id="p3">`,
+		},
+	},
+	{
+		`<p id="p1">0123456789</p><p id="p2">abcdef</p><p id="p3">0123ABCD</p>`,
+		`p:matches([a-z])`,
+		[]string{
+			`<p id="p2">`,
+		},
+	},
+	{
+		`<p id="p1">0123456789</p><p id="p2">abcdef</p><p id="p3">0123ABCD</p>`,
+		`p:matches([a-zA-Z])`,
+		[]string{
+			`<p id="p2">`,
+			`<p id="p3">`,
+		},
+	},
+	{
+		`<p id="p1">0123456789</p><p id="p2">abcdef</p><p id="p3">0123ABCD</p>`,
+		`p:matches([^\d])`,
+		[]string{
+			`<p id="p2">`,
+			`<p id="p3">`,
+		},
+	},
+	{
+		`<p id="p1">0123456789</p><p id="p2">abcdef</p><p id="p3">0123ABCD</p>`,
+		`p:matches(^(0|a))`,
+		[]string{
+			`<p id="p1">`,
+			`<p id="p2">`,
+			`<p id="p3">`,
+		},
+	},
+	{
+		`<p id="p1">0123456789</p><p id="p2">abcdef</p><p id="p3">0123ABCD</p>`,
+		`p:matches(^\d+$)`,
+		[]string{
+			`<p id="p1">`,
+		},
+	},
+	{
+		`<p id="p1">0123456789</p><p id="p2">abcdef</p><p id="p3">0123ABCD</p>`,
+		`p:not(:matches(^\d+$))`,
+		[]string{
+			`<p id="p2">`,
+			`<p id="p3">`,
+		},
+	},
+	{
+		`<div><p id="p1">01234<em>567</em>89</p><div>`,
+		`div :matchesOwn(^\d+$)`,
+		[]string{
+			`<p id="p1">`,
+			`<em>`,
+		},
+	},
+	{
+		`<ul>
+			<li><a id="a1" href="http://www.google.com/finance"/>
+			<li><a id="a2" href="http://finance.yahoo.com/"/>
+			<li><a id="a2" href="http://finance.untrusted.com/"/>
+			<li><a id="a3" href="https://www.google.com/news"/>
+			<li><a id="a4" href="http://news.yahoo.com"/>
+		</ul>`,
+		`[href#=(fina)]:not([href#=(\/\/[^\/]+untrusted)])`,
+		[]string{
+			`<a id="a1" href="http://www.google.com/finance">`,
+			`<a id="a2" href="http://finance.yahoo.com/">`,
+		},
+	},
+	{
+		`<ul>
+			<li><a id="a1" href="http://www.google.com/finance"/>
+			<li><a id="a2" href="http://finance.yahoo.com/"/>
+			<li><a id="a3" href="https://www.google.com/news"/>
+			<li><a id="a4" href="http://news.yahoo.com"/>
+		</ul>`,
+		`[href#=(^https:\/\/[^\/]*\/?news)]`,
+		[]string{
+			`<a id="a3" href="https://www.google.com/news">`,
+		},
+	},
+	{
+		`<form>
+			<label>Username <input type="text" name="username" /></label>
+			<label>Password <input type="password" name="password" /></label>
+			<label>Country
+				<select name="country">
+					<option value="ca">Canada</option>
+					<option value="us">United States</option>
+				</select>
+			</label>
+			<label>Bio <textarea name="bio"></textarea></label>
+			<button>Sign up</button>
+		</form>`,
+		`:input`,
+		[]string{
+			`<input type="text" name="username">`,
+			`<input type="password" name="password">`,
+			`<select name="country">`,
+			`<textarea name="bio">`,
+			`<button>`,
+		},
+	},
+}
+
+func TestSelectors(t *testing.T) {
+	for _, test := range selectorTests {
+		s, err := Compile(test.selector)
+		if err != nil {
+			t.Errorf("error compiling %q: %s", test.selector, err)
+			continue
+		}
+
+		doc, err := html.Parse(strings.NewReader(test.HTML))
+		if err != nil {
+			t.Errorf("error parsing %q: %s", test.HTML, err)
+			continue
+		}
+
+		matches := s.MatchAll(doc)
+		if len(matches) != len(test.results) {
+			t.Errorf("wanted %d elements, got %d instead", len(test.results), len(matches))
+			continue
+		}
+
+		for i, m := range matches {
+			got := nodeString(m)
+			if got != test.results[i] {
+				t.Errorf("wanted %s, got %s instead", test.results[i], got)
+			}
+		}
+
+		firstMatch := s.MatchFirst(doc)
+		if len(test.results) == 0 {
+			if firstMatch != nil {
+				t.Errorf("MatchFirst: want nil, got %s", nodeString(firstMatch))
+			}
+		} else {
+			got := nodeString(firstMatch)
+			if got != test.results[0] {
+				t.Errorf("MatchFirst: want %s, got %s", test.results[0], got)
+			}
+		}
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/coopernurse/gorp/.gitignore b/Godeps/_workspace/src/github.com/coopernurse/gorp/.gitignore
new file mode 100644
index 00000000..8a06adea
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coopernurse/gorp/.gitignore
@@ -0,0 +1,8 @@
+_test
+_testmain.go
+_obj
+*~
+*.6
+6.out
+gorptest.bin
+tmp
diff --git a/Godeps/_workspace/src/github.com/coopernurse/gorp/.travis.yml b/Godeps/_workspace/src/github.com/coopernurse/gorp/.travis.yml
new file mode 100644
index 00000000..3fa139d6
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coopernurse/gorp/.travis.yml
@@ -0,0 +1,21 @@
+language: go
+go:
+  - 1.1
+  - tip
+
+services:
+ - mysql
+ - postgres
+ - sqlite3
+
+before_script:
+ - mysql -e "CREATE DATABASE gorptest;"
+ - mysql -u root -e "GRANT ALL ON gorptest.* TO gorptest@localhost IDENTIFIED BY 'gorptest'"
+ - psql -c "CREATE DATABASE gorptest;" -U postgres
+ - psql -c "CREATE USER "gorptest" WITH SUPERUSER PASSWORD 'gorptest';" -U postgres
+ - go get github.com/lib/pq
+ - go get github.com/mattn/go-sqlite3
+ - go get github.com/ziutek/mymysql/godrv
+ - go get github.com/go-sql-driver/mysql
+
+script: ./test_all.sh
diff --git a/Godeps/_workspace/src/github.com/coopernurse/gorp/LICENSE b/Godeps/_workspace/src/github.com/coopernurse/gorp/LICENSE
new file mode 100644
index 00000000..b661111d
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coopernurse/gorp/LICENSE
@@ -0,0 +1,22 @@
+(The MIT License)
+
+Copyright (c) 2012 James Cooper <james@bitmechanic.com>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/Godeps/_workspace/src/github.com/coopernurse/gorp/Makefile b/Godeps/_workspace/src/github.com/coopernurse/gorp/Makefile
new file mode 100644
index 00000000..edf771c1
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coopernurse/gorp/Makefile
@@ -0,0 +1,6 @@
+include $(GOROOT)/src/Make.inc
+
+TARG    = github.com/coopernurse/gorp
+GOFILES = gorp.go dialect.go
+
+include $(GOROOT)/src/Make.pkg
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/coopernurse/gorp/README.md b/Godeps/_workspace/src/github.com/coopernurse/gorp/README.md
new file mode 100644
index 00000000..cbef88be
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coopernurse/gorp/README.md
@@ -0,0 +1,655 @@
+# Go Relational Persistence #
+
+[![build status](https://secure.travis-ci.org/coopernurse/gorp.png)](http://travis-ci.org/coopernurse/gorp)
+
+I hesitate to call gorp an ORM.  Go doesn't really have objects, at least 
+not in the classic Smalltalk/Java sense.  There goes the "O".  gorp doesn't 
+know anything about the relationships between your structs (at least not 
+yet).  So the "R" is questionable too (but I use it in the name because, 
+well, it seemed more clever).
+
+The "M" is alive and well.  Given some Go structs and a database, gorp
+should remove a fair amount of boilerplate busy-work from your code.
+
+I hope that gorp saves you time, minimizes the drudgery of getting data 
+in and out of your database, and helps your code focus on algorithms, 
+not infrastructure.
+
+* Bind struct fields to table columns via API or tag
+* Support for embedded structs
+* Support for transactions
+* Forward engineer db schema from structs (great for unit tests)
+* Pre/post insert/update/delete hooks
+* Automatically generate insert/update/delete statements for a struct
+* Automatic binding of auto increment PKs back to struct after insert
+* Delete by primary key(s)
+* Select by primary key(s)
+* Optional trace sql logging
+* Bind arbitrary SQL queries to a struct
+* Bind slice to SELECT query results without type assertions
+* Use positional or named bind parameters in custom SELECT queries
+* Optional optimistic locking using a version column (for update/deletes)
+
+## Installation ##
+
+    # install the library:
+    go get github.com/coopernurse/gorp
+    
+    // use in your .go code:
+    import (
+        "github.com/coopernurse/gorp"
+    )
+
+## API Documentation ##
+
+Full godoc output from the latest code in master is available here:
+
+http://godoc.org/github.com/coopernurse/gorp
+
+## Quickstart
+
+```go
+package main
+
+import (
+    "database/sql"
+    "github.com/coopernurse/gorp"
+    _ "github.com/mattn/go-sqlite3"
+    "log"
+    "time"
+)
+
+func main() {
+    // initialize the DbMap
+    dbmap := initDb()
+    defer dbmap.Db.Close()
+
+    // delete any existing rows
+    err := dbmap.TruncateTables()
+    checkErr(err, "TruncateTables failed")
+
+    // create two posts
+    p1 := newPost("Go 1.1 released!", "Lorem ipsum lorem ipsum")
+    p2 := newPost("Go 1.2 released!", "Lorem ipsum lorem ipsum")
+
+    // insert rows - auto increment PKs will be set properly after the insert
+    err = dbmap.Insert(&p1, &p2)
+    checkErr(err, "Insert failed")
+
+    // use convenience SelectInt
+    count, err := dbmap.SelectInt("select count(*) from posts")
+    checkErr(err, "select count(*) failed")
+    log.Println("Rows after inserting:", count)
+
+    // update a row
+    p2.Title = "Go 1.2 is better than ever"
+    count, err = dbmap.Update(&p2)
+    checkErr(err, "Update failed")
+    log.Println("Rows updated:", count)
+
+    // fetch one row - note use of "post_id" instead of "Id" since column is aliased
+    //
+    // Postgres users should use $1 instead of ? placeholders
+    // See 'Known Issues' below
+    //
+    err = dbmap.SelectOne(&p2, "select * from posts where post_id=?", p2.Id)
+    checkErr(err, "SelectOne failed")
+    log.Println("p2 row:", p2)
+
+    // fetch all rows
+    var posts []Post
+    _, err = dbmap.Select(&posts, "select * from posts order by post_id")
+    checkErr(err, "Select failed")
+    log.Println("All rows:")
+    for x, p := range posts {
+        log.Printf("    %d: %v\n", x, p)
+    }
+
+    // delete row by PK
+    count, err = dbmap.Delete(&p1)
+    checkErr(err, "Delete failed")
+    log.Println("Rows deleted:", count)
+
+    // delete row manually via Exec
+    _, err = dbmap.Exec("delete from posts where post_id=?", p2.Id)
+    checkErr(err, "Exec failed")
+
+    // confirm count is zero
+    count, err = dbmap.SelectInt("select count(*) from posts")
+    checkErr(err, "select count(*) failed")
+    log.Println("Row count - should be zero:", count)
+
+    log.Println("Done!")
+}
+
+type Post struct {
+    // db tag lets you specify the column name if it differs from the struct field
+    Id      int64 `db:"post_id"`
+    Created int64
+    Title   string
+    Body    string
+}
+
+func newPost(title, body string) Post {
+    return Post{
+        Created: time.Now().UnixNano(),
+        Title:   title,
+        Body:    body,
+    }
+}
+
+func initDb() *gorp.DbMap {
+    // connect to db using standard Go database/sql API
+    // use whatever database/sql driver you wish
+    db, err := sql.Open("sqlite3", "/tmp/post_db.bin")
+    checkErr(err, "sql.Open failed")
+
+    // construct a gorp DbMap
+    dbmap := &gorp.DbMap{Db: db, Dialect: gorp.SqliteDialect{}}
+
+    // add a table, setting the table name to 'posts' and
+    // specifying that the Id property is an auto incrementing PK
+    dbmap.AddTableWithName(Post{}, "posts").SetKeys(true, "Id")
+
+    // create the table. in a production system you'd generally
+    // use a migration tool, or create the tables via scripts
+    err = dbmap.CreateTablesIfNotExists()
+    checkErr(err, "Create tables failed")
+
+    return dbmap
+}
+
+func checkErr(err error, msg string) {
+    if err != nil {
+        log.Fatalln(msg, err)
+    }
+}
+```
+
+## Examples ##
+
+### Mapping structs to tables ###
+
+First define some types:
+
+```go
+type Invoice struct {
+    Id       int64
+    Created  int64
+    Updated  int64
+    Memo     string
+    PersonId int64
+}
+
+type Person struct {
+    Id      int64    
+    Created int64
+    Updated int64
+    FName   string
+    LName   string
+}
+
+// Example of using tags to alias fields to column names
+// The 'db' value is the column name
+//
+// A hyphen will cause gorp to skip this field, similar to the
+// Go json package.
+//
+// This is equivalent to using the ColMap methods:
+//
+//   table := dbmap.AddTableWithName(Product{}, "product")
+//   table.ColMap("Id").Rename("product_id")
+//   table.ColMap("Price").Rename("unit_price")
+//   table.ColMap("IgnoreMe").SetTransient(true)
+//
+type Product struct {
+    Id         int64     `db:"product_id"`
+    Price      int64     `db:"unit_price"`
+    IgnoreMe   string    `db:"-"`
+}
+```
+
+Then create a mapper, typically you'd do this one time at app startup:
+
+```go
+// connect to db using standard Go database/sql API
+// use whatever database/sql driver you wish
+db, err := sql.Open("mymysql", "tcp:localhost:3306*mydb/myuser/mypassword")
+
+// construct a gorp DbMap
+dbmap := &gorp.DbMap{Db: db, Dialect: gorp.MySQLDialect{"InnoDB", "UTF8"}}
+
+// register the structs you wish to use with gorp
+// you can also use the shorter dbmap.AddTable() if you 
+// don't want to override the table name
+//
+// SetKeys(true) means we have a auto increment primary key, which
+// will get automatically bound to your struct post-insert
+//
+t1 := dbmap.AddTableWithName(Invoice{}, "invoice_test").SetKeys(true, "Id")
+t2 := dbmap.AddTableWithName(Person{}, "person_test").SetKeys(true, "Id")
+t3 := dbmap.AddTableWithName(Product{}, "product_test").SetKeys(true, "Id")
+```
+
+### Struct Embedding ###
+
+gorp supports embedding structs.  For example:
+
+```go
+type Names struct {
+    FirstName string
+    LastName  string
+}
+
+type WithEmbeddedStruct struct {
+    Id int64
+    Names
+}
+
+es := &WithEmbeddedStruct{-1, Names{FirstName: "Alice", LastName: "Smith"}}
+err := dbmap.Insert(es)
+```
+
+See the `TestWithEmbeddedStruct` function in `gorp_test.go` for a full example.
+
+### Create/Drop Tables ###
+
+Automatically create / drop registered tables.  This is useful for unit tests
+but is entirely optional.  You can of course use gorp with tables created manually,
+or with a separate migration tool (like goose: https://bitbucket.org/liamstask/goose).
+
+```go
+// create all registered tables
+dbmap.CreateTables()
+
+// same as above, but uses "if not exists" clause to skip tables that are
+// already defined
+dbmap.CreateTablesIfNotExists()
+
+// drop
+dbmap.DropTables()
+```
+
+### SQL Logging ###
+
+Optionally you can pass in a logger to trace all SQL statements.
+I recommend enabling this initially while you're getting the feel for what
+gorp is doing on your behalf.
+
+Gorp defines a `GorpLogger` interface that Go's built in `log.Logger` satisfies.
+However, you can write your own `GorpLogger` implementation, or use a package such 
+as `glog` if you want more control over how statements are logged.
+
+```go
+// Will log all SQL statements + args as they are run
+// The first arg is a string prefix to prepend to all log messages
+dbmap.TraceOn("[gorp]", log.New(os.Stdout, "myapp:", log.Lmicroseconds)) 
+
+// Turn off tracing
+dbmap.TraceOff()
+```
+
+### Insert ###
+
+```go
+// Must declare as pointers so optional callback hooks
+// can operate on your data, not copies
+inv1 := &Invoice{0, 100, 200, "first order", 0}
+inv2 := &Invoice{0, 100, 200, "second order", 0}
+
+// Insert your rows
+err := dbmap.Insert(inv1, inv2)
+
+// Because we called SetKeys(true) on Invoice, the Id field
+// will be populated after the Insert() automatically
+fmt.Printf("inv1.Id=%d  inv2.Id=%d\n", inv1.Id, inv2.Id)
+```
+
+### Update ###
+
+Continuing the above example, use the `Update` method to modify an Invoice:
+
+```go
+// count is the # of rows updated, which should be 1 in this example
+count, err := dbmap.Update(inv1)
+```
+
+### Delete ###
+
+If you have primary key(s) defined for a struct, you can use the `Delete`
+method to remove rows:
+
+```go
+count, err := dbmap.Delete(inv1)
+```
+
+### Select by Key ###
+
+Use the `Get` method to fetch a single row by primary key.  It returns
+nil if no row is found.
+
+```go
+// fetch Invoice with Id=99
+obj, err := dbmap.Get(Invoice{}, 99)
+inv := obj.(*Invoice)
+```
+
+### Ad Hoc SQL ###
+
+#### SELECT ####
+
+`Select()` and `SelectOne()` provide a simple way to bind arbitrary queries to a slice
+or a single struct.
+
+```go
+// Select a slice - first return value is not needed when a slice pointer is passed to Select()
+var posts []Post
+_, err := dbmap.Select(&posts, "select * from post order by id")
+
+// You can also use primitive types
+var ids []string
+_, err := dbmap.Select(&ids, "select id from post")
+
+// Select a single row.
+// Returns an error if no row found, or if more than one row is found
+var post Post
+err := dbmap.SelectOne(&post, "select * from post where id=?", id)
+```
+
+Want to do joins?  Just write the SQL and the struct. gorp will bind them:
+
+```go
+// Define a type for your join
+// It *must* contain all the columns in your SELECT statement
+//
+// The names here should match the aliased column names you specify
+// in your SQL - no additional binding work required.  simple.
+//
+type InvoicePersonView struct {
+    InvoiceId   int64
+    PersonId    int64
+    Memo        string
+    FName       string
+}
+
+// Create some rows
+p1 := &Person{0, 0, 0, "bob", "smith"}
+dbmap.Insert(p1)
+
+// notice how we can wire up p1.Id to the invoice easily
+inv1 := &Invoice{0, 0, 0, "xmas order", p1.Id}
+dbmap.Insert(inv1)
+
+// Run your query
+query := "select i.Id InvoiceId, p.Id PersonId, i.Memo, p.FName " +
+	"from invoice_test i, person_test p " +
+	"where i.PersonId = p.Id"
+
+// pass a slice to Select()
+var list []InvoicePersonView
+_, err := dbmap.Select(&list, query)
+
+// this should test true
+expected := InvoicePersonView{inv1.Id, p1.Id, inv1.Memo, p1.FName}
+if reflect.DeepEqual(list[0], expected) {
+    fmt.Println("Woot! My join worked!")
+}
+```
+
+#### SELECT string or int64 ####
+
+gorp provides a few convenience methods for selecting a single string or int64.
+
+```go
+// select single int64 from db (use $1 instead of ? for postgresql)
+i64, err := dbmap.SelectInt("select count(*) from foo where blah=?", blahVal)
+
+// select single string from db:
+s, err := dbmap.SelectStr("select name from foo where blah=?", blahVal)
+
+```
+
+#### Named bind parameters ####
+
+You may use a map or struct to bind parameters by name.  This is currently
+only supported in SELECT queries.
+
+```go
+_, err := dbm.Select(&dest, "select * from Foo where name = :name and age = :age", map[string]interface{}{
+  "name": "Rob", 
+  "age": 31,
+})
+```
+
+#### UPDATE / DELETE ####
+
+You can execute raw SQL if you wish.  Particularly good for batch operations.
+
+```go
+res, err := dbmap.Exec("delete from invoice_test where PersonId=?", 10)
+```
+
+### Transactions ###
+
+You can batch operations into a transaction:
+
+```go
+func InsertInv(dbmap *DbMap, inv *Invoice, per *Person) error {
+    // Start a new transaction
+    trans, err := dbmap.Begin()
+    if err != nil {
+        return err
+    }
+
+    trans.Insert(per)
+    inv.PersonId = per.Id
+    trans.Insert(inv)
+
+    // if the commit is successful, a nil error is returned
+    return trans.Commit()
+}
+```
+
+### Hooks ###
+
+Use hooks to update data before/after saving to the db. Good for timestamps:
+
+```go
+// implement the PreInsert and PreUpdate hooks
+func (i *Invoice) PreInsert(s gorp.SqlExecutor) error {
+    i.Created = time.Now().UnixNano()
+    i.Updated = i.Created
+    return nil
+}
+
+func (i *Invoice) PreUpdate(s gorp.SqlExecutor) error {
+    i.Updated = time.Now().UnixNano()
+    return nil
+}
+
+// You can use the SqlExecutor to cascade additional SQL
+// Take care to avoid cycles. gorp won't prevent them.
+//
+// Here's an example of a cascading delete
+//
+func (p *Person) PreDelete(s gorp.SqlExecutor) error {
+    query := "delete from invoice_test where PersonId=?"
+    err := s.Exec(query, p.Id); if err != nil {
+        return err
+    }
+    return nil
+}
+```
+
+Full list of hooks that you can implement:
+
+    PostGet
+    PreInsert
+    PostInsert
+    PreUpdate
+    PostUpdate
+    PreDelete
+    PostDelete
+    
+    All have the same signature.  for example:
+    
+    func (p *MyStruct) PostUpdate(s gorp.SqlExecutor) error
+    
+### Optimistic Locking ###
+
+gorp provides a simple optimistic locking feature, similar to Java's JPA, that
+will raise an error if you try to update/delete a row whose `version` column
+has a value different than the one in memory.  This provides a safe way to do
+"select then update" style operations without explicit read and write locks.
+
+```go
+// Version is an auto-incremented number, managed by gorp
+// If this property is present on your struct, update
+// operations will be constrained
+//
+// For example, say we defined Person as:
+
+type Person struct {
+    Id       int64
+    Created  int64
+    Updated  int64
+    FName    string
+    LName    string
+    
+    // automatically used as the Version col
+    // use table.SetVersionCol("columnName") to map a different
+    // struct field as the version field
+    Version  int64
+}
+
+p1 := &Person{0, 0, 0, "Bob", "Smith", 0}
+dbmap.Insert(p1)  // Version is now 1
+
+obj, err := dbmap.Get(Person{}, p1.Id)
+p2 := obj.(*Person)
+p2.LName = "Edwards"
+dbmap.Update(p2)  // Version is now 2
+
+p1.LName = "Howard"
+
+// Raises error because p1.Version == 1, which is out of date
+count, err := dbmap.Update(p1)
+_, ok := err.(gorp.OptimisticLockError)
+if ok {
+    // should reach this statement
+    
+    // in a real app you might reload the row and retry, or
+    // you might propegate this to the user, depending on the desired
+    // semantics
+    fmt.Printf("Tried to update row with stale data: %v\n", err)
+} else {
+    // some other db error occurred - log or return up the stack
+    fmt.Printf("Unknown db err: %v\n", err)
+}
+```
+
+## Database Drivers ##
+
+gorp uses the Go 1 `database/sql` package.  A full list of compliant drivers is available here:
+
+http://code.google.com/p/go-wiki/wiki/SQLDrivers
+
+Sadly, SQL databases differ on various issues. gorp provides a Dialect interface that should be
+implemented per database vendor.  Dialects are provided for:
+
+* MySQL
+* PostgreSQL
+* sqlite3
+
+Each of these three databases pass the test suite.  See `gorp_test.go` for example 
+DSNs for these three databases.
+
+Support is also provided for:
+
+* Oracle (contributed by @klaidliadon)
+* SQL Server (contributed by @qrawl) - use driver: github.com/denisenkom/go-mssqldb 
+
+Note that these databases are not covered by CI and I (@coopernurse) have no good way to
+test them locally.  So please try them and send patches as needed, but expect a bit more
+unpredicability.
+
+## Known Issues ##
+
+### SQL placeholder portability ###
+
+Different databases use different strings to indicate variable placeholders in 
+prepared SQL statements.  Unlike some database abstraction layers (such as JDBC),
+Go's `database/sql` does not standardize this.
+
+SQL generated by gorp in the `Insert`, `Update`, `Delete`, and `Get` methods delegates
+to a Dialect implementation for each database, and will generate portable SQL.
+
+Raw SQL strings passed to `Exec`, `Select`, `SelectOne`, `SelectInt`, etc will not be
+parsed.  Consequently you may have portability issues if you write a query like this:
+
+```go
+// works on MySQL and Sqlite3, but not with Postgresql
+err := dbmap.SelectOne(&val, "select * from foo where id = ?", 30)
+```
+
+In `Select` and `SelectOne` you can use named parameters to work around this.
+The following is portable:
+
+```go
+err := dbmap.SelectOne(&val, "select * from foo where id = :id", 
+   map[string]interface{} { "id": 30})
+```
+
+### time.Time and time zones ###
+
+gorp will pass `time.Time` fields through to the `database/sql` driver, but note that 
+the behavior of this type varies across database drivers.
+
+MySQL users should be especially cautious.  See: https://github.com/ziutek/mymysql/pull/77
+
+To avoid any potential issues with timezone/DST, consider using an integer field for time
+data and storing UNIX time.
+
+## Running the tests ##
+
+The included tests may be run against MySQL, Postgresql, or sqlite3.
+You must set two environment variables so the test code knows which driver to
+use, and how to connect to your database.
+
+```sh
+# MySQL example:
+export GORP_TEST_DSN=gomysql_test/gomysql_test/abc123
+export GORP_TEST_DIALECT=mysql
+
+# run the tests
+go test
+
+# run the tests and benchmarks
+go test -bench="Bench" -benchtime 10
+```
+
+Valid `GORP_TEST_DIALECT` values are: "mysql", "postgres", "sqlite3"
+See the `test_all.sh` script for examples of all 3 databases.  This is the script I run
+locally to test the library.
+
+## Performance ##
+
+gorp uses reflection to construct SQL queries and bind parameters.  See the BenchmarkNativeCrud vs BenchmarkGorpCrud in gorp_test.go for a simple perf test.  On my MacBook Pro gorp is about 2-3% slower than hand written SQL. 
+
+## Pull requests / Contributions
+
+Contributions are very welcome.  Please follow these guidelines:
+
+* Fork the `develop` branch and issue pull requests targeting the `develop` branch
+  * If you don't do this, I'll likely cherry pick your commit into develop
+* If you are adding an enhancement, please open an issue first with your proposed change. 
+* Changes that break backwards compatibility in the public API are only accepted after we
+  discuss on a GitHub issue for a while. 
+
+Thanks!
+
+## Contributors
+
+* matthias-margush - column aliasing via tags
+* Rob Figueiredo - @robfig
+* Quinn Slack - @sqs
diff --git a/Godeps/_workspace/src/github.com/coopernurse/gorp/dialect.go b/Godeps/_workspace/src/github.com/coopernurse/gorp/dialect.go
new file mode 100644
index 00000000..5e8fdc66
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coopernurse/gorp/dialect.go
@@ -0,0 +1,692 @@
+package gorp
+
+import (
+	"errors"
+	"fmt"
+	"reflect"
+	"strings"
+)
+
+// The Dialect interface encapsulates behaviors that differ across
+// SQL databases.  At present the Dialect is only used by CreateTables()
+// but this could change in the future
+type Dialect interface {
+
+	// adds a suffix to any query, usually ";"
+	QuerySuffix() string
+
+	// ToSqlType returns the SQL column type to use when creating a
+	// table of the given Go Type.  maxsize can be used to switch based on
+	// size.  For example, in MySQL []byte could map to BLOB, MEDIUMBLOB,
+	// or LONGBLOB depending on the maxsize
+	ToSqlType(val reflect.Type, maxsize int, isAutoIncr bool) string
+
+	// string to append to primary key column definitions
+	AutoIncrStr() string
+
+	// string to bind autoincrement columns to. Empty string will
+	// remove reference to those columns in the INSERT statement.
+	AutoIncrBindValue() string
+
+	AutoIncrInsertSuffix(col *ColumnMap) string
+
+	// string to append to "create table" statement for vendor specific
+	// table attributes
+	CreateTableSuffix() string
+
+	// string to truncate tables
+	TruncateClause() string
+
+	// bind variable string to use when forming SQL statements
+	// in many dbs it is "?", but Postgres appears to use $1
+	//
+	// i is a zero based index of the bind variable in this statement
+	//
+	BindVar(i int) string
+
+	// Handles quoting of a field name to ensure that it doesn't raise any
+	// SQL parsing exceptions by using a reserved word as a field name.
+	QuoteField(field string) string
+
+	// Handles building up of a schema.database string that is compatible with
+	// the given dialect
+	//
+	// schema - The schema that <table> lives in
+	// table - The table name
+	QuotedTableForQuery(schema string, table string) string
+
+	// Existance clause for table creation / deletion
+	IfSchemaNotExists(command, schema string) string
+	IfTableExists(command, schema, table string) string
+	IfTableNotExists(command, schema, table string) string
+}
+
+// IntegerAutoIncrInserter is implemented by dialects that can perform
+// inserts with automatically incremented integer primary keys.  If
+// the dialect can handle automatic assignment of more than just
+// integers, see TargetedAutoIncrInserter.
+type IntegerAutoIncrInserter interface {
+	InsertAutoIncr(exec SqlExecutor, insertSql string, params ...interface{}) (int64, error)
+}
+
+// TargetedAutoIncrInserter is implemented by dialects that can
+// perform automatic assignment of any primary key type (i.e. strings
+// for uuids, integers for serials, etc).
+type TargetedAutoIncrInserter interface {
+	// InsertAutoIncrToTarget runs an insert operation and assigns the
+	// automatically generated primary key directly to the passed in
+	// target.  The target should be a pointer to the primary key
+	// field of the value being inserted.
+	InsertAutoIncrToTarget(exec SqlExecutor, insertSql string, target interface{}, params ...interface{}) error
+}
+
+func standardInsertAutoIncr(exec SqlExecutor, insertSql string, params ...interface{}) (int64, error) {
+	res, err := exec.Exec(insertSql, params...)
+	if err != nil {
+		return 0, err
+	}
+	return res.LastInsertId()
+}
+
+///////////////////////////////////////////////////////
+// sqlite3 //
+/////////////
+
+type SqliteDialect struct {
+	suffix string
+}
+
+func (d SqliteDialect) QuerySuffix() string { return ";" }
+
+func (d SqliteDialect) ToSqlType(val reflect.Type, maxsize int, isAutoIncr bool) string {
+	switch val.Kind() {
+	case reflect.Ptr:
+		return d.ToSqlType(val.Elem(), maxsize, isAutoIncr)
+	case reflect.Bool:
+		return "integer"
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64, reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+		return "integer"
+	case reflect.Float64, reflect.Float32:
+		return "real"
+	case reflect.Slice:
+		if val.Elem().Kind() == reflect.Uint8 {
+			return "blob"
+		}
+	}
+
+	switch val.Name() {
+	case "NullInt64":
+		return "integer"
+	case "NullFloat64":
+		return "real"
+	case "NullBool":
+		return "integer"
+	case "Time":
+		return "datetime"
+	}
+
+	if maxsize < 1 {
+		maxsize = 255
+	}
+	return fmt.Sprintf("varchar(%d)", maxsize)
+}
+
+// Returns autoincrement
+func (d SqliteDialect) AutoIncrStr() string {
+	return "autoincrement"
+}
+
+func (d SqliteDialect) AutoIncrBindValue() string {
+	return "null"
+}
+
+func (d SqliteDialect) AutoIncrInsertSuffix(col *ColumnMap) string {
+	return ""
+}
+
+// Returns suffix
+func (d SqliteDialect) CreateTableSuffix() string {
+	return d.suffix
+}
+
+// With sqlite, there technically isn't a TRUNCATE statement,
+// but a DELETE FROM uses a truncate optimization:
+// http://www.sqlite.org/lang_delete.html
+func (d SqliteDialect) TruncateClause() string {
+	return "delete from"
+}
+
+// Returns "?"
+func (d SqliteDialect) BindVar(i int) string {
+	return "?"
+}
+
+func (d SqliteDialect) InsertAutoIncr(exec SqlExecutor, insertSql string, params ...interface{}) (int64, error) {
+	return standardInsertAutoIncr(exec, insertSql, params...)
+}
+
+func (d SqliteDialect) QuoteField(f string) string {
+	return `"` + f + `"`
+}
+
+// sqlite does not have schemas like PostgreSQL does, so just escape it like normal
+func (d SqliteDialect) QuotedTableForQuery(schema string, table string) string {
+	return d.QuoteField(table)
+}
+
+func (d SqliteDialect) IfSchemaNotExists(command, schema string) string {
+	return fmt.Sprintf("%s if not exists", command)
+}
+
+func (d SqliteDialect) IfTableExists(command, schema, table string) string {
+	return fmt.Sprintf("%s if exists", command)
+}
+
+func (d SqliteDialect) IfTableNotExists(command, schema, table string) string {
+	return fmt.Sprintf("%s if not exists", command)
+}
+
+///////////////////////////////////////////////////////
+// PostgreSQL //
+////////////////
+
+type PostgresDialect struct {
+	suffix string
+}
+
+func (d PostgresDialect) QuerySuffix() string { return ";" }
+
+func (d PostgresDialect) ToSqlType(val reflect.Type, maxsize int, isAutoIncr bool) string {
+	switch val.Kind() {
+	case reflect.Ptr:
+		return d.ToSqlType(val.Elem(), maxsize, isAutoIncr)
+	case reflect.Bool:
+		return "boolean"
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Uint8, reflect.Uint16, reflect.Uint32:
+		if isAutoIncr {
+			return "serial"
+		}
+		return "integer"
+	case reflect.Int64, reflect.Uint64:
+		if isAutoIncr {
+			return "bigserial"
+		}
+		return "bigint"
+	case reflect.Float64:
+		return "double precision"
+	case reflect.Float32:
+		return "real"
+	case reflect.Slice:
+		if val.Elem().Kind() == reflect.Uint8 {
+			return "bytea"
+		}
+	}
+
+	switch val.Name() {
+	case "NullInt64":
+		return "bigint"
+	case "NullFloat64":
+		return "double precision"
+	case "NullBool":
+		return "boolean"
+	case "Time":
+		return "timestamp with time zone"
+	}
+
+	if maxsize > 0 {
+		return fmt.Sprintf("varchar(%d)", maxsize)
+	} else {
+		return "text"
+	}
+
+}
+
+// Returns empty string
+func (d PostgresDialect) AutoIncrStr() string {
+	return ""
+}
+
+func (d PostgresDialect) AutoIncrBindValue() string {
+	return "default"
+}
+
+func (d PostgresDialect) AutoIncrInsertSuffix(col *ColumnMap) string {
+	return " returning " + col.ColumnName
+}
+
+// Returns suffix
+func (d PostgresDialect) CreateTableSuffix() string {
+	return d.suffix
+}
+
+func (d PostgresDialect) TruncateClause() string {
+	return "truncate"
+}
+
+// Returns "$(i+1)"
+func (d PostgresDialect) BindVar(i int) string {
+	return fmt.Sprintf("$%d", i+1)
+}
+
+func (d PostgresDialect) InsertAutoIncrToTarget(exec SqlExecutor, insertSql string, target interface{}, params ...interface{}) error {
+	rows, err := exec.query(insertSql, params...)
+	if err != nil {
+		return err
+	}
+	defer rows.Close()
+
+	if rows.Next() {
+		err := rows.Scan(target)
+		return err
+	}
+
+	return errors.New("No serial value returned for insert: " + insertSql + " Encountered error: " + rows.Err().Error())
+}
+
+func (d PostgresDialect) QuoteField(f string) string {
+	return `"` + strings.ToLower(f) + `"`
+}
+
+func (d PostgresDialect) QuotedTableForQuery(schema string, table string) string {
+	if strings.TrimSpace(schema) == "" {
+		return d.QuoteField(table)
+	}
+
+	return schema + "." + d.QuoteField(table)
+}
+
+func (d PostgresDialect) IfSchemaNotExists(command, schema string) string {
+	return fmt.Sprintf("%s if not exists", command)
+}
+
+func (d PostgresDialect) IfTableExists(command, schema, table string) string {
+	return fmt.Sprintf("%s if exists", command)
+}
+
+func (d PostgresDialect) IfTableNotExists(command, schema, table string) string {
+	return fmt.Sprintf("%s if not exists", command)
+}
+
+///////////////////////////////////////////////////////
+// MySQL //
+///////////
+
+// Implementation of Dialect for MySQL databases.
+type MySQLDialect struct {
+
+	// Engine is the storage engine to use "InnoDB" vs "MyISAM" for example
+	Engine string
+
+	// Encoding is the character encoding to use for created tables
+	Encoding string
+}
+
+func (d MySQLDialect) QuerySuffix() string { return ";" }
+
+func (d MySQLDialect) ToSqlType(val reflect.Type, maxsize int, isAutoIncr bool) string {
+	switch val.Kind() {
+	case reflect.Ptr:
+		return d.ToSqlType(val.Elem(), maxsize, isAutoIncr)
+	case reflect.Bool:
+		return "boolean"
+	case reflect.Int8:
+		return "tinyint"
+	case reflect.Uint8:
+		return "tinyint unsigned"
+	case reflect.Int16:
+		return "smallint"
+	case reflect.Uint16:
+		return "smallint unsigned"
+	case reflect.Int, reflect.Int32:
+		return "int"
+	case reflect.Uint, reflect.Uint32:
+		return "int unsigned"
+	case reflect.Int64:
+		return "bigint"
+	case reflect.Uint64:
+		return "bigint unsigned"
+	case reflect.Float64, reflect.Float32:
+		return "double"
+	case reflect.Slice:
+		if val.Elem().Kind() == reflect.Uint8 {
+			return "mediumblob"
+		}
+	}
+
+	switch val.Name() {
+	case "NullInt64":
+		return "bigint"
+	case "NullFloat64":
+		return "double"
+	case "NullBool":
+		return "tinyint"
+	case "Time":
+		return "datetime"
+	}
+
+	if maxsize < 1 {
+		maxsize = 255
+	}
+	return fmt.Sprintf("varchar(%d)", maxsize)
+}
+
+// Returns auto_increment
+func (d MySQLDialect) AutoIncrStr() string {
+	return "auto_increment"
+}
+
+func (d MySQLDialect) AutoIncrBindValue() string {
+	return "null"
+}
+
+func (d MySQLDialect) AutoIncrInsertSuffix(col *ColumnMap) string {
+	return ""
+}
+
+// Returns engine=%s charset=%s  based on values stored on struct
+func (d MySQLDialect) CreateTableSuffix() string {
+	if d.Engine == "" || d.Encoding == "" {
+		msg := "gorp - undefined"
+
+		if d.Engine == "" {
+			msg += " MySQLDialect.Engine"
+		}
+		if d.Engine == "" && d.Encoding == "" {
+			msg += ","
+		}
+		if d.Encoding == "" {
+			msg += " MySQLDialect.Encoding"
+		}
+		msg += ". Check that your MySQLDialect was correctly initialized when declared."
+		panic(msg)
+	}
+
+	return fmt.Sprintf(" engine=%s charset=%s", d.Engine, d.Encoding)
+}
+
+func (d MySQLDialect) TruncateClause() string {
+	return "truncate"
+}
+
+// Returns "?"
+func (d MySQLDialect) BindVar(i int) string {
+	return "?"
+}
+
+func (d MySQLDialect) InsertAutoIncr(exec SqlExecutor, insertSql string, params ...interface{}) (int64, error) {
+	return standardInsertAutoIncr(exec, insertSql, params...)
+}
+
+func (d MySQLDialect) QuoteField(f string) string {
+	return "`" + f + "`"
+}
+
+func (d MySQLDialect) QuotedTableForQuery(schema string, table string) string {
+	if strings.TrimSpace(schema) == "" {
+		return d.QuoteField(table)
+	}
+
+	return schema + "." + d.QuoteField(table)
+}
+
+func (d MySQLDialect) IfSchemaNotExists(command, schema string) string {
+	return fmt.Sprintf("%s if not exists", command)
+}
+
+func (d MySQLDialect) IfTableExists(command, schema, table string) string {
+	return fmt.Sprintf("%s if exists", command)
+}
+
+func (d MySQLDialect) IfTableNotExists(command, schema, table string) string {
+	return fmt.Sprintf("%s if not exists", command)
+}
+
+///////////////////////////////////////////////////////
+// Sql Server //
+////////////////
+
+// Implementation of Dialect for Microsoft SQL Server databases.
+// Tested on SQL Server 2008 with driver: github.com/denisenkom/go-mssqldb
+
+type SqlServerDialect struct {
+	suffix string
+}
+
+func (d SqlServerDialect) ToSqlType(val reflect.Type, maxsize int, isAutoIncr bool) string {
+	switch val.Kind() {
+	case reflect.Ptr:
+		return d.ToSqlType(val.Elem(), maxsize, isAutoIncr)
+	case reflect.Bool:
+		return "bit"
+	case reflect.Int8:
+		return "tinyint"
+	case reflect.Uint8:
+		return "smallint"
+	case reflect.Int16:
+		return "smallint"
+	case reflect.Uint16:
+		return "int"
+	case reflect.Int, reflect.Int32:
+		return "int"
+	case reflect.Uint, reflect.Uint32:
+		return "bigint"
+	case reflect.Int64:
+		return "bigint"
+	case reflect.Uint64:
+		return "bigint"
+	case reflect.Float32:
+		return "real"
+	case reflect.Float64:
+		return "float(53)"
+	case reflect.Slice:
+		if val.Elem().Kind() == reflect.Uint8 {
+			return "varbinary"
+		}
+	}
+
+	switch val.Name() {
+	case "NullInt64":
+		return "bigint"
+	case "NullFloat64":
+		return "float(53)"
+	case "NullBool":
+		return "tinyint"
+	case "Time":
+		return "datetime"
+	}
+
+	if maxsize < 1 {
+		maxsize = 255
+	}
+	return fmt.Sprintf("varchar(%d)", maxsize)
+}
+
+// Returns auto_increment
+func (d SqlServerDialect) AutoIncrStr() string {
+	return "identity(0,1)"
+}
+
+// Empty string removes autoincrement columns from the INSERT statements.
+func (d SqlServerDialect) AutoIncrBindValue() string {
+	return ""
+}
+
+func (d SqlServerDialect) AutoIncrInsertSuffix(col *ColumnMap) string {
+	return ""
+}
+
+// Returns suffix
+func (d SqlServerDialect) CreateTableSuffix() string {
+
+	return d.suffix
+}
+
+func (d SqlServerDialect) TruncateClause() string {
+	return "delete from"
+}
+
+// Returns "?"
+func (d SqlServerDialect) BindVar(i int) string {
+	return "?"
+}
+
+func (d SqlServerDialect) InsertAutoIncr(exec SqlExecutor, insertSql string, params ...interface{}) (int64, error) {
+	return standardInsertAutoIncr(exec, insertSql, params...)
+}
+
+func (d SqlServerDialect) QuoteField(f string) string {
+	return `"` + f + `"`
+}
+
+func (d SqlServerDialect) QuotedTableForQuery(schema string, table string) string {
+	if strings.TrimSpace(schema) == "" {
+		return table
+	}
+	return schema + "." + table
+}
+
+func (d SqlServerDialect) QuerySuffix() string { return ";" }
+
+func (d SqlServerDialect) IfSchemaNotExists(command, schema string) string {
+	s := fmt.Sprintf("if not exists (select name from sys.schemas where name = '%s') %s", schema, command)
+	return s
+}
+
+func (d SqlServerDialect) IfTableExists(command, schema, table string) string {
+	var schema_clause string
+	if strings.TrimSpace(schema) != "" {
+		schema_clause = fmt.Sprintf("table_schema = '%s' and ", schema)
+	}
+	s := fmt.Sprintf("if exists (select * from information_schema.tables where %stable_name = '%s') %s", schema_clause, table, command)
+	return s
+}
+
+func (d SqlServerDialect) IfTableNotExists(command, schema, table string) string {
+	var schema_clause string
+	if strings.TrimSpace(schema) != "" {
+		schema_clause = fmt.Sprintf("table_schema = '%s' and ", schema)
+	}
+	s := fmt.Sprintf("if not exists (select * from information_schema.tables where %stable_name = '%s') %s", schema_clause, table, command)
+	return s
+}
+
+///////////////////////////////////////////////////////
+// Oracle //
+///////////
+
+// Implementation of Dialect for Oracle databases.
+type OracleDialect struct{}
+
+func (d OracleDialect) QuerySuffix() string { return "" }
+
+func (d OracleDialect) ToSqlType(val reflect.Type, maxsize int, isAutoIncr bool) string {
+	switch val.Kind() {
+	case reflect.Ptr:
+		return d.ToSqlType(val.Elem(), maxsize, isAutoIncr)
+	case reflect.Bool:
+		return "boolean"
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Uint8, reflect.Uint16, reflect.Uint32:
+		if isAutoIncr {
+			return "serial"
+		}
+		return "integer"
+	case reflect.Int64, reflect.Uint64:
+		if isAutoIncr {
+			return "bigserial"
+		}
+		return "bigint"
+	case reflect.Float64:
+		return "double precision"
+	case reflect.Float32:
+		return "real"
+	case reflect.Slice:
+		if val.Elem().Kind() == reflect.Uint8 {
+			return "bytea"
+		}
+	}
+
+	switch val.Name() {
+	case "NullInt64":
+		return "bigint"
+	case "NullFloat64":
+		return "double precision"
+	case "NullBool":
+		return "boolean"
+	case "NullTime", "Time":
+		return "timestamp with time zone"
+	}
+
+	if maxsize > 0 {
+		return fmt.Sprintf("varchar(%d)", maxsize)
+	} else {
+		return "text"
+	}
+
+}
+
+// Returns empty string
+func (d OracleDialect) AutoIncrStr() string {
+	return ""
+}
+
+func (d OracleDialect) AutoIncrBindValue() string {
+	return "default"
+}
+
+func (d OracleDialect) AutoIncrInsertSuffix(col *ColumnMap) string {
+	return " returning " + col.ColumnName
+}
+
+// Returns suffix
+func (d OracleDialect) CreateTableSuffix() string {
+	return ""
+}
+
+func (d OracleDialect) TruncateClause() string {
+	return "truncate"
+}
+
+// Returns "$(i+1)"
+func (d OracleDialect) BindVar(i int) string {
+	return fmt.Sprintf(":%d", i+1)
+}
+
+func (d OracleDialect) InsertAutoIncr(exec SqlExecutor, insertSql string, params ...interface{}) (int64, error) {
+	rows, err := exec.query(insertSql, params...)
+	if err != nil {
+		return 0, err
+	}
+	defer rows.Close()
+
+	if rows.Next() {
+		var id int64
+		err := rows.Scan(&id)
+		return id, err
+	}
+
+	return 0, errors.New("No serial value returned for insert: " + insertSql + " Encountered error: " + rows.Err().Error())
+}
+
+func (d OracleDialect) QuoteField(f string) string {
+	return `"` + strings.ToUpper(f) + `"`
+}
+
+func (d OracleDialect) QuotedTableForQuery(schema string, table string) string {
+	if strings.TrimSpace(schema) == "" {
+		return d.QuoteField(table)
+	}
+
+	return schema + "." + d.QuoteField(table)
+}
+
+func (d OracleDialect) IfSchemaNotExists(command, schema string) string {
+	return fmt.Sprintf("%s if not exists", command)
+}
+
+func (d OracleDialect) IfTableExists(command, schema, table string) string {
+	return fmt.Sprintf("%s if exists", command)
+}
+
+func (d OracleDialect) IfTableNotExists(command, schema, table string) string {
+	return fmt.Sprintf("%s if not exists", command)
+}
diff --git a/Godeps/_workspace/src/github.com/coopernurse/gorp/errors.go b/Godeps/_workspace/src/github.com/coopernurse/gorp/errors.go
new file mode 100644
index 00000000..356d6847
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coopernurse/gorp/errors.go
@@ -0,0 +1,26 @@
+package gorp
+
+import (
+	"fmt"
+)
+
+// A non-fatal error, when a select query returns columns that do not exist
+// as fields in the struct it is being mapped to
+type NoFieldInTypeError struct {
+	TypeName        string
+	MissingColNames []string
+}
+
+func (err *NoFieldInTypeError) Error() string {
+	return fmt.Sprintf("gorp: No fields %+v in type %s", err.MissingColNames, err.TypeName)
+}
+
+// returns true if the error is non-fatal (ie, we shouldn't immediately return)
+func NonFatalError(err error) bool {
+	switch err.(type) {
+	case *NoFieldInTypeError:
+		return true
+	default:
+		return false
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/coopernurse/gorp/gorp.go b/Godeps/_workspace/src/github.com/coopernurse/gorp/gorp.go
new file mode 100644
index 00000000..1b7babea
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coopernurse/gorp/gorp.go
@@ -0,0 +1,2082 @@
+// Copyright 2012 James Cooper. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+// Package gorp provides a simple way to marshal Go structs to and from
+// SQL databases.  It uses the database/sql package, and should work with any
+// compliant database/sql driver.
+//
+// Source code and project home:
+// https://github.com/coopernurse/gorp
+//
+package gorp
+
+import (
+	"bytes"
+	"database/sql"
+	"database/sql/driver"
+	"errors"
+	"fmt"
+	"reflect"
+	"regexp"
+	"strings"
+	"time"
+)
+
+// Oracle String (empty string is null)
+type OracleString struct {
+	sql.NullString
+}
+
+// Scan implements the Scanner interface.
+func (os *OracleString) Scan(value interface{}) error {
+	if value == nil {
+		os.String, os.Valid = "", false
+		return nil
+	}
+	os.Valid = true
+	return os.NullString.Scan(value)
+}
+
+// Value implements the driver Valuer interface.
+func (os OracleString) Value() (driver.Value, error) {
+	if !os.Valid || os.String == "" {
+		return nil, nil
+	}
+	return os.String, nil
+}
+
+// A nullable Time value
+type NullTime struct {
+	Time  time.Time
+	Valid bool // Valid is true if Time is not NULL
+}
+
+// Scan implements the Scanner interface.
+func (nt *NullTime) Scan(value interface{}) error {
+	nt.Time, nt.Valid = value.(time.Time)
+	return nil
+}
+
+// Value implements the driver Valuer interface.
+func (nt NullTime) Value() (driver.Value, error) {
+	if !nt.Valid {
+		return nil, nil
+	}
+	return nt.Time, nil
+}
+
+var zeroVal reflect.Value
+var versFieldConst = "[gorp_ver_field]"
+
+// OptimisticLockError is returned by Update() or Delete() if the
+// struct being modified has a Version field and the value is not equal to
+// the current value in the database
+type OptimisticLockError struct {
+	// Table name where the lock error occurred
+	TableName string
+
+	// Primary key values of the row being updated/deleted
+	Keys []interface{}
+
+	// true if a row was found with those keys, indicating the
+	// LocalVersion is stale.  false if no value was found with those
+	// keys, suggesting the row has been deleted since loaded, or
+	// was never inserted to begin with
+	RowExists bool
+
+	// Version value on the struct passed to Update/Delete. This value is
+	// out of sync with the database.
+	LocalVersion int64
+}
+
+// Error returns a description of the cause of the lock error
+func (e OptimisticLockError) Error() string {
+	if e.RowExists {
+		return fmt.Sprintf("gorp: OptimisticLockError table=%s keys=%v out of date version=%d", e.TableName, e.Keys, e.LocalVersion)
+	}
+
+	return fmt.Sprintf("gorp: OptimisticLockError no row found for table=%s keys=%v", e.TableName, e.Keys)
+}
+
+// The TypeConverter interface provides a way to map a value of one
+// type to another type when persisting to, or loading from, a database.
+//
+// Example use cases: Implement type converter to convert bool types to "y"/"n" strings,
+// or serialize a struct member as a JSON blob.
+type TypeConverter interface {
+	// ToDb converts val to another type. Called before INSERT/UPDATE operations
+	ToDb(val interface{}) (interface{}, error)
+
+	// FromDb returns a CustomScanner appropriate for this type. This will be used
+	// to hold values returned from SELECT queries.
+	//
+	// In particular the CustomScanner returned should implement a Binder
+	// function appropriate for the Go type you wish to convert the db value to
+	//
+	// If bool==false, then no custom scanner will be used for this field.
+	FromDb(target interface{}) (CustomScanner, bool)
+}
+
+// CustomScanner binds a database column value to a Go type
+type CustomScanner struct {
+	// After a row is scanned, Holder will contain the value from the database column.
+	// Initialize the CustomScanner with the concrete Go type you wish the database
+	// driver to scan the raw column into.
+	Holder interface{}
+	// Target typically holds a pointer to the target struct field to bind the Holder
+	// value to.
+	Target interface{}
+	// Binder is a custom function that converts the holder value to the target type
+	// and sets target accordingly.  This function should return error if a problem
+	// occurs converting the holder to the target.
+	Binder func(holder interface{}, target interface{}) error
+}
+
+// Bind is called automatically by gorp after Scan()
+func (me CustomScanner) Bind() error {
+	return me.Binder(me.Holder, me.Target)
+}
+
+// DbMap is the root gorp mapping object. Create one of these for each
+// database schema you wish to map.  Each DbMap contains a list of
+// mapped tables.
+//
+// Example:
+//
+//     dialect := gorp.MySQLDialect{"InnoDB", "UTF8"}
+//     dbmap := &gorp.DbMap{Db: db, Dialect: dialect}
+//
+type DbMap struct {
+	// Db handle to use with this map
+	Db *sql.DB
+
+	// Dialect implementation to use with this map
+	Dialect Dialect
+
+	TypeConverter TypeConverter
+
+	tables    []*TableMap
+	logger    GorpLogger
+	logPrefix string
+}
+
+// TableMap represents a mapping between a Go struct and a database table
+// Use dbmap.AddTable() or dbmap.AddTableWithName() to create these
+type TableMap struct {
+	// Name of database table.
+	TableName      string
+	SchemaName     string
+	gotype         reflect.Type
+	Columns        []*ColumnMap
+	keys           []*ColumnMap
+	uniqueTogether [][]string
+	version        *ColumnMap
+	insertPlan     bindPlan
+	updatePlan     bindPlan
+	deletePlan     bindPlan
+	getPlan        bindPlan
+	dbmap          *DbMap
+}
+
+// ResetSql removes cached insert/update/select/delete SQL strings
+// associated with this TableMap.  Call this if you've modified
+// any column names or the table name itself.
+func (t *TableMap) ResetSql() {
+	t.insertPlan = bindPlan{}
+	t.updatePlan = bindPlan{}
+	t.deletePlan = bindPlan{}
+	t.getPlan = bindPlan{}
+}
+
+// SetKeys lets you specify the fields on a struct that map to primary
+// key columns on the table.  If isAutoIncr is set, result.LastInsertId()
+// will be used after INSERT to bind the generated id to the Go struct.
+//
+// Automatically calls ResetSql() to ensure SQL statements are regenerated.
+//
+// Panics if isAutoIncr is true, and fieldNames length != 1
+//
+func (t *TableMap) SetKeys(isAutoIncr bool, fieldNames ...string) *TableMap {
+	if isAutoIncr && len(fieldNames) != 1 {
+		panic(fmt.Sprintf(
+			"gorp: SetKeys: fieldNames length must be 1 if key is auto-increment. (Saw %v fieldNames)",
+			len(fieldNames)))
+	}
+	t.keys = make([]*ColumnMap, 0)
+	for _, name := range fieldNames {
+		colmap := t.ColMap(name)
+		colmap.isPK = true
+		colmap.isAutoIncr = isAutoIncr
+		t.keys = append(t.keys, colmap)
+	}
+	t.ResetSql()
+
+	return t
+}
+
+// SetUniqueTogether lets you specify uniqueness constraints across multiple
+// columns on the table. Each call adds an additional constraint for the
+// specified columns.
+//
+// Automatically calls ResetSql() to ensure SQL statements are regenerated.
+//
+// Panics if fieldNames length < 2.
+//
+func (t *TableMap) SetUniqueTogether(fieldNames ...string) *TableMap {
+	if len(fieldNames) < 2 {
+		panic(fmt.Sprintf(
+			"gorp: SetUniqueTogether: must provide at least two fieldNames to set uniqueness constraint."))
+	}
+
+	columns := make([]string, 0)
+	for _, name := range fieldNames {
+		columns = append(columns, name)
+	}
+	t.uniqueTogether = append(t.uniqueTogether, columns)
+	t.ResetSql()
+
+	return t
+}
+
+// ColMap returns the ColumnMap pointer matching the given struct field
+// name.  It panics if the struct does not contain a field matching this
+// name.
+func (t *TableMap) ColMap(field string) *ColumnMap {
+	col := colMapOrNil(t, field)
+	if col == nil {
+		e := fmt.Sprintf("No ColumnMap in table %s type %s with field %s",
+			t.TableName, t.gotype.Name(), field)
+
+		panic(e)
+	}
+	return col
+}
+
+func colMapOrNil(t *TableMap, field string) *ColumnMap {
+	for _, col := range t.Columns {
+		if col.fieldName == field || col.ColumnName == field {
+			return col
+		}
+	}
+	return nil
+}
+
+// SetVersionCol sets the column to use as the Version field.  By default
+// the "Version" field is used.  Returns the column found, or panics
+// if the struct does not contain a field matching this name.
+//
+// Automatically calls ResetSql() to ensure SQL statements are regenerated.
+func (t *TableMap) SetVersionCol(field string) *ColumnMap {
+	c := t.ColMap(field)
+	t.version = c
+	t.ResetSql()
+	return c
+}
+
+type bindPlan struct {
+	query             string
+	argFields         []string
+	keyFields         []string
+	versField         string
+	autoIncrIdx       int
+	autoIncrFieldName string
+}
+
+func (plan bindPlan) createBindInstance(elem reflect.Value, conv TypeConverter) (bindInstance, error) {
+	bi := bindInstance{query: plan.query, autoIncrIdx: plan.autoIncrIdx, autoIncrFieldName: plan.autoIncrFieldName, versField: plan.versField}
+	if plan.versField != "" {
+		bi.existingVersion = elem.FieldByName(plan.versField).Int()
+	}
+
+	var err error
+
+	for i := 0; i < len(plan.argFields); i++ {
+		k := plan.argFields[i]
+		if k == versFieldConst {
+			newVer := bi.existingVersion + 1
+			bi.args = append(bi.args, newVer)
+			if bi.existingVersion == 0 {
+				elem.FieldByName(plan.versField).SetInt(int64(newVer))
+			}
+		} else {
+			val := elem.FieldByName(k).Interface()
+			if conv != nil {
+				val, err = conv.ToDb(val)
+				if err != nil {
+					return bindInstance{}, err
+				}
+			}
+			bi.args = append(bi.args, val)
+		}
+	}
+
+	for i := 0; i < len(plan.keyFields); i++ {
+		k := plan.keyFields[i]
+		val := elem.FieldByName(k).Interface()
+		if conv != nil {
+			val, err = conv.ToDb(val)
+			if err != nil {
+				return bindInstance{}, err
+			}
+		}
+		bi.keys = append(bi.keys, val)
+	}
+
+	return bi, nil
+}
+
+type bindInstance struct {
+	query             string
+	args              []interface{}
+	keys              []interface{}
+	existingVersion   int64
+	versField         string
+	autoIncrIdx       int
+	autoIncrFieldName string
+}
+
+func (t *TableMap) bindInsert(elem reflect.Value) (bindInstance, error) {
+	plan := t.insertPlan
+	if plan.query == "" {
+		plan.autoIncrIdx = -1
+
+		s := bytes.Buffer{}
+		s2 := bytes.Buffer{}
+		s.WriteString(fmt.Sprintf("insert into %s (", t.dbmap.Dialect.QuotedTableForQuery(t.SchemaName, t.TableName)))
+
+		x := 0
+		first := true
+		for y := range t.Columns {
+			col := t.Columns[y]
+			if !(col.isAutoIncr && t.dbmap.Dialect.AutoIncrBindValue() == "") {
+				if !col.Transient {
+					if !first {
+						s.WriteString(",")
+						s2.WriteString(",")
+					}
+					s.WriteString(t.dbmap.Dialect.QuoteField(col.ColumnName))
+
+					if col.isAutoIncr {
+						s2.WriteString(t.dbmap.Dialect.AutoIncrBindValue())
+						plan.autoIncrIdx = y
+						plan.autoIncrFieldName = col.fieldName
+					} else {
+						s2.WriteString(t.dbmap.Dialect.BindVar(x))
+						if col == t.version {
+							plan.versField = col.fieldName
+							plan.argFields = append(plan.argFields, versFieldConst)
+						} else {
+							plan.argFields = append(plan.argFields, col.fieldName)
+						}
+
+						x++
+					}
+					first = false
+				}
+			} else {
+				plan.autoIncrIdx = y
+				plan.autoIncrFieldName = col.fieldName
+			}
+		}
+		s.WriteString(") values (")
+		s.WriteString(s2.String())
+		s.WriteString(")")
+		if plan.autoIncrIdx > -1 {
+			s.WriteString(t.dbmap.Dialect.AutoIncrInsertSuffix(t.Columns[plan.autoIncrIdx]))
+		}
+		s.WriteString(t.dbmap.Dialect.QuerySuffix())
+
+		plan.query = s.String()
+		t.insertPlan = plan
+	}
+
+	return plan.createBindInstance(elem, t.dbmap.TypeConverter)
+}
+
+func (t *TableMap) bindUpdate(elem reflect.Value) (bindInstance, error) {
+	plan := t.updatePlan
+	if plan.query == "" {
+
+		s := bytes.Buffer{}
+		s.WriteString(fmt.Sprintf("update %s set ", t.dbmap.Dialect.QuotedTableForQuery(t.SchemaName, t.TableName)))
+		x := 0
+
+		for y := range t.Columns {
+			col := t.Columns[y]
+			if !col.isAutoIncr && !col.Transient {
+				if x > 0 {
+					s.WriteString(", ")
+				}
+				s.WriteString(t.dbmap.Dialect.QuoteField(col.ColumnName))
+				s.WriteString("=")
+				s.WriteString(t.dbmap.Dialect.BindVar(x))
+
+				if col == t.version {
+					plan.versField = col.fieldName
+					plan.argFields = append(plan.argFields, versFieldConst)
+				} else {
+					plan.argFields = append(plan.argFields, col.fieldName)
+				}
+				x++
+			}
+		}
+
+		s.WriteString(" where ")
+		for y := range t.keys {
+			col := t.keys[y]
+			if y > 0 {
+				s.WriteString(" and ")
+			}
+			s.WriteString(t.dbmap.Dialect.QuoteField(col.ColumnName))
+			s.WriteString("=")
+			s.WriteString(t.dbmap.Dialect.BindVar(x))
+
+			plan.argFields = append(plan.argFields, col.fieldName)
+			plan.keyFields = append(plan.keyFields, col.fieldName)
+			x++
+		}
+		if plan.versField != "" {
+			s.WriteString(" and ")
+			s.WriteString(t.dbmap.Dialect.QuoteField(t.version.ColumnName))
+			s.WriteString("=")
+			s.WriteString(t.dbmap.Dialect.BindVar(x))
+			plan.argFields = append(plan.argFields, plan.versField)
+		}
+		s.WriteString(t.dbmap.Dialect.QuerySuffix())
+
+		plan.query = s.String()
+		t.updatePlan = plan
+	}
+
+	return plan.createBindInstance(elem, t.dbmap.TypeConverter)
+}
+
+func (t *TableMap) bindDelete(elem reflect.Value) (bindInstance, error) {
+	plan := t.deletePlan
+	if plan.query == "" {
+
+		s := bytes.Buffer{}
+		s.WriteString(fmt.Sprintf("delete from %s", t.dbmap.Dialect.QuotedTableForQuery(t.SchemaName, t.TableName)))
+
+		for y := range t.Columns {
+			col := t.Columns[y]
+			if !col.Transient {
+				if col == t.version {
+					plan.versField = col.fieldName
+				}
+			}
+		}
+
+		s.WriteString(" where ")
+		for x := range t.keys {
+			k := t.keys[x]
+			if x > 0 {
+				s.WriteString(" and ")
+			}
+			s.WriteString(t.dbmap.Dialect.QuoteField(k.ColumnName))
+			s.WriteString("=")
+			s.WriteString(t.dbmap.Dialect.BindVar(x))
+
+			plan.keyFields = append(plan.keyFields, k.fieldName)
+			plan.argFields = append(plan.argFields, k.fieldName)
+		}
+		if plan.versField != "" {
+			s.WriteString(" and ")
+			s.WriteString(t.dbmap.Dialect.QuoteField(t.version.ColumnName))
+			s.WriteString("=")
+			s.WriteString(t.dbmap.Dialect.BindVar(len(plan.argFields)))
+
+			plan.argFields = append(plan.argFields, plan.versField)
+		}
+		s.WriteString(t.dbmap.Dialect.QuerySuffix())
+
+		plan.query = s.String()
+		t.deletePlan = plan
+	}
+
+	return plan.createBindInstance(elem, t.dbmap.TypeConverter)
+}
+
+func (t *TableMap) bindGet() bindPlan {
+	plan := t.getPlan
+	if plan.query == "" {
+
+		s := bytes.Buffer{}
+		s.WriteString("select ")
+
+		x := 0
+		for _, col := range t.Columns {
+			if !col.Transient {
+				if x > 0 {
+					s.WriteString(",")
+				}
+				s.WriteString(t.dbmap.Dialect.QuoteField(col.ColumnName))
+				plan.argFields = append(plan.argFields, col.fieldName)
+				x++
+			}
+		}
+		s.WriteString(" from ")
+		s.WriteString(t.dbmap.Dialect.QuotedTableForQuery(t.SchemaName, t.TableName))
+		s.WriteString(" where ")
+		for x := range t.keys {
+			col := t.keys[x]
+			if x > 0 {
+				s.WriteString(" and ")
+			}
+			s.WriteString(t.dbmap.Dialect.QuoteField(col.ColumnName))
+			s.WriteString("=")
+			s.WriteString(t.dbmap.Dialect.BindVar(x))
+
+			plan.keyFields = append(plan.keyFields, col.fieldName)
+		}
+		s.WriteString(t.dbmap.Dialect.QuerySuffix())
+
+		plan.query = s.String()
+		t.getPlan = plan
+	}
+
+	return plan
+}
+
+// ColumnMap represents a mapping between a Go struct field and a single
+// column in a table.
+// Unique and MaxSize only inform the
+// CreateTables() function and are not used by Insert/Update/Delete/Get.
+type ColumnMap struct {
+	// Column name in db table
+	ColumnName string
+
+	// If true, this column is skipped in generated SQL statements
+	Transient bool
+
+	// If true, " unique" is added to create table statements.
+	// Not used elsewhere
+	Unique bool
+
+	// Passed to Dialect.ToSqlType() to assist in informing the
+	// correct column type to map to in CreateTables()
+	// Not used elsewhere
+	MaxSize int
+
+	fieldName  string
+	gotype     reflect.Type
+	isPK       bool
+	isAutoIncr bool
+	isNotNull  bool
+}
+
+// Rename allows you to specify the column name in the table
+//
+// Example:  table.ColMap("Updated").Rename("date_updated")
+//
+func (c *ColumnMap) Rename(colname string) *ColumnMap {
+	c.ColumnName = colname
+	return c
+}
+
+// SetTransient allows you to mark the column as transient. If true
+// this column will be skipped when SQL statements are generated
+func (c *ColumnMap) SetTransient(b bool) *ColumnMap {
+	c.Transient = b
+	return c
+}
+
+// SetUnique adds "unique" to the create table statements for this
+// column, if b is true.
+func (c *ColumnMap) SetUnique(b bool) *ColumnMap {
+	c.Unique = b
+	return c
+}
+
+// SetNotNull adds "not null" to the create table statements for this
+// column, if nn is true.
+func (c *ColumnMap) SetNotNull(nn bool) *ColumnMap {
+	c.isNotNull = nn
+	return c
+}
+
+// SetMaxSize specifies the max length of values of this column. This is
+// passed to the dialect.ToSqlType() function, which can use the value
+// to alter the generated type for "create table" statements
+func (c *ColumnMap) SetMaxSize(size int) *ColumnMap {
+	c.MaxSize = size
+	return c
+}
+
+// Transaction represents a database transaction.
+// Insert/Update/Delete/Get/Exec operations will be run in the context
+// of that transaction.  Transactions should be terminated with
+// a call to Commit() or Rollback()
+type Transaction struct {
+	dbmap  *DbMap
+	tx     *sql.Tx
+	closed bool
+}
+
+// SqlExecutor exposes gorp operations that can be run from Pre/Post
+// hooks.  This hides whether the current operation that triggered the
+// hook is in a transaction.
+//
+// See the DbMap function docs for each of the functions below for more
+// information.
+type SqlExecutor interface {
+	Get(i interface{}, keys ...interface{}) (interface{}, error)
+	Insert(list ...interface{}) error
+	Update(list ...interface{}) (int64, error)
+	Delete(list ...interface{}) (int64, error)
+	Exec(query string, args ...interface{}) (sql.Result, error)
+	Select(i interface{}, query string,
+		args ...interface{}) ([]interface{}, error)
+	SelectInt(query string, args ...interface{}) (int64, error)
+	SelectNullInt(query string, args ...interface{}) (sql.NullInt64, error)
+	SelectFloat(query string, args ...interface{}) (float64, error)
+	SelectNullFloat(query string, args ...interface{}) (sql.NullFloat64, error)
+	SelectStr(query string, args ...interface{}) (string, error)
+	SelectNullStr(query string, args ...interface{}) (sql.NullString, error)
+	SelectOne(holder interface{}, query string, args ...interface{}) error
+	query(query string, args ...interface{}) (*sql.Rows, error)
+	queryRow(query string, args ...interface{}) *sql.Row
+}
+
+// Compile-time check that DbMap and Transaction implement the SqlExecutor
+// interface.
+var _, _ SqlExecutor = &DbMap{}, &Transaction{}
+
+type GorpLogger interface {
+	Printf(format string, v ...interface{})
+}
+
+// TraceOn turns on SQL statement logging for this DbMap.  After this is
+// called, all SQL statements will be sent to the logger.  If prefix is
+// a non-empty string, it will be written to the front of all logged
+// strings, which can aid in filtering log lines.
+//
+// Use TraceOn if you want to spy on the SQL statements that gorp
+// generates.
+//
+// Note that the base log.Logger type satisfies GorpLogger, but adapters can
+// easily be written for other logging packages (e.g., the golang-sanctioned
+// glog framework).
+func (m *DbMap) TraceOn(prefix string, logger GorpLogger) {
+	m.logger = logger
+	if prefix == "" {
+		m.logPrefix = prefix
+	} else {
+		m.logPrefix = fmt.Sprintf("%s ", prefix)
+	}
+}
+
+// TraceOff turns off tracing. It is idempotent.
+func (m *DbMap) TraceOff() {
+	m.logger = nil
+	m.logPrefix = ""
+}
+
+// AddTable registers the given interface type with gorp. The table name
+// will be given the name of the TypeOf(i).  You must call this function,
+// or AddTableWithName, for any struct type you wish to persist with
+// the given DbMap.
+//
+// This operation is idempotent. If i's type is already mapped, the
+// existing *TableMap is returned
+func (m *DbMap) AddTable(i interface{}) *TableMap {
+	return m.AddTableWithName(i, "")
+}
+
+// AddTableWithName has the same behavior as AddTable, but sets
+// table.TableName to name.
+func (m *DbMap) AddTableWithName(i interface{}, name string) *TableMap {
+	return m.AddTableWithNameAndSchema(i, "", name)
+}
+
+// AddTableWithNameAndSchema has the same behavior as AddTable, but sets
+// table.TableName to name.
+func (m *DbMap) AddTableWithNameAndSchema(i interface{}, schema string, name string) *TableMap {
+	t := reflect.TypeOf(i)
+	if name == "" {
+		name = t.Name()
+	}
+
+	// check if we have a table for this type already
+	// if so, update the name and return the existing pointer
+	for i := range m.tables {
+		table := m.tables[i]
+		if table.gotype == t {
+			table.TableName = name
+			return table
+		}
+	}
+
+	tmap := &TableMap{gotype: t, TableName: name, SchemaName: schema, dbmap: m}
+	tmap.Columns, tmap.version = m.readStructColumns(t)
+	m.tables = append(m.tables, tmap)
+
+	return tmap
+}
+
+func (m *DbMap) readStructColumns(t reflect.Type) (cols []*ColumnMap, version *ColumnMap) {
+	n := t.NumField()
+	for i := 0; i < n; i++ {
+		f := t.Field(i)
+		if f.Anonymous && f.Type.Kind() == reflect.Struct {
+			// Recursively add nested fields in embedded structs.
+			subcols, subversion := m.readStructColumns(f.Type)
+			// Don't append nested fields that have the same field
+			// name as an already-mapped field.
+			for _, subcol := range subcols {
+				shouldAppend := true
+				for _, col := range cols {
+					if !subcol.Transient && subcol.fieldName == col.fieldName {
+						shouldAppend = false
+						break
+					}
+				}
+				if shouldAppend {
+					cols = append(cols, subcol)
+				}
+			}
+			if subversion != nil {
+				version = subversion
+			}
+		} else {
+			columnName := f.Tag.Get("db")
+			if columnName == "" {
+				columnName = f.Name
+			}
+			gotype := f.Type
+			if m.TypeConverter != nil {
+				// Make a new pointer to a value of type gotype and
+				// pass it to the TypeConverter's FromDb method to see
+				// if a different type should be used for the column
+				// type during table creation.
+				value := reflect.New(gotype).Interface()
+				scanner, useHolder := m.TypeConverter.FromDb(value)
+				if useHolder {
+					gotype = reflect.TypeOf(scanner.Holder)
+				}
+			}
+			cm := &ColumnMap{
+				ColumnName: columnName,
+				Transient:  columnName == "-",
+				fieldName:  f.Name,
+				gotype:     gotype,
+			}
+			// Check for nested fields of the same field name and
+			// override them.
+			shouldAppend := true
+			for index, col := range cols {
+				if !col.Transient && col.fieldName == cm.fieldName {
+					cols[index] = cm
+					shouldAppend = false
+					break
+				}
+			}
+			if shouldAppend {
+				cols = append(cols, cm)
+			}
+			if cm.fieldName == "Version" {
+				version = cm
+			}
+		}
+	}
+	return
+}
+
+// CreateTables iterates through TableMaps registered to this DbMap and
+// executes "create table" statements against the database for each.
+//
+// This is particularly useful in unit tests where you want to create
+// and destroy the schema automatically.
+func (m *DbMap) CreateTables() error {
+	return m.createTables(false)
+}
+
+// CreateTablesIfNotExists is similar to CreateTables, but starts
+// each statement with "create table if not exists" so that existing
+// tables do not raise errors
+func (m *DbMap) CreateTablesIfNotExists() error {
+	return m.createTables(true)
+}
+
+func (m *DbMap) createTables(ifNotExists bool) error {
+	var err error
+	for i := range m.tables {
+		table := m.tables[i]
+
+		s := bytes.Buffer{}
+
+		if strings.TrimSpace(table.SchemaName) != "" {
+			schemaCreate := "create schema"
+			if ifNotExists {
+				s.WriteString(m.Dialect.IfSchemaNotExists(schemaCreate, table.SchemaName))
+			} else {
+				s.WriteString(schemaCreate)
+			}
+			s.WriteString(fmt.Sprintf(" %s;", table.SchemaName))
+		}
+
+		tableCreate := "create table"
+		if ifNotExists {
+			s.WriteString(m.Dialect.IfTableNotExists(tableCreate, table.SchemaName, table.TableName))
+		} else {
+			s.WriteString(tableCreate)
+		}
+		s.WriteString(fmt.Sprintf(" %s (", m.Dialect.QuotedTableForQuery(table.SchemaName, table.TableName)))
+
+		x := 0
+		for _, col := range table.Columns {
+			if !col.Transient {
+				if x > 0 {
+					s.WriteString(", ")
+				}
+				stype := m.Dialect.ToSqlType(col.gotype, col.MaxSize, col.isAutoIncr)
+				s.WriteString(fmt.Sprintf("%s %s", m.Dialect.QuoteField(col.ColumnName), stype))
+
+				if col.isPK || col.isNotNull {
+					s.WriteString(" not null")
+				}
+				if col.isPK && len(table.keys) == 1 {
+					s.WriteString(" primary key")
+				}
+				if col.Unique {
+					s.WriteString(" unique")
+				}
+				if col.isAutoIncr {
+					s.WriteString(fmt.Sprintf(" %s", m.Dialect.AutoIncrStr()))
+				}
+
+				x++
+			}
+		}
+		if len(table.keys) > 1 {
+			s.WriteString(", primary key (")
+			for x := range table.keys {
+				if x > 0 {
+					s.WriteString(", ")
+				}
+				s.WriteString(m.Dialect.QuoteField(table.keys[x].ColumnName))
+			}
+			s.WriteString(")")
+		}
+		if len(table.uniqueTogether) > 0 {
+			for _, columns := range table.uniqueTogether {
+				s.WriteString(", unique (")
+				for i, column := range columns {
+					if i > 0 {
+						s.WriteString(", ")
+					}
+					s.WriteString(m.Dialect.QuoteField(column))
+				}
+				s.WriteString(")")
+			}
+		}
+		s.WriteString(") ")
+		s.WriteString(m.Dialect.CreateTableSuffix())
+		s.WriteString(m.Dialect.QuerySuffix())
+		_, err = m.Exec(s.String())
+		if err != nil {
+			break
+		}
+	}
+	return err
+}
+
+// DropTable drops an individual table.  Will throw an error
+// if the table does not exist.
+func (m *DbMap) DropTable(table interface{}) error {
+	t := reflect.TypeOf(table)
+	return m.dropTable(t, false)
+}
+
+// DropTable drops an individual table.  Will NOT throw an error
+// if the table does not exist.
+func (m *DbMap) DropTableIfExists(table interface{}) error {
+	t := reflect.TypeOf(table)
+	return m.dropTable(t, true)
+}
+
+// DropTables iterates through TableMaps registered to this DbMap and
+// executes "drop table" statements against the database for each.
+func (m *DbMap) DropTables() error {
+	return m.dropTables(false)
+}
+
+// DropTablesIfExists is the same as DropTables, but uses the "if exists" clause to
+// avoid errors for tables that do not exist.
+func (m *DbMap) DropTablesIfExists() error {
+	return m.dropTables(true)
+}
+
+// Goes through all the registered tables, dropping them one by one.
+// If an error is encountered, then it is returned and the rest of
+// the tables are not dropped.
+func (m *DbMap) dropTables(addIfExists bool) (err error) {
+	for _, table := range m.tables {
+		err = m.dropTableImpl(table, addIfExists)
+		if err != nil {
+			return
+		}
+	}
+	return err
+}
+
+// Implementation of dropping a single table.
+func (m *DbMap) dropTable(t reflect.Type, addIfExists bool) error {
+	table := tableOrNil(m, t)
+	if table == nil {
+		return errors.New(fmt.Sprintf("table %s was not registered!", table.TableName))
+	}
+
+	return m.dropTableImpl(table, addIfExists)
+}
+
+func (m *DbMap) dropTableImpl(table *TableMap, ifExists bool) (err error) {
+	tableDrop := "drop table"
+	if ifExists {
+		tableDrop = m.Dialect.IfTableExists(tableDrop, table.SchemaName, table.TableName)
+	}
+	_, err = m.Exec(fmt.Sprintf("%s %s;", tableDrop, m.Dialect.QuotedTableForQuery(table.SchemaName, table.TableName)))
+	return err
+}
+
+// TruncateTables iterates through TableMaps registered to this DbMap and
+// executes "truncate table" statements against the database for each, or in the case of
+// sqlite, a "delete from" with no "where" clause, which uses the truncate optimization
+// (http://www.sqlite.org/lang_delete.html)
+func (m *DbMap) TruncateTables() error {
+	var err error
+	for i := range m.tables {
+		table := m.tables[i]
+		_, e := m.Exec(fmt.Sprintf("%s %s;", m.Dialect.TruncateClause(), m.Dialect.QuotedTableForQuery(table.SchemaName, table.TableName)))
+		if e != nil {
+			err = e
+		}
+	}
+	return err
+}
+
+// Insert runs a SQL INSERT statement for each element in list.  List
+// items must be pointers.
+//
+// Any interface whose TableMap has an auto-increment primary key will
+// have its last insert id bound to the PK field on the struct.
+//
+// The hook functions PreInsert() and/or PostInsert() will be executed
+// before/after the INSERT statement if the interface defines them.
+//
+// Panics if any interface in the list has not been registered with AddTable
+func (m *DbMap) Insert(list ...interface{}) error {
+	return insert(m, m, list...)
+}
+
+// Update runs a SQL UPDATE statement for each element in list.  List
+// items must be pointers.
+//
+// The hook functions PreUpdate() and/or PostUpdate() will be executed
+// before/after the UPDATE statement if the interface defines them.
+//
+// Returns the number of rows updated.
+//
+// Returns an error if SetKeys has not been called on the TableMap
+// Panics if any interface in the list has not been registered with AddTable
+func (m *DbMap) Update(list ...interface{}) (int64, error) {
+	return update(m, m, list...)
+}
+
+// Delete runs a SQL DELETE statement for each element in list.  List
+// items must be pointers.
+//
+// The hook functions PreDelete() and/or PostDelete() will be executed
+// before/after the DELETE statement if the interface defines them.
+//
+// Returns the number of rows deleted.
+//
+// Returns an error if SetKeys has not been called on the TableMap
+// Panics if any interface in the list has not been registered with AddTable
+func (m *DbMap) Delete(list ...interface{}) (int64, error) {
+	return delete(m, m, list...)
+}
+
+// Get runs a SQL SELECT to fetch a single row from the table based on the
+// primary key(s)
+//
+// i should be an empty value for the struct to load.  keys should be
+// the primary key value(s) for the row to load.  If multiple keys
+// exist on the table, the order should match the column order
+// specified in SetKeys() when the table mapping was defined.
+//
+// The hook function PostGet() will be executed after the SELECT
+// statement if the interface defines them.
+//
+// Returns a pointer to a struct that matches or nil if no row is found.
+//
+// Returns an error if SetKeys has not been called on the TableMap
+// Panics if any interface in the list has not been registered with AddTable
+func (m *DbMap) Get(i interface{}, keys ...interface{}) (interface{}, error) {
+	return get(m, m, i, keys...)
+}
+
+// Select runs an arbitrary SQL query, binding the columns in the result
+// to fields on the struct specified by i.  args represent the bind
+// parameters for the SQL statement.
+//
+// Column names on the SELECT statement should be aliased to the field names
+// on the struct i. Returns an error if one or more columns in the result
+// do not match.  It is OK if fields on i are not part of the SQL
+// statement.
+//
+// The hook function PostGet() will be executed after the SELECT
+// statement if the interface defines them.
+//
+// Values are returned in one of two ways:
+// 1. If i is a struct or a pointer to a struct, returns a slice of pointers to
+// matching rows of type i.
+// 2. If i is a pointer to a slice, the results will be appended to that slice
+// and nil returned.
+//
+// i does NOT need to be registered with AddTable()
+func (m *DbMap) Select(i interface{}, query string, args ...interface{}) ([]interface{}, error) {
+	return hookedselect(m, m, i, query, args...)
+}
+
+// Exec runs an arbitrary SQL statement.  args represent the bind parameters.
+// This is equivalent to running:  Exec() using database/sql
+func (m *DbMap) Exec(query string, args ...interface{}) (sql.Result, error) {
+	m.trace(query, args...)
+	return m.Db.Exec(query, args...)
+}
+
+// SelectInt is a convenience wrapper around the gorp.SelectInt function
+func (m *DbMap) SelectInt(query string, args ...interface{}) (int64, error) {
+	return SelectInt(m, query, args...)
+}
+
+// SelectNullInt is a convenience wrapper around the gorp.SelectNullInt function
+func (m *DbMap) SelectNullInt(query string, args ...interface{}) (sql.NullInt64, error) {
+	return SelectNullInt(m, query, args...)
+}
+
+// SelectFloat is a convenience wrapper around the gorp.SelectFlot function
+func (m *DbMap) SelectFloat(query string, args ...interface{}) (float64, error) {
+	return SelectFloat(m, query, args...)
+}
+
+// SelectNullFloat is a convenience wrapper around the gorp.SelectNullFloat function
+func (m *DbMap) SelectNullFloat(query string, args ...interface{}) (sql.NullFloat64, error) {
+	return SelectNullFloat(m, query, args...)
+}
+
+// SelectStr is a convenience wrapper around the gorp.SelectStr function
+func (m *DbMap) SelectStr(query string, args ...interface{}) (string, error) {
+	return SelectStr(m, query, args...)
+}
+
+// SelectNullStr is a convenience wrapper around the gorp.SelectNullStr function
+func (m *DbMap) SelectNullStr(query string, args ...interface{}) (sql.NullString, error) {
+	return SelectNullStr(m, query, args...)
+}
+
+// SelectOne is a convenience wrapper around the gorp.SelectOne function
+func (m *DbMap) SelectOne(holder interface{}, query string, args ...interface{}) error {
+	return SelectOne(m, m, holder, query, args...)
+}
+
+// Begin starts a gorp Transaction
+func (m *DbMap) Begin() (*Transaction, error) {
+	m.trace("begin;")
+	tx, err := m.Db.Begin()
+	if err != nil {
+		return nil, err
+	}
+	return &Transaction{m, tx, false}, nil
+}
+
+// TableFor returns the *TableMap corresponding to the given Go Type
+// If no table is mapped to that type an error is returned.
+// If checkPK is true and the mapped table has no registered PKs, an error is returned.
+func (m *DbMap) TableFor(t reflect.Type, checkPK bool) (*TableMap, error) {
+	table := tableOrNil(m, t)
+	if table == nil {
+		return nil, errors.New(fmt.Sprintf("No table found for type: %v", t.Name()))
+	}
+
+	if checkPK && len(table.keys) < 1 {
+		e := fmt.Sprintf("gorp: No keys defined for table: %s",
+			table.TableName)
+		return nil, errors.New(e)
+	}
+
+	return table, nil
+}
+
+// Prepare creates a prepared statement for later queries or executions.
+// Multiple queries or executions may be run concurrently from the returned statement.
+// This is equivalent to running:  Prepare() using database/sql
+func (m *DbMap) Prepare(query string) (*sql.Stmt, error) {
+	m.trace(query, nil)
+	return m.Db.Prepare(query)
+}
+
+func tableOrNil(m *DbMap, t reflect.Type) *TableMap {
+	for i := range m.tables {
+		table := m.tables[i]
+		if table.gotype == t {
+			return table
+		}
+	}
+	return nil
+}
+
+func (m *DbMap) tableForPointer(ptr interface{}, checkPK bool) (*TableMap, reflect.Value, error) {
+	ptrv := reflect.ValueOf(ptr)
+	if ptrv.Kind() != reflect.Ptr {
+		e := fmt.Sprintf("gorp: passed non-pointer: %v (kind=%v)", ptr,
+			ptrv.Kind())
+		return nil, reflect.Value{}, errors.New(e)
+	}
+	elem := ptrv.Elem()
+	etype := reflect.TypeOf(elem.Interface())
+	t, err := m.TableFor(etype, checkPK)
+	if err != nil {
+		return nil, reflect.Value{}, err
+	}
+
+	return t, elem, nil
+}
+
+func (m *DbMap) queryRow(query string, args ...interface{}) *sql.Row {
+	m.trace(query, args...)
+	return m.Db.QueryRow(query, args...)
+}
+
+func (m *DbMap) query(query string, args ...interface{}) (*sql.Rows, error) {
+	m.trace(query, args...)
+	return m.Db.Query(query, args...)
+}
+
+func (m *DbMap) trace(query string, args ...interface{}) {
+	if m.logger != nil {
+		var margs = argsString(args...)
+		m.logger.Printf("%s%s [%s]", m.logPrefix, query, margs)
+	}
+}
+
+func argsString(args ...interface{}) string {
+	var margs string
+	for i, a := range args {
+		var v interface{} = a
+		if x, ok := v.(driver.Valuer); ok {
+			y, err := x.Value()
+			if err == nil {
+				v = y
+			}
+		}
+		switch v.(type) {
+		case string:
+			v = fmt.Sprintf("%q", v)
+		default:
+			v = fmt.Sprintf("%v", v)
+		}
+		margs += fmt.Sprintf("%d:%s", i+1, v)
+		if i+1 < len(args) {
+			margs += " "
+		}
+	}
+	return margs
+}
+
+///////////////
+
+// Insert has the same behavior as DbMap.Insert(), but runs in a transaction.
+func (t *Transaction) Insert(list ...interface{}) error {
+	return insert(t.dbmap, t, list...)
+}
+
+// Update had the same behavior as DbMap.Update(), but runs in a transaction.
+func (t *Transaction) Update(list ...interface{}) (int64, error) {
+	return update(t.dbmap, t, list...)
+}
+
+// Delete has the same behavior as DbMap.Delete(), but runs in a transaction.
+func (t *Transaction) Delete(list ...interface{}) (int64, error) {
+	return delete(t.dbmap, t, list...)
+}
+
+// Get has the same behavior as DbMap.Get(), but runs in a transaction.
+func (t *Transaction) Get(i interface{}, keys ...interface{}) (interface{}, error) {
+	return get(t.dbmap, t, i, keys...)
+}
+
+// Select has the same behavior as DbMap.Select(), but runs in a transaction.
+func (t *Transaction) Select(i interface{}, query string, args ...interface{}) ([]interface{}, error) {
+	return hookedselect(t.dbmap, t, i, query, args...)
+}
+
+// Exec has the same behavior as DbMap.Exec(), but runs in a transaction.
+func (t *Transaction) Exec(query string, args ...interface{}) (sql.Result, error) {
+	t.dbmap.trace(query, args...)
+	return t.tx.Exec(query, args...)
+}
+
+// SelectInt is a convenience wrapper around the gorp.SelectInt function.
+func (t *Transaction) SelectInt(query string, args ...interface{}) (int64, error) {
+	return SelectInt(t, query, args...)
+}
+
+// SelectNullInt is a convenience wrapper around the gorp.SelectNullInt function.
+func (t *Transaction) SelectNullInt(query string, args ...interface{}) (sql.NullInt64, error) {
+	return SelectNullInt(t, query, args...)
+}
+
+// SelectFloat is a convenience wrapper around the gorp.SelectFloat function.
+func (t *Transaction) SelectFloat(query string, args ...interface{}) (float64, error) {
+	return SelectFloat(t, query, args...)
+}
+
+// SelectNullFloat is a convenience wrapper around the gorp.SelectNullFloat function.
+func (t *Transaction) SelectNullFloat(query string, args ...interface{}) (sql.NullFloat64, error) {
+	return SelectNullFloat(t, query, args...)
+}
+
+// SelectStr is a convenience wrapper around the gorp.SelectStr function.
+func (t *Transaction) SelectStr(query string, args ...interface{}) (string, error) {
+	return SelectStr(t, query, args...)
+}
+
+// SelectNullStr is a convenience wrapper around the gorp.SelectNullStr function.
+func (t *Transaction) SelectNullStr(query string, args ...interface{}) (sql.NullString, error) {
+	return SelectNullStr(t, query, args...)
+}
+
+// SelectOne is a convenience wrapper around the gorp.SelectOne function.
+func (t *Transaction) SelectOne(holder interface{}, query string, args ...interface{}) error {
+	return SelectOne(t.dbmap, t, holder, query, args...)
+}
+
+// Commit commits the underlying database transaction.
+func (t *Transaction) Commit() error {
+	if !t.closed {
+		t.closed = true
+		t.dbmap.trace("commit;")
+		return t.tx.Commit()
+	}
+
+	return sql.ErrTxDone
+}
+
+// Rollback rolls back the underlying database transaction.
+func (t *Transaction) Rollback() error {
+	if !t.closed {
+		t.closed = true
+		t.dbmap.trace("rollback;")
+		return t.tx.Rollback()
+	}
+
+	return sql.ErrTxDone
+}
+
+// Savepoint creates a savepoint with the given name. The name is interpolated
+// directly into the SQL SAVEPOINT statement, so you must sanitize it if it is
+// derived from user input.
+func (t *Transaction) Savepoint(name string) error {
+	query := "savepoint " + t.dbmap.Dialect.QuoteField(name)
+	t.dbmap.trace(query, nil)
+	_, err := t.tx.Exec(query)
+	return err
+}
+
+// RollbackToSavepoint rolls back to the savepoint with the given name. The
+// name is interpolated directly into the SQL SAVEPOINT statement, so you must
+// sanitize it if it is derived from user input.
+func (t *Transaction) RollbackToSavepoint(savepoint string) error {
+	query := "rollback to savepoint " + t.dbmap.Dialect.QuoteField(savepoint)
+	t.dbmap.trace(query, nil)
+	_, err := t.tx.Exec(query)
+	return err
+}
+
+// ReleaseSavepint releases the savepoint with the given name. The name is
+// interpolated directly into the SQL SAVEPOINT statement, so you must sanitize
+// it if it is derived from user input.
+func (t *Transaction) ReleaseSavepoint(savepoint string) error {
+	query := "release savepoint " + t.dbmap.Dialect.QuoteField(savepoint)
+	t.dbmap.trace(query, nil)
+	_, err := t.tx.Exec(query)
+	return err
+}
+
+// Prepare has the same behavior as DbMap.Prepare(), but runs in a transaction.
+func (t *Transaction) Prepare(query string) (*sql.Stmt, error) {
+	t.dbmap.trace(query, nil)
+	return t.tx.Prepare(query)
+}
+
+func (t *Transaction) queryRow(query string, args ...interface{}) *sql.Row {
+	t.dbmap.trace(query, args...)
+	return t.tx.QueryRow(query, args...)
+}
+
+func (t *Transaction) query(query string, args ...interface{}) (*sql.Rows, error) {
+	t.dbmap.trace(query, args...)
+	return t.tx.Query(query, args...)
+}
+
+///////////////
+
+// SelectInt executes the given query, which should be a SELECT statement for a single
+// integer column, and returns the value of the first row returned.  If no rows are
+// found, zero is returned.
+func SelectInt(e SqlExecutor, query string, args ...interface{}) (int64, error) {
+	var h int64
+	err := selectVal(e, &h, query, args...)
+	if err != nil && err != sql.ErrNoRows {
+		return 0, err
+	}
+	return h, nil
+}
+
+// SelectNullInt executes the given query, which should be a SELECT statement for a single
+// integer column, and returns the value of the first row returned.  If no rows are
+// found, the empty sql.NullInt64 value is returned.
+func SelectNullInt(e SqlExecutor, query string, args ...interface{}) (sql.NullInt64, error) {
+	var h sql.NullInt64
+	err := selectVal(e, &h, query, args...)
+	if err != nil && err != sql.ErrNoRows {
+		return h, err
+	}
+	return h, nil
+}
+
+// SelectFloat executes the given query, which should be a SELECT statement for a single
+// float column, and returns the value of the first row returned. If no rows are
+// found, zero is returned.
+func SelectFloat(e SqlExecutor, query string, args ...interface{}) (float64, error) {
+	var h float64
+	err := selectVal(e, &h, query, args...)
+	if err != nil && err != sql.ErrNoRows {
+		return 0, err
+	}
+	return h, nil
+}
+
+// SelectNullFloat executes the given query, which should be a SELECT statement for a single
+// float column, and returns the value of the first row returned. If no rows are
+// found, the empty sql.NullInt64 value is returned.
+func SelectNullFloat(e SqlExecutor, query string, args ...interface{}) (sql.NullFloat64, error) {
+	var h sql.NullFloat64
+	err := selectVal(e, &h, query, args...)
+	if err != nil && err != sql.ErrNoRows {
+		return h, err
+	}
+	return h, nil
+}
+
+// SelectStr executes the given query, which should be a SELECT statement for a single
+// char/varchar column, and returns the value of the first row returned.  If no rows are
+// found, an empty string is returned.
+func SelectStr(e SqlExecutor, query string, args ...interface{}) (string, error) {
+	var h string
+	err := selectVal(e, &h, query, args...)
+	if err != nil && err != sql.ErrNoRows {
+		return "", err
+	}
+	return h, nil
+}
+
+// SelectNullStr executes the given query, which should be a SELECT
+// statement for a single char/varchar column, and returns the value
+// of the first row returned.  If no rows are found, the empty
+// sql.NullString is returned.
+func SelectNullStr(e SqlExecutor, query string, args ...interface{}) (sql.NullString, error) {
+	var h sql.NullString
+	err := selectVal(e, &h, query, args...)
+	if err != nil && err != sql.ErrNoRows {
+		return h, err
+	}
+	return h, nil
+}
+
+// SelectOne executes the given query (which should be a SELECT statement)
+// and binds the result to holder, which must be a pointer.
+//
+// If no row is found, an error (sql.ErrNoRows specifically) will be returned
+//
+// If more than one row is found, an error will be returned.
+//
+func SelectOne(m *DbMap, e SqlExecutor, holder interface{}, query string, args ...interface{}) error {
+	t := reflect.TypeOf(holder)
+	if t.Kind() == reflect.Ptr {
+		t = t.Elem()
+	} else {
+		return fmt.Errorf("gorp: SelectOne holder must be a pointer, but got: %t", holder)
+	}
+
+	// Handle pointer to pointer
+	isptr := false
+	if t.Kind() == reflect.Ptr {
+		isptr = true
+		t = t.Elem()
+	}
+
+	if t.Kind() == reflect.Struct {
+		var nonFatalErr error
+
+		list, err := hookedselect(m, e, holder, query, args...)
+		if err != nil {
+			if !NonFatalError(err) {
+				return err
+			}
+			nonFatalErr = err
+		}
+
+		dest := reflect.ValueOf(holder)
+		if isptr {
+			dest = dest.Elem()
+		}
+
+		if list != nil && len(list) > 0 {
+			// check for multiple rows
+			if len(list) > 1 {
+				return fmt.Errorf("gorp: multiple rows returned for: %s - %v", query, args)
+			}
+
+			// Initialize if nil
+			if dest.IsNil() {
+				dest.Set(reflect.New(t))
+			}
+
+			// only one row found
+			src := reflect.ValueOf(list[0])
+			dest.Elem().Set(src.Elem())
+		} else {
+			// No rows found, return a proper error.
+			return sql.ErrNoRows
+		}
+
+		return nonFatalErr
+	}
+
+	return selectVal(e, holder, query, args...)
+}
+
+func selectVal(e SqlExecutor, holder interface{}, query string, args ...interface{}) error {
+	if len(args) == 1 {
+		switch m := e.(type) {
+		case *DbMap:
+			query, args = maybeExpandNamedQuery(m, query, args)
+		case *Transaction:
+			query, args = maybeExpandNamedQuery(m.dbmap, query, args)
+		}
+	}
+	rows, err := e.query(query, args...)
+	if err != nil {
+		return err
+	}
+	defer rows.Close()
+
+	if !rows.Next() {
+		return sql.ErrNoRows
+	}
+
+	return rows.Scan(holder)
+}
+
+///////////////
+
+func hookedselect(m *DbMap, exec SqlExecutor, i interface{}, query string,
+	args ...interface{}) ([]interface{}, error) {
+
+	var nonFatalErr error
+
+	list, err := rawselect(m, exec, i, query, args...)
+	if err != nil {
+		if !NonFatalError(err) {
+			return nil, err
+		}
+		nonFatalErr = err
+	}
+
+	// Determine where the results are: written to i, or returned in list
+	if t, _ := toSliceType(i); t == nil {
+		for _, v := range list {
+			if v, ok := v.(HasPostGet); ok {
+				err := v.PostGet(exec)
+				if err != nil {
+					return nil, err
+				}
+			}
+		}
+	} else {
+		resultsValue := reflect.Indirect(reflect.ValueOf(i))
+		for i := 0; i < resultsValue.Len(); i++ {
+			if v, ok := resultsValue.Index(i).Interface().(HasPostGet); ok {
+				err := v.PostGet(exec)
+				if err != nil {
+					return nil, err
+				}
+			}
+		}
+	}
+	return list, nonFatalErr
+}
+
+func rawselect(m *DbMap, exec SqlExecutor, i interface{}, query string,
+	args ...interface{}) ([]interface{}, error) {
+	var (
+		appendToSlice   = false // Write results to i directly?
+		intoStruct      = true  // Selecting into a struct?
+		pointerElements = true  // Are the slice elements pointers (vs values)?
+	)
+
+	var nonFatalErr error
+
+	// get type for i, verifying it's a supported destination
+	t, err := toType(i)
+	if err != nil {
+		var err2 error
+		if t, err2 = toSliceType(i); t == nil {
+			if err2 != nil {
+				return nil, err2
+			}
+			return nil, err
+		}
+		pointerElements = t.Kind() == reflect.Ptr
+		if pointerElements {
+			t = t.Elem()
+		}
+		appendToSlice = true
+		intoStruct = t.Kind() == reflect.Struct
+	}
+
+	// If the caller supplied a single struct/map argument, assume a "named
+	// parameter" query.  Extract the named arguments from the struct/map, create
+	// the flat arg slice, and rewrite the query to use the dialect's placeholder.
+	if len(args) == 1 {
+		query, args = maybeExpandNamedQuery(m, query, args)
+	}
+
+	// Run the query
+	rows, err := exec.query(query, args...)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	// Fetch the column names as returned from db
+	cols, err := rows.Columns()
+	if err != nil {
+		return nil, err
+	}
+
+	if !intoStruct && len(cols) > 1 {
+		return nil, fmt.Errorf("gorp: select into non-struct slice requires 1 column, got %d", len(cols))
+	}
+
+	var colToFieldIndex [][]int
+	if intoStruct {
+		if colToFieldIndex, err = columnToFieldIndex(m, t, cols); err != nil {
+			if !NonFatalError(err) {
+				return nil, err
+			}
+			nonFatalErr = err
+		}
+	}
+
+	conv := m.TypeConverter
+
+	// Add results to one of these two slices.
+	var (
+		list       = make([]interface{}, 0)
+		sliceValue = reflect.Indirect(reflect.ValueOf(i))
+	)
+
+	for {
+		if !rows.Next() {
+			// if error occured return rawselect
+			if rows.Err() != nil {
+				return nil, rows.Err()
+			}
+			// time to exit from outer "for" loop
+			break
+		}
+		v := reflect.New(t)
+		dest := make([]interface{}, len(cols))
+
+		custScan := make([]CustomScanner, 0)
+
+		for x := range cols {
+			f := v.Elem()
+			if intoStruct {
+				index := colToFieldIndex[x]
+				if index == nil {
+					// this field is not present in the struct, so create a dummy
+					// value for rows.Scan to scan into
+					var dummy sql.RawBytes
+					dest[x] = &dummy
+					continue
+				}
+				f = f.FieldByIndex(index)
+			}
+			target := f.Addr().Interface()
+			if conv != nil {
+				scanner, ok := conv.FromDb(target)
+				if ok {
+					target = scanner.Holder
+					custScan = append(custScan, scanner)
+				}
+			}
+			dest[x] = target
+		}
+
+		err = rows.Scan(dest...)
+		if err != nil {
+			return nil, err
+		}
+
+		for _, c := range custScan {
+			err = c.Bind()
+			if err != nil {
+				return nil, err
+			}
+		}
+
+		if appendToSlice {
+			if !pointerElements {
+				v = v.Elem()
+			}
+			sliceValue.Set(reflect.Append(sliceValue, v))
+		} else {
+			list = append(list, v.Interface())
+		}
+	}
+
+	if appendToSlice && sliceValue.IsNil() {
+		sliceValue.Set(reflect.MakeSlice(sliceValue.Type(), 0, 0))
+	}
+
+	return list, nonFatalErr
+}
+
+// maybeExpandNamedQuery checks the given arg to see if it's eligible to be used
+// as input to a named query.  If so, it rewrites the query to use
+// dialect-dependent bindvars and instantiates the corresponding slice of
+// parameters by extracting data from the map / struct.
+// If not, returns the input values unchanged.
+func maybeExpandNamedQuery(m *DbMap, query string, args []interface{}) (string, []interface{}) {
+	arg := reflect.ValueOf(args[0])
+	for arg.Kind() == reflect.Ptr {
+		arg = arg.Elem()
+	}
+	switch {
+	case arg.Kind() == reflect.Map && arg.Type().Key().Kind() == reflect.String:
+		return expandNamedQuery(m, query, func(key string) reflect.Value {
+			return arg.MapIndex(reflect.ValueOf(key))
+		})
+		// #84 - ignore time.Time structs here - there may be a cleaner way to do this
+	case arg.Kind() == reflect.Struct && !(arg.Type().PkgPath() == "time" && arg.Type().Name() == "Time"):
+		return expandNamedQuery(m, query, arg.FieldByName)
+	}
+	return query, args
+}
+
+var keyRegexp = regexp.MustCompile(`:[[:word:]]+`)
+
+// expandNamedQuery accepts a query with placeholders of the form ":key", and a
+// single arg of Kind Struct or Map[string].  It returns the query with the
+// dialect's placeholders, and a slice of args ready for positional insertion
+// into the query.
+func expandNamedQuery(m *DbMap, query string, keyGetter func(key string) reflect.Value) (string, []interface{}) {
+	var (
+		n    int
+		args []interface{}
+	)
+	return keyRegexp.ReplaceAllStringFunc(query, func(key string) string {
+		val := keyGetter(key[1:])
+		if !val.IsValid() {
+			return key
+		}
+		args = append(args, val.Interface())
+		newVar := m.Dialect.BindVar(n)
+		n++
+		return newVar
+	}), args
+}
+
+func columnToFieldIndex(m *DbMap, t reflect.Type, cols []string) ([][]int, error) {
+	colToFieldIndex := make([][]int, len(cols))
+
+	// check if type t is a mapped table - if so we'll
+	// check the table for column aliasing below
+	tableMapped := false
+	table := tableOrNil(m, t)
+	if table != nil {
+		tableMapped = true
+	}
+
+	// Loop over column names and find field in i to bind to
+	// based on column name. all returned columns must match
+	// a field in the i struct
+	missingColNames := []string{}
+	for x := range cols {
+		colName := strings.ToLower(cols[x])
+		field, found := t.FieldByNameFunc(func(fieldName string) bool {
+			field, _ := t.FieldByName(fieldName)
+			fieldName = field.Tag.Get("db")
+
+			if fieldName == "-" {
+				return false
+			} else if fieldName == "" {
+				fieldName = field.Name
+			}
+			if tableMapped {
+				colMap := colMapOrNil(table, fieldName)
+				if colMap != nil {
+					fieldName = colMap.ColumnName
+				}
+			}
+			return colName == strings.ToLower(fieldName)
+		})
+		if found {
+			colToFieldIndex[x] = field.Index
+		}
+		if colToFieldIndex[x] == nil {
+			missingColNames = append(missingColNames, colName)
+		}
+	}
+	if len(missingColNames) > 0 {
+		return colToFieldIndex, &NoFieldInTypeError{
+			TypeName:        t.Name(),
+			MissingColNames: missingColNames,
+		}
+	}
+	return colToFieldIndex, nil
+}
+
+func fieldByName(val reflect.Value, fieldName string) *reflect.Value {
+	// try to find field by exact match
+	f := val.FieldByName(fieldName)
+
+	if f != zeroVal {
+		return &f
+	}
+
+	// try to find by case insensitive match - only the Postgres driver
+	// seems to require this - in the case where columns are aliased in the sql
+	fieldNameL := strings.ToLower(fieldName)
+	fieldCount := val.NumField()
+	t := val.Type()
+	for i := 0; i < fieldCount; i++ {
+		sf := t.Field(i)
+		if strings.ToLower(sf.Name) == fieldNameL {
+			f := val.Field(i)
+			return &f
+		}
+	}
+
+	return nil
+}
+
+// toSliceType returns the element type of the given object, if the object is a
+// "*[]*Element" or "*[]Element". If not, returns nil.
+// err is returned if the user was trying to pass a pointer-to-slice but failed.
+func toSliceType(i interface{}) (reflect.Type, error) {
+	t := reflect.TypeOf(i)
+	if t.Kind() != reflect.Ptr {
+		// If it's a slice, return a more helpful error message
+		if t.Kind() == reflect.Slice {
+			return nil, fmt.Errorf("gorp: Cannot SELECT into a non-pointer slice: %v", t)
+		}
+		return nil, nil
+	}
+	if t = t.Elem(); t.Kind() != reflect.Slice {
+		return nil, nil
+	}
+	return t.Elem(), nil
+}
+
+func toType(i interface{}) (reflect.Type, error) {
+	t := reflect.TypeOf(i)
+
+	// If a Pointer to a type, follow
+	for t.Kind() == reflect.Ptr {
+		t = t.Elem()
+	}
+
+	if t.Kind() != reflect.Struct {
+		return nil, fmt.Errorf("gorp: Cannot SELECT into this type: %v", reflect.TypeOf(i))
+	}
+	return t, nil
+}
+
+func get(m *DbMap, exec SqlExecutor, i interface{},
+	keys ...interface{}) (interface{}, error) {
+
+	t, err := toType(i)
+	if err != nil {
+		return nil, err
+	}
+
+	table, err := m.TableFor(t, true)
+	if err != nil {
+		return nil, err
+	}
+
+	plan := table.bindGet()
+
+	v := reflect.New(t)
+	dest := make([]interface{}, len(plan.argFields))
+
+	conv := m.TypeConverter
+	custScan := make([]CustomScanner, 0)
+
+	for x, fieldName := range plan.argFields {
+		f := v.Elem().FieldByName(fieldName)
+		target := f.Addr().Interface()
+		if conv != nil {
+			scanner, ok := conv.FromDb(target)
+			if ok {
+				target = scanner.Holder
+				custScan = append(custScan, scanner)
+			}
+		}
+		dest[x] = target
+	}
+
+	row := exec.queryRow(plan.query, keys...)
+	err = row.Scan(dest...)
+	if err != nil {
+		if err == sql.ErrNoRows {
+			err = nil
+		}
+		return nil, err
+	}
+
+	for _, c := range custScan {
+		err = c.Bind()
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	if v, ok := v.Interface().(HasPostGet); ok {
+		err := v.PostGet(exec)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return v.Interface(), nil
+}
+
+func delete(m *DbMap, exec SqlExecutor, list ...interface{}) (int64, error) {
+	count := int64(0)
+	for _, ptr := range list {
+		table, elem, err := m.tableForPointer(ptr, true)
+		if err != nil {
+			return -1, err
+		}
+
+		eval := elem.Addr().Interface()
+		if v, ok := eval.(HasPreDelete); ok {
+			err = v.PreDelete(exec)
+			if err != nil {
+				return -1, err
+			}
+		}
+
+		bi, err := table.bindDelete(elem)
+		if err != nil {
+			return -1, err
+		}
+
+		res, err := exec.Exec(bi.query, bi.args...)
+		if err != nil {
+			return -1, err
+		}
+		rows, err := res.RowsAffected()
+		if err != nil {
+			return -1, err
+		}
+
+		if rows == 0 && bi.existingVersion > 0 {
+			return lockError(m, exec, table.TableName,
+				bi.existingVersion, elem, bi.keys...)
+		}
+
+		count += rows
+
+		if v, ok := eval.(HasPostDelete); ok {
+			err := v.PostDelete(exec)
+			if err != nil {
+				return -1, err
+			}
+		}
+	}
+
+	return count, nil
+}
+
+func update(m *DbMap, exec SqlExecutor, list ...interface{}) (int64, error) {
+	count := int64(0)
+	for _, ptr := range list {
+		table, elem, err := m.tableForPointer(ptr, true)
+		if err != nil {
+			return -1, err
+		}
+
+		eval := elem.Addr().Interface()
+		if v, ok := eval.(HasPreUpdate); ok {
+			err = v.PreUpdate(exec)
+			if err != nil {
+				return -1, err
+			}
+		}
+
+		bi, err := table.bindUpdate(elem)
+		if err != nil {
+			return -1, err
+		}
+
+		res, err := exec.Exec(bi.query, bi.args...)
+		if err != nil {
+			return -1, err
+		}
+
+		rows, err := res.RowsAffected()
+		if err != nil {
+			return -1, err
+		}
+
+		if rows == 0 && bi.existingVersion > 0 {
+			return lockError(m, exec, table.TableName,
+				bi.existingVersion, elem, bi.keys...)
+		}
+
+		if bi.versField != "" {
+			elem.FieldByName(bi.versField).SetInt(bi.existingVersion + 1)
+		}
+
+		count += rows
+
+		if v, ok := eval.(HasPostUpdate); ok {
+			err = v.PostUpdate(exec)
+			if err != nil {
+				return -1, err
+			}
+		}
+	}
+	return count, nil
+}
+
+func insert(m *DbMap, exec SqlExecutor, list ...interface{}) error {
+	for _, ptr := range list {
+		table, elem, err := m.tableForPointer(ptr, false)
+		if err != nil {
+			return err
+		}
+
+		eval := elem.Addr().Interface()
+		if v, ok := eval.(HasPreInsert); ok {
+			err := v.PreInsert(exec)
+			if err != nil {
+				return err
+			}
+		}
+
+		bi, err := table.bindInsert(elem)
+		if err != nil {
+			return err
+		}
+
+		if bi.autoIncrIdx > -1 {
+			f := elem.FieldByName(bi.autoIncrFieldName)
+			switch inserter := m.Dialect.(type) {
+			case IntegerAutoIncrInserter:
+				id, err := inserter.InsertAutoIncr(exec, bi.query, bi.args...)
+				if err != nil {
+					return err
+				}
+				k := f.Kind()
+				if (k == reflect.Int) || (k == reflect.Int16) || (k == reflect.Int32) || (k == reflect.Int64) {
+					f.SetInt(id)
+				} else if (k == reflect.Uint) || (k == reflect.Uint16) || (k == reflect.Uint32) || (k == reflect.Uint64) {
+					f.SetUint(uint64(id))
+				} else {
+					return fmt.Errorf("gorp: Cannot set autoincrement value on non-Int field. SQL=%s  autoIncrIdx=%d autoIncrFieldName=%s", bi.query, bi.autoIncrIdx, bi.autoIncrFieldName)
+				}
+			case TargetedAutoIncrInserter:
+				err := inserter.InsertAutoIncrToTarget(exec, bi.query, f.Addr().Interface(), bi.args...)
+				if err != nil {
+					return err
+				}
+			default:
+				return fmt.Errorf("gorp: Cannot use autoincrement fields on dialects that do not implement an autoincrementing interface")
+			}
+		} else {
+			_, err := exec.Exec(bi.query, bi.args...)
+			if err != nil {
+				return err
+			}
+		}
+
+		if v, ok := eval.(HasPostInsert); ok {
+			err := v.PostInsert(exec)
+			if err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
+func lockError(m *DbMap, exec SqlExecutor, tableName string,
+	existingVer int64, elem reflect.Value,
+	keys ...interface{}) (int64, error) {
+
+	existing, err := get(m, exec, elem.Interface(), keys...)
+	if err != nil {
+		return -1, err
+	}
+
+	ole := OptimisticLockError{tableName, keys, true, existingVer}
+	if existing == nil {
+		ole.RowExists = false
+	}
+	return -1, ole
+}
+
+// PostUpdate() will be executed after the GET statement.
+type HasPostGet interface {
+	PostGet(SqlExecutor) error
+}
+
+// PostUpdate() will be executed after the DELETE statement
+type HasPostDelete interface {
+	PostDelete(SqlExecutor) error
+}
+
+// PostUpdate() will be executed after the UPDATE statement
+type HasPostUpdate interface {
+	PostUpdate(SqlExecutor) error
+}
+
+// PostInsert() will be executed after the INSERT statement
+type HasPostInsert interface {
+	PostInsert(SqlExecutor) error
+}
+
+// PreDelete() will be executed before the DELETE statement.
+type HasPreDelete interface {
+	PreDelete(SqlExecutor) error
+}
+
+// PreUpdate() will be executed before UPDATE statement.
+type HasPreUpdate interface {
+	PreUpdate(SqlExecutor) error
+}
+
+// PreInsert() will be executed before INSERT statement.
+type HasPreInsert interface {
+	PreInsert(SqlExecutor) error
+}
diff --git a/Godeps/_workspace/src/github.com/coopernurse/gorp/gorp_test.go b/Godeps/_workspace/src/github.com/coopernurse/gorp/gorp_test.go
new file mode 100644
index 00000000..55182371
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coopernurse/gorp/gorp_test.go
@@ -0,0 +1,2083 @@
+package gorp
+
+import (
+	"bytes"
+	"database/sql"
+	"encoding/json"
+	"errors"
+	"fmt"
+	_ "github.com/go-sql-driver/mysql"
+	_ "github.com/lib/pq"
+	_ "github.com/mattn/go-sqlite3"
+	_ "github.com/ziutek/mymysql/godrv"
+	"log"
+	"math/rand"
+	"os"
+	"reflect"
+	"strings"
+	"testing"
+	"time"
+)
+
+// verify interface compliance
+var _ Dialect = SqliteDialect{}
+var _ Dialect = PostgresDialect{}
+var _ Dialect = MySQLDialect{}
+var _ Dialect = SqlServerDialect{}
+var _ Dialect = OracleDialect{}
+
+type testable interface {
+	GetId() int64
+	Rand()
+}
+
+type Invoice struct {
+	Id       int64
+	Created  int64
+	Updated  int64
+	Memo     string
+	PersonId int64
+	IsPaid   bool
+}
+
+func (me *Invoice) GetId() int64 { return me.Id }
+func (me *Invoice) Rand() {
+	me.Memo = fmt.Sprintf("random %d", rand.Int63())
+	me.Created = rand.Int63()
+	me.Updated = rand.Int63()
+}
+
+type InvoiceTag struct {
+	Id       int64 `db:"myid"`
+	Created  int64 `db:"myCreated"`
+	Updated  int64 `db:"date_updated"`
+	Memo     string
+	PersonId int64 `db:"person_id"`
+	IsPaid   bool  `db:"is_Paid"`
+}
+
+func (me *InvoiceTag) GetId() int64 { return me.Id }
+func (me *InvoiceTag) Rand() {
+	me.Memo = fmt.Sprintf("random %d", rand.Int63())
+	me.Created = rand.Int63()
+	me.Updated = rand.Int63()
+}
+
+// See: https://github.com/coopernurse/gorp/issues/175
+type AliasTransientField struct {
+	Id     int64  `db:"id"`
+	Bar    int64  `db:"-"`
+	BarStr string `db:"bar"`
+}
+
+func (me *AliasTransientField) GetId() int64 { return me.Id }
+func (me *AliasTransientField) Rand() {
+	me.BarStr = fmt.Sprintf("random %d", rand.Int63())
+}
+
+type OverriddenInvoice struct {
+	Invoice
+	Id string
+}
+
+type Person struct {
+	Id      int64
+	Created int64
+	Updated int64
+	FName   string
+	LName   string
+	Version int64
+}
+
+type FNameOnly struct {
+	FName string
+}
+
+type InvoicePersonView struct {
+	InvoiceId     int64
+	PersonId      int64
+	Memo          string
+	FName         string
+	LegacyVersion int64
+}
+
+type TableWithNull struct {
+	Id      int64
+	Str     sql.NullString
+	Int64   sql.NullInt64
+	Float64 sql.NullFloat64
+	Bool    sql.NullBool
+	Bytes   []byte
+}
+
+type WithIgnoredColumn struct {
+	internal int64 `db:"-"`
+	Id       int64
+	Created  int64
+}
+
+type IdCreated struct {
+	Id      int64
+	Created int64
+}
+
+type IdCreatedExternal struct {
+	IdCreated
+	External int64
+}
+
+type WithStringPk struct {
+	Id   string
+	Name string
+}
+
+type CustomStringType string
+
+type TypeConversionExample struct {
+	Id         int64
+	PersonJSON Person
+	Name       CustomStringType
+}
+
+type PersonUInt32 struct {
+	Id   uint32
+	Name string
+}
+
+type PersonUInt64 struct {
+	Id   uint64
+	Name string
+}
+
+type PersonUInt16 struct {
+	Id   uint16
+	Name string
+}
+
+type WithEmbeddedStruct struct {
+	Id int64
+	Names
+}
+
+type WithEmbeddedStructBeforeAutoincrField struct {
+	Names
+	Id int64
+}
+
+type WithEmbeddedAutoincr struct {
+	WithEmbeddedStruct
+	MiddleName string
+}
+
+type Names struct {
+	FirstName string
+	LastName  string
+}
+
+type UniqueColumns struct {
+	FirstName string
+	LastName  string
+	City      string
+	ZipCode   int64
+}
+
+type SingleColumnTable struct {
+	SomeId string
+}
+
+type CustomDate struct {
+	time.Time
+}
+
+type WithCustomDate struct {
+	Id    int64
+	Added CustomDate
+}
+
+type testTypeConverter struct{}
+
+func (me testTypeConverter) ToDb(val interface{}) (interface{}, error) {
+
+	switch t := val.(type) {
+	case Person:
+		b, err := json.Marshal(t)
+		if err != nil {
+			return "", err
+		}
+		return string(b), nil
+	case CustomStringType:
+		return string(t), nil
+	case CustomDate:
+		return t.Time, nil
+	}
+
+	return val, nil
+}
+
+func (me testTypeConverter) FromDb(target interface{}) (CustomScanner, bool) {
+	switch target.(type) {
+	case *Person:
+		binder := func(holder, target interface{}) error {
+			s, ok := holder.(*string)
+			if !ok {
+				return errors.New("FromDb: Unable to convert Person to *string")
+			}
+			b := []byte(*s)
+			return json.Unmarshal(b, target)
+		}
+		return CustomScanner{new(string), target, binder}, true
+	case *CustomStringType:
+		binder := func(holder, target interface{}) error {
+			s, ok := holder.(*string)
+			if !ok {
+				return errors.New("FromDb: Unable to convert CustomStringType to *string")
+			}
+			st, ok := target.(*CustomStringType)
+			if !ok {
+				return errors.New(fmt.Sprint("FromDb: Unable to convert target to *CustomStringType: ", reflect.TypeOf(target)))
+			}
+			*st = CustomStringType(*s)
+			return nil
+		}
+		return CustomScanner{new(string), target, binder}, true
+	case *CustomDate:
+		binder := func(holder, target interface{}) error {
+			t, ok := holder.(*time.Time)
+			if !ok {
+				return errors.New("FromDb: Unable to convert CustomDate to *time.Time")
+			}
+			dateTarget, ok := target.(*CustomDate)
+			if !ok {
+				return errors.New(fmt.Sprint("FromDb: Unable to convert target to *CustomDate: ", reflect.TypeOf(target)))
+			}
+			dateTarget.Time = *t
+			return nil
+		}
+		return CustomScanner{new(time.Time), target, binder}, true
+	}
+
+	return CustomScanner{}, false
+}
+
+func (p *Person) PreInsert(s SqlExecutor) error {
+	p.Created = time.Now().UnixNano()
+	p.Updated = p.Created
+	if p.FName == "badname" {
+		return fmt.Errorf("Invalid name: %s", p.FName)
+	}
+	return nil
+}
+
+func (p *Person) PostInsert(s SqlExecutor) error {
+	p.LName = "postinsert"
+	return nil
+}
+
+func (p *Person) PreUpdate(s SqlExecutor) error {
+	p.FName = "preupdate"
+	return nil
+}
+
+func (p *Person) PostUpdate(s SqlExecutor) error {
+	p.LName = "postupdate"
+	return nil
+}
+
+func (p *Person) PreDelete(s SqlExecutor) error {
+	p.FName = "predelete"
+	return nil
+}
+
+func (p *Person) PostDelete(s SqlExecutor) error {
+	p.LName = "postdelete"
+	return nil
+}
+
+func (p *Person) PostGet(s SqlExecutor) error {
+	p.LName = "postget"
+	return nil
+}
+
+type PersistentUser struct {
+	Key            int32
+	Id             string
+	PassedTraining bool
+}
+
+func TestCreateTablesIfNotExists(t *testing.T) {
+	dbmap := initDbMap()
+	defer dropAndClose(dbmap)
+
+	err := dbmap.CreateTablesIfNotExists()
+	if err != nil {
+		t.Error(err)
+	}
+}
+
+func TestTruncateTables(t *testing.T) {
+	dbmap := initDbMap()
+	defer dropAndClose(dbmap)
+	err := dbmap.CreateTablesIfNotExists()
+	if err != nil {
+		t.Error(err)
+	}
+
+	// Insert some data
+	p1 := &Person{0, 0, 0, "Bob", "Smith", 0}
+	dbmap.Insert(p1)
+	inv := &Invoice{0, 0, 1, "my invoice", 0, true}
+	dbmap.Insert(inv)
+
+	err = dbmap.TruncateTables()
+	if err != nil {
+		t.Error(err)
+	}
+
+	// Make sure all rows are deleted
+	rows, _ := dbmap.Select(Person{}, "SELECT * FROM person_test")
+	if len(rows) != 0 {
+		t.Errorf("Expected 0 person rows, got %d", len(rows))
+	}
+	rows, _ = dbmap.Select(Invoice{}, "SELECT * FROM invoice_test")
+	if len(rows) != 0 {
+		t.Errorf("Expected 0 invoice rows, got %d", len(rows))
+	}
+}
+
+func TestCustomDateType(t *testing.T) {
+	dbmap := newDbMap()
+	dbmap.TypeConverter = testTypeConverter{}
+	dbmap.TraceOn("", log.New(os.Stdout, "gorptest: ", log.Lmicroseconds))
+	dbmap.AddTable(WithCustomDate{}).SetKeys(true, "Id")
+	err := dbmap.CreateTables()
+	if err != nil {
+		panic(err)
+	}
+	defer dropAndClose(dbmap)
+
+	test1 := &WithCustomDate{Added: CustomDate{Time: time.Now().Truncate(time.Second)}}
+	err = dbmap.Insert(test1)
+	if err != nil {
+		t.Errorf("Could not insert struct with custom date field: %s", err)
+		t.FailNow()
+	}
+	// Unfortunately, the mysql driver doesn't handle time.Time
+	// values properly during Get().  I can't find a way to work
+	// around that problem - every other type that I've tried is just
+	// silently converted.  time.Time is the only type that causes
+	// the issue that this test checks for.  As such, if the driver is
+	// mysql, we'll just skip the rest of this test.
+	if _, driver := dialectAndDriver(); driver == "mysql" {
+		t.Skip("TestCustomDateType can't run Get() with the mysql driver; skipping the rest of this test...")
+	}
+	result, err := dbmap.Get(new(WithCustomDate), test1.Id)
+	if err != nil {
+		t.Errorf("Could not get struct with custom date field: %s", err)
+		t.FailNow()
+	}
+	test2 := result.(*WithCustomDate)
+	if test2.Added.UTC() != test1.Added.UTC() {
+		t.Errorf("Custom dates do not match: %v != %v", test2.Added.UTC(), test1.Added.UTC())
+	}
+}
+
+func TestUIntPrimaryKey(t *testing.T) {
+	dbmap := newDbMap()
+	dbmap.TraceOn("", log.New(os.Stdout, "gorptest: ", log.Lmicroseconds))
+	dbmap.AddTable(PersonUInt64{}).SetKeys(true, "Id")
+	dbmap.AddTable(PersonUInt32{}).SetKeys(true, "Id")
+	dbmap.AddTable(PersonUInt16{}).SetKeys(true, "Id")
+	err := dbmap.CreateTablesIfNotExists()
+	if err != nil {
+		panic(err)
+	}
+	defer dropAndClose(dbmap)
+
+	p1 := &PersonUInt64{0, "name1"}
+	p2 := &PersonUInt32{0, "name2"}
+	p3 := &PersonUInt16{0, "name3"}
+	err = dbmap.Insert(p1, p2, p3)
+	if err != nil {
+		t.Error(err)
+	}
+	if p1.Id != 1 {
+		t.Errorf("%d != 1", p1.Id)
+	}
+	if p2.Id != 1 {
+		t.Errorf("%d != 1", p2.Id)
+	}
+	if p3.Id != 1 {
+		t.Errorf("%d != 1", p3.Id)
+	}
+}
+
+func TestSetUniqueTogether(t *testing.T) {
+	dbmap := newDbMap()
+	dbmap.TraceOn("", log.New(os.Stdout, "gorptest: ", log.Lmicroseconds))
+	dbmap.AddTable(UniqueColumns{}).SetUniqueTogether("FirstName", "LastName").SetUniqueTogether("City", "ZipCode")
+	err := dbmap.CreateTablesIfNotExists()
+	if err != nil {
+		panic(err)
+	}
+	defer dropAndClose(dbmap)
+
+	n1 := &UniqueColumns{"Steve", "Jobs", "Cupertino", 95014}
+	err = dbmap.Insert(n1)
+	if err != nil {
+		t.Error(err)
+	}
+
+	// Should fail because of the first constraint
+	n2 := &UniqueColumns{"Steve", "Jobs", "Sunnyvale", 94085}
+	err = dbmap.Insert(n2)
+	if err == nil {
+		t.Error(err)
+	}
+	// "unique" for Postgres/SQLite, "Duplicate entry" for MySQL
+	errLower := strings.ToLower(err.Error())
+	if !strings.Contains(errLower, "unique") && !strings.Contains(errLower, "duplicate entry") {
+		t.Error(err)
+	}
+
+	// Should also fail because of the second unique-together
+	n3 := &UniqueColumns{"Steve", "Wozniak", "Cupertino", 95014}
+	err = dbmap.Insert(n3)
+	if err == nil {
+		t.Error(err)
+	}
+	// "unique" for Postgres/SQLite, "Duplicate entry" for MySQL
+	errLower = strings.ToLower(err.Error())
+	if !strings.Contains(errLower, "unique") && !strings.Contains(errLower, "duplicate entry") {
+		t.Error(err)
+	}
+
+	// This one should finally succeed
+	n4 := &UniqueColumns{"Steve", "Wozniak", "Sunnyvale", 94085}
+	err = dbmap.Insert(n4)
+	if err != nil {
+		t.Error(err)
+	}
+}
+
+func TestPersistentUser(t *testing.T) {
+	dbmap := newDbMap()
+	dbmap.Exec("drop table if exists PersistentUser")
+	dbmap.TraceOn("", log.New(os.Stdout, "gorptest: ", log.Lmicroseconds))
+	table := dbmap.AddTable(PersistentUser{}).SetKeys(false, "Key")
+	table.ColMap("Key").Rename("mykey")
+	err := dbmap.CreateTablesIfNotExists()
+	if err != nil {
+		panic(err)
+	}
+	defer dropAndClose(dbmap)
+	pu := &PersistentUser{43, "33r", false}
+	err = dbmap.Insert(pu)
+	if err != nil {
+		panic(err)
+	}
+
+	// prove we can pass a pointer into Get
+	pu2, err := dbmap.Get(pu, pu.Key)
+	if err != nil {
+		panic(err)
+	}
+	if !reflect.DeepEqual(pu, pu2) {
+		t.Errorf("%v!=%v", pu, pu2)
+	}
+
+	arr, err := dbmap.Select(pu, "select * from PersistentUser")
+	if err != nil {
+		panic(err)
+	}
+	if !reflect.DeepEqual(pu, arr[0]) {
+		t.Errorf("%v!=%v", pu, arr[0])
+	}
+
+	// prove we can get the results back in a slice
+	var puArr []*PersistentUser
+	_, err = dbmap.Select(&puArr, "select * from PersistentUser")
+	if err != nil {
+		panic(err)
+	}
+	if len(puArr) != 1 {
+		t.Errorf("Expected one persistentuser, found none")
+	}
+	if !reflect.DeepEqual(pu, puArr[0]) {
+		t.Errorf("%v!=%v", pu, puArr[0])
+	}
+
+	// prove we can get the results back in a non-pointer slice
+	var puValues []PersistentUser
+	_, err = dbmap.Select(&puValues, "select * from PersistentUser")
+	if err != nil {
+		panic(err)
+	}
+	if len(puValues) != 1 {
+		t.Errorf("Expected one persistentuser, found none")
+	}
+	if !reflect.DeepEqual(*pu, puValues[0]) {
+		t.Errorf("%v!=%v", *pu, puValues[0])
+	}
+
+	// prove we can get the results back in a string slice
+	var idArr []*string
+	_, err = dbmap.Select(&idArr, "select Id from PersistentUser")
+	if err != nil {
+		panic(err)
+	}
+	if len(idArr) != 1 {
+		t.Errorf("Expected one persistentuser, found none")
+	}
+	if !reflect.DeepEqual(pu.Id, *idArr[0]) {
+		t.Errorf("%v!=%v", pu.Id, *idArr[0])
+	}
+
+	// prove we can get the results back in an int slice
+	var keyArr []*int32
+	_, err = dbmap.Select(&keyArr, "select mykey from PersistentUser")
+	if err != nil {
+		panic(err)
+	}
+	if len(keyArr) != 1 {
+		t.Errorf("Expected one persistentuser, found none")
+	}
+	if !reflect.DeepEqual(pu.Key, *keyArr[0]) {
+		t.Errorf("%v!=%v", pu.Key, *keyArr[0])
+	}
+
+	// prove we can get the results back in a bool slice
+	var passedArr []*bool
+	_, err = dbmap.Select(&passedArr, "select PassedTraining from PersistentUser")
+	if err != nil {
+		panic(err)
+	}
+	if len(passedArr) != 1 {
+		t.Errorf("Expected one persistentuser, found none")
+	}
+	if !reflect.DeepEqual(pu.PassedTraining, *passedArr[0]) {
+		t.Errorf("%v!=%v", pu.PassedTraining, *passedArr[0])
+	}
+
+	// prove we can get the results back in a non-pointer slice
+	var stringArr []string
+	_, err = dbmap.Select(&stringArr, "select Id from PersistentUser")
+	if err != nil {
+		panic(err)
+	}
+	if len(stringArr) != 1 {
+		t.Errorf("Expected one persistentuser, found none")
+	}
+	if !reflect.DeepEqual(pu.Id, stringArr[0]) {
+		t.Errorf("%v!=%v", pu.Id, stringArr[0])
+	}
+}
+
+func TestNamedQueryMap(t *testing.T) {
+	dbmap := newDbMap()
+	dbmap.Exec("drop table if exists PersistentUser")
+	dbmap.TraceOn("", log.New(os.Stdout, "gorptest: ", log.Lmicroseconds))
+	table := dbmap.AddTable(PersistentUser{}).SetKeys(false, "Key")
+	table.ColMap("Key").Rename("mykey")
+	err := dbmap.CreateTablesIfNotExists()
+	if err != nil {
+		panic(err)
+	}
+	defer dropAndClose(dbmap)
+	pu := &PersistentUser{43, "33r", false}
+	pu2 := &PersistentUser{500, "abc", false}
+	err = dbmap.Insert(pu, pu2)
+	if err != nil {
+		panic(err)
+	}
+
+	// Test simple case
+	var puArr []*PersistentUser
+	_, err = dbmap.Select(&puArr, "select * from PersistentUser where mykey = :Key", map[string]interface{}{
+		"Key": 43,
+	})
+	if err != nil {
+		t.Errorf("Failed to select: %s", err)
+		t.FailNow()
+	}
+	if len(puArr) != 1 {
+		t.Errorf("Expected one persistentuser, found none")
+	}
+	if !reflect.DeepEqual(pu, puArr[0]) {
+		t.Errorf("%v!=%v", pu, puArr[0])
+	}
+
+	// Test more specific map value type is ok
+	puArr = nil
+	_, err = dbmap.Select(&puArr, "select * from PersistentUser where mykey = :Key", map[string]int{
+		"Key": 43,
+	})
+	if err != nil {
+		t.Errorf("Failed to select: %s", err)
+		t.FailNow()
+	}
+	if len(puArr) != 1 {
+		t.Errorf("Expected one persistentuser, found none")
+	}
+
+	// Test multiple parameters set.
+	puArr = nil
+	_, err = dbmap.Select(&puArr, `
+select * from PersistentUser
+ where mykey = :Key
+   and PassedTraining = :PassedTraining
+   and Id = :Id`, map[string]interface{}{
+		"Key":            43,
+		"PassedTraining": false,
+		"Id":             "33r",
+	})
+	if err != nil {
+		t.Errorf("Failed to select: %s", err)
+		t.FailNow()
+	}
+	if len(puArr) != 1 {
+		t.Errorf("Expected one persistentuser, found none")
+	}
+
+	// Test colon within a non-key string
+	// Test having extra, unused properties in the map.
+	puArr = nil
+	_, err = dbmap.Select(&puArr, `
+select * from PersistentUser
+ where mykey = :Key
+   and Id != 'abc:def'`, map[string]interface{}{
+		"Key":            43,
+		"PassedTraining": false,
+	})
+	if err != nil {
+		t.Errorf("Failed to select: %s", err)
+		t.FailNow()
+	}
+	if len(puArr) != 1 {
+		t.Errorf("Expected one persistentuser, found none")
+	}
+}
+
+func TestNamedQueryStruct(t *testing.T) {
+	dbmap := newDbMap()
+	dbmap.Exec("drop table if exists PersistentUser")
+	dbmap.TraceOn("", log.New(os.Stdout, "gorptest: ", log.Lmicroseconds))
+	table := dbmap.AddTable(PersistentUser{}).SetKeys(false, "Key")
+	table.ColMap("Key").Rename("mykey")
+	err := dbmap.CreateTablesIfNotExists()
+	if err != nil {
+		panic(err)
+	}
+	defer dropAndClose(dbmap)
+	pu := &PersistentUser{43, "33r", false}
+	pu2 := &PersistentUser{500, "abc", false}
+	err = dbmap.Insert(pu, pu2)
+	if err != nil {
+		panic(err)
+	}
+
+	// Test select self
+	var puArr []*PersistentUser
+	_, err = dbmap.Select(&puArr, `
+select * from PersistentUser
+ where mykey = :Key
+   and PassedTraining = :PassedTraining
+   and Id = :Id`, pu)
+	if err != nil {
+		t.Errorf("Failed to select: %s", err)
+		t.FailNow()
+	}
+	if len(puArr) != 1 {
+		t.Errorf("Expected one persistentuser, found none")
+	}
+	if !reflect.DeepEqual(pu, puArr[0]) {
+		t.Errorf("%v!=%v", pu, puArr[0])
+	}
+}
+
+// Ensure that the slices containing SQL results are non-nil when the result set is empty.
+func TestReturnsNonNilSlice(t *testing.T) {
+	dbmap := initDbMap()
+	defer dropAndClose(dbmap)
+	noResultsSQL := "select * from invoice_test where id=99999"
+	var r1 []*Invoice
+	_rawselect(dbmap, &r1, noResultsSQL)
+	if r1 == nil {
+		t.Errorf("r1==nil")
+	}
+
+	r2 := _rawselect(dbmap, Invoice{}, noResultsSQL)
+	if r2 == nil {
+		t.Errorf("r2==nil")
+	}
+}
+
+func TestOverrideVersionCol(t *testing.T) {
+	dbmap := newDbMap()
+	t1 := dbmap.AddTable(InvoicePersonView{}).SetKeys(false, "InvoiceId", "PersonId")
+	err := dbmap.CreateTables()
+	if err != nil {
+		panic(err)
+	}
+	defer dropAndClose(dbmap)
+	c1 := t1.SetVersionCol("LegacyVersion")
+	if c1.ColumnName != "LegacyVersion" {
+		t.Errorf("Wrong col returned: %v", c1)
+	}
+
+	ipv := &InvoicePersonView{1, 2, "memo", "fname", 0}
+	_update(dbmap, ipv)
+	if ipv.LegacyVersion != 1 {
+		t.Errorf("LegacyVersion not updated: %d", ipv.LegacyVersion)
+	}
+}
+
+func TestOptimisticLocking(t *testing.T) {
+	dbmap := initDbMap()
+	defer dropAndClose(dbmap)
+
+	p1 := &Person{0, 0, 0, "Bob", "Smith", 0}
+	dbmap.Insert(p1) // Version is now 1
+	if p1.Version != 1 {
+		t.Errorf("Insert didn't incr Version: %d != %d", 1, p1.Version)
+		return
+	}
+	if p1.Id == 0 {
+		t.Errorf("Insert didn't return a generated PK")
+		return
+	}
+
+	obj, err := dbmap.Get(Person{}, p1.Id)
+	if err != nil {
+		panic(err)
+	}
+	p2 := obj.(*Person)
+	p2.LName = "Edwards"
+	dbmap.Update(p2) // Version is now 2
+	if p2.Version != 2 {
+		t.Errorf("Update didn't incr Version: %d != %d", 2, p2.Version)
+	}
+
+	p1.LName = "Howard"
+	count, err := dbmap.Update(p1)
+	if _, ok := err.(OptimisticLockError); !ok {
+		t.Errorf("update - Expected OptimisticLockError, got: %v", err)
+	}
+	if count != -1 {
+		t.Errorf("update - Expected -1 count, got: %d", count)
+	}
+
+	count, err = dbmap.Delete(p1)
+	if _, ok := err.(OptimisticLockError); !ok {
+		t.Errorf("delete - Expected OptimisticLockError, got: %v", err)
+	}
+	if count != -1 {
+		t.Errorf("delete - Expected -1 count, got: %d", count)
+	}
+}
+
+// what happens if a legacy table has a null value?
+func TestDoubleAddTable(t *testing.T) {
+	dbmap := newDbMap()
+	t1 := dbmap.AddTable(TableWithNull{}).SetKeys(false, "Id")
+	t2 := dbmap.AddTable(TableWithNull{})
+	if t1 != t2 {
+		t.Errorf("%v != %v", t1, t2)
+	}
+}
+
+// what happens if a legacy table has a null value?
+func TestNullValues(t *testing.T) {
+	dbmap := initDbMapNulls()
+	defer dropAndClose(dbmap)
+
+	// insert a row directly
+	_rawexec(dbmap, "insert into TableWithNull values (10, null, "+
+		"null, null, null, null)")
+
+	// try to load it
+	expected := &TableWithNull{Id: 10}
+	obj := _get(dbmap, TableWithNull{}, 10)
+	t1 := obj.(*TableWithNull)
+	if !reflect.DeepEqual(expected, t1) {
+		t.Errorf("%v != %v", expected, t1)
+	}
+
+	// update it
+	t1.Str = sql.NullString{"hi", true}
+	expected.Str = t1.Str
+	t1.Int64 = sql.NullInt64{999, true}
+	expected.Int64 = t1.Int64
+	t1.Float64 = sql.NullFloat64{53.33, true}
+	expected.Float64 = t1.Float64
+	t1.Bool = sql.NullBool{true, true}
+	expected.Bool = t1.Bool
+	t1.Bytes = []byte{1, 30, 31, 33}
+	expected.Bytes = t1.Bytes
+	_update(dbmap, t1)
+
+	obj = _get(dbmap, TableWithNull{}, 10)
+	t1 = obj.(*TableWithNull)
+	if t1.Str.String != "hi" {
+		t.Errorf("%s != hi", t1.Str.String)
+	}
+	if !reflect.DeepEqual(expected, t1) {
+		t.Errorf("%v != %v", expected, t1)
+	}
+}
+
+func TestColumnProps(t *testing.T) {
+	dbmap := newDbMap()
+	dbmap.TraceOn("", log.New(os.Stdout, "gorptest: ", log.Lmicroseconds))
+	t1 := dbmap.AddTable(Invoice{}).SetKeys(true, "Id")
+	t1.ColMap("Created").Rename("date_created")
+	t1.ColMap("Updated").SetTransient(true)
+	t1.ColMap("Memo").SetMaxSize(10)
+	t1.ColMap("PersonId").SetUnique(true)
+
+	err := dbmap.CreateTables()
+	if err != nil {
+		panic(err)
+	}
+	defer dropAndClose(dbmap)
+
+	// test transient
+	inv := &Invoice{0, 0, 1, "my invoice", 0, true}
+	_insert(dbmap, inv)
+	obj := _get(dbmap, Invoice{}, inv.Id)
+	inv = obj.(*Invoice)
+	if inv.Updated != 0 {
+		t.Errorf("Saved transient column 'Updated'")
+	}
+
+	// test max size
+	inv.Memo = "this memo is too long"
+	err = dbmap.Insert(inv)
+	if err == nil {
+		t.Errorf("max size exceeded, but Insert did not fail.")
+	}
+
+	// test unique - same person id
+	inv = &Invoice{0, 0, 1, "my invoice2", 0, false}
+	err = dbmap.Insert(inv)
+	if err == nil {
+		t.Errorf("same PersonId inserted, but Insert did not fail.")
+	}
+}
+
+func TestRawSelect(t *testing.T) {
+	dbmap := initDbMap()
+	defer dropAndClose(dbmap)
+
+	p1 := &Person{0, 0, 0, "bob", "smith", 0}
+	_insert(dbmap, p1)
+
+	inv1 := &Invoice{0, 0, 0, "xmas order", p1.Id, true}
+	_insert(dbmap, inv1)
+
+	expected := &InvoicePersonView{inv1.Id, p1.Id, inv1.Memo, p1.FName, 0}
+
+	query := "select i.Id InvoiceId, p.Id PersonId, i.Memo, p.FName " +
+		"from invoice_test i, person_test p " +
+		"where i.PersonId = p.Id"
+	list := _rawselect(dbmap, InvoicePersonView{}, query)
+	if len(list) != 1 {
+		t.Errorf("len(list) != 1: %d", len(list))
+	} else if !reflect.DeepEqual(expected, list[0]) {
+		t.Errorf("%v != %v", expected, list[0])
+	}
+}
+
+func TestHooks(t *testing.T) {
+	dbmap := initDbMap()
+	defer dropAndClose(dbmap)
+
+	p1 := &Person{0, 0, 0, "bob", "smith", 0}
+	_insert(dbmap, p1)
+	if p1.Created == 0 || p1.Updated == 0 {
+		t.Errorf("p1.PreInsert() didn't run: %v", p1)
+	} else if p1.LName != "postinsert" {
+		t.Errorf("p1.PostInsert() didn't run: %v", p1)
+	}
+
+	obj := _get(dbmap, Person{}, p1.Id)
+	p1 = obj.(*Person)
+	if p1.LName != "postget" {
+		t.Errorf("p1.PostGet() didn't run: %v", p1)
+	}
+
+	_update(dbmap, p1)
+	if p1.FName != "preupdate" {
+		t.Errorf("p1.PreUpdate() didn't run: %v", p1)
+	} else if p1.LName != "postupdate" {
+		t.Errorf("p1.PostUpdate() didn't run: %v", p1)
+	}
+
+	var persons []*Person
+	bindVar := dbmap.Dialect.BindVar(0)
+	_rawselect(dbmap, &persons, "select * from person_test where id = "+bindVar, p1.Id)
+	if persons[0].LName != "postget" {
+		t.Errorf("p1.PostGet() didn't run after select: %v", p1)
+	}
+
+	_del(dbmap, p1)
+	if p1.FName != "predelete" {
+		t.Errorf("p1.PreDelete() didn't run: %v", p1)
+	} else if p1.LName != "postdelete" {
+		t.Errorf("p1.PostDelete() didn't run: %v", p1)
+	}
+
+	// Test error case
+	p2 := &Person{0, 0, 0, "badname", "", 0}
+	err := dbmap.Insert(p2)
+	if err == nil {
+		t.Errorf("p2.PreInsert() didn't return an error")
+	}
+}
+
+func TestTransaction(t *testing.T) {
+	dbmap := initDbMap()
+	defer dropAndClose(dbmap)
+
+	inv1 := &Invoice{0, 100, 200, "t1", 0, true}
+	inv2 := &Invoice{0, 100, 200, "t2", 0, false}
+
+	trans, err := dbmap.Begin()
+	if err != nil {
+		panic(err)
+	}
+	trans.Insert(inv1, inv2)
+	err = trans.Commit()
+	if err != nil {
+		panic(err)
+	}
+
+	obj, err := dbmap.Get(Invoice{}, inv1.Id)
+	if err != nil {
+		panic(err)
+	}
+	if !reflect.DeepEqual(inv1, obj) {
+		t.Errorf("%v != %v", inv1, obj)
+	}
+	obj, err = dbmap.Get(Invoice{}, inv2.Id)
+	if err != nil {
+		panic(err)
+	}
+	if !reflect.DeepEqual(inv2, obj) {
+		t.Errorf("%v != %v", inv2, obj)
+	}
+}
+
+func TestSavepoint(t *testing.T) {
+	dbmap := initDbMap()
+	defer dropAndClose(dbmap)
+
+	inv1 := &Invoice{0, 100, 200, "unpaid", 0, false}
+
+	trans, err := dbmap.Begin()
+	if err != nil {
+		panic(err)
+	}
+	trans.Insert(inv1)
+
+	var checkMemo = func(want string) {
+		memo, err := trans.SelectStr("select memo from invoice_test")
+		if err != nil {
+			panic(err)
+		}
+		if memo != want {
+			t.Errorf("%q != %q", want, memo)
+		}
+	}
+	checkMemo("unpaid")
+
+	err = trans.Savepoint("foo")
+	if err != nil {
+		panic(err)
+	}
+	checkMemo("unpaid")
+
+	inv1.Memo = "paid"
+	_, err = trans.Update(inv1)
+	if err != nil {
+		panic(err)
+	}
+	checkMemo("paid")
+
+	err = trans.RollbackToSavepoint("foo")
+	if err != nil {
+		panic(err)
+	}
+	checkMemo("unpaid")
+
+	err = trans.Rollback()
+	if err != nil {
+		panic(err)
+	}
+}
+
+func TestMultiple(t *testing.T) {
+	dbmap := initDbMap()
+	defer dropAndClose(dbmap)
+
+	inv1 := &Invoice{0, 100, 200, "a", 0, false}
+	inv2 := &Invoice{0, 100, 200, "b", 0, true}
+	_insert(dbmap, inv1, inv2)
+
+	inv1.Memo = "c"
+	inv2.Memo = "d"
+	_update(dbmap, inv1, inv2)
+
+	count := _del(dbmap, inv1, inv2)
+	if count != 2 {
+		t.Errorf("%d != 2", count)
+	}
+}
+
+func TestCrud(t *testing.T) {
+	dbmap := initDbMap()
+	defer dropAndClose(dbmap)
+
+	inv := &Invoice{0, 100, 200, "first order", 0, true}
+	testCrudInternal(t, dbmap, inv)
+
+	invtag := &InvoiceTag{0, 300, 400, "some order", 33, false}
+	testCrudInternal(t, dbmap, invtag)
+
+	foo := &AliasTransientField{BarStr: "some bar"}
+	testCrudInternal(t, dbmap, foo)
+}
+
+func testCrudInternal(t *testing.T, dbmap *DbMap, val testable) {
+	table, _, err := dbmap.tableForPointer(val, false)
+	if err != nil {
+		t.Errorf("couldn't call TableFor: val=%v err=%v", val, err)
+	}
+
+	_, err = dbmap.Exec("delete from " + table.TableName)
+	if err != nil {
+		t.Errorf("couldn't delete rows from: val=%v err=%v", val, err)
+	}
+
+	// INSERT row
+	_insert(dbmap, val)
+	if val.GetId() == 0 {
+		t.Errorf("val.GetId() was not set on INSERT")
+		return
+	}
+
+	// SELECT row
+	val2 := _get(dbmap, val, val.GetId())
+	if !reflect.DeepEqual(val, val2) {
+		t.Errorf("%v != %v", val, val2)
+	}
+
+	// UPDATE row and SELECT
+	val.Rand()
+	count := _update(dbmap, val)
+	if count != 1 {
+		t.Errorf("update 1 != %d", count)
+	}
+	val2 = _get(dbmap, val, val.GetId())
+	if !reflect.DeepEqual(val, val2) {
+		t.Errorf("%v != %v", val, val2)
+	}
+
+	// Select *
+	rows, err := dbmap.Select(val, "select * from "+table.TableName)
+	if err != nil {
+		t.Errorf("couldn't select * from %s err=%v", table.TableName, err)
+	} else if len(rows) != 1 {
+		t.Errorf("unexpected row count in %s: %d", table.TableName, len(rows))
+	} else if !reflect.DeepEqual(val, rows[0]) {
+		t.Errorf("select * result: %v != %v", val, rows[0])
+	}
+
+	// DELETE row
+	deleted := _del(dbmap, val)
+	if deleted != 1 {
+		t.Errorf("Did not delete row with Id: %d", val.GetId())
+		return
+	}
+
+	// VERIFY deleted
+	val2 = _get(dbmap, val, val.GetId())
+	if val2 != nil {
+		t.Errorf("Found invoice with id: %d after Delete()", val.GetId())
+	}
+}
+
+func TestWithIgnoredColumn(t *testing.T) {
+	dbmap := initDbMap()
+	defer dropAndClose(dbmap)
+
+	ic := &WithIgnoredColumn{-1, 0, 1}
+	_insert(dbmap, ic)
+	expected := &WithIgnoredColumn{0, 1, 1}
+	ic2 := _get(dbmap, WithIgnoredColumn{}, ic.Id).(*WithIgnoredColumn)
+
+	if !reflect.DeepEqual(expected, ic2) {
+		t.Errorf("%v != %v", expected, ic2)
+	}
+	if _del(dbmap, ic) != 1 {
+		t.Errorf("Did not delete row with Id: %d", ic.Id)
+		return
+	}
+	if _get(dbmap, WithIgnoredColumn{}, ic.Id) != nil {
+		t.Errorf("Found id: %d after Delete()", ic.Id)
+	}
+}
+
+func TestTypeConversionExample(t *testing.T) {
+	dbmap := initDbMap()
+	defer dropAndClose(dbmap)
+
+	p := Person{FName: "Bob", LName: "Smith"}
+	tc := &TypeConversionExample{-1, p, CustomStringType("hi")}
+	_insert(dbmap, tc)
+
+	expected := &TypeConversionExample{1, p, CustomStringType("hi")}
+	tc2 := _get(dbmap, TypeConversionExample{}, tc.Id).(*TypeConversionExample)
+	if !reflect.DeepEqual(expected, tc2) {
+		t.Errorf("tc2 %v != %v", expected, tc2)
+	}
+
+	tc2.Name = CustomStringType("hi2")
+	tc2.PersonJSON = Person{FName: "Jane", LName: "Doe"}
+	_update(dbmap, tc2)
+
+	expected = &TypeConversionExample{1, tc2.PersonJSON, CustomStringType("hi2")}
+	tc3 := _get(dbmap, TypeConversionExample{}, tc.Id).(*TypeConversionExample)
+	if !reflect.DeepEqual(expected, tc3) {
+		t.Errorf("tc3 %v != %v", expected, tc3)
+	}
+
+	if _del(dbmap, tc) != 1 {
+		t.Errorf("Did not delete row with Id: %d", tc.Id)
+	}
+
+}
+
+func TestWithEmbeddedStruct(t *testing.T) {
+	dbmap := initDbMap()
+	defer dropAndClose(dbmap)
+
+	es := &WithEmbeddedStruct{-1, Names{FirstName: "Alice", LastName: "Smith"}}
+	_insert(dbmap, es)
+	expected := &WithEmbeddedStruct{1, Names{FirstName: "Alice", LastName: "Smith"}}
+	es2 := _get(dbmap, WithEmbeddedStruct{}, es.Id).(*WithEmbeddedStruct)
+	if !reflect.DeepEqual(expected, es2) {
+		t.Errorf("%v != %v", expected, es2)
+	}
+
+	es2.FirstName = "Bob"
+	expected.FirstName = "Bob"
+	_update(dbmap, es2)
+	es2 = _get(dbmap, WithEmbeddedStruct{}, es.Id).(*WithEmbeddedStruct)
+	if !reflect.DeepEqual(expected, es2) {
+		t.Errorf("%v != %v", expected, es2)
+	}
+
+	ess := _rawselect(dbmap, WithEmbeddedStruct{}, "select * from embedded_struct_test")
+	if !reflect.DeepEqual(es2, ess[0]) {
+		t.Errorf("%v != %v", es2, ess[0])
+	}
+}
+
+func TestWithEmbeddedStructBeforeAutoincr(t *testing.T) {
+	dbmap := initDbMap()
+	defer dropAndClose(dbmap)
+
+	esba := &WithEmbeddedStructBeforeAutoincrField{Names: Names{FirstName: "Alice", LastName: "Smith"}}
+	_insert(dbmap, esba)
+	var expectedAutoincrId int64 = 1
+	if esba.Id != expectedAutoincrId {
+		t.Errorf("%d != %d", expectedAutoincrId, esba.Id)
+	}
+}
+
+func TestWithEmbeddedAutoincr(t *testing.T) {
+	dbmap := initDbMap()
+	defer dropAndClose(dbmap)
+
+	esa := &WithEmbeddedAutoincr{
+		WithEmbeddedStruct: WithEmbeddedStruct{Names: Names{FirstName: "Alice", LastName: "Smith"}},
+		MiddleName:         "Rose",
+	}
+	_insert(dbmap, esa)
+	var expectedAutoincrId int64 = 1
+	if esa.Id != expectedAutoincrId {
+		t.Errorf("%d != %d", expectedAutoincrId, esa.Id)
+	}
+}
+
+func TestSelectVal(t *testing.T) {
+	dbmap := initDbMapNulls()
+	defer dropAndClose(dbmap)
+
+	bindVar := dbmap.Dialect.BindVar(0)
+
+	t1 := TableWithNull{Str: sql.NullString{"abc", true},
+		Int64:   sql.NullInt64{78, true},
+		Float64: sql.NullFloat64{32.2, true},
+		Bool:    sql.NullBool{true, true},
+		Bytes:   []byte("hi")}
+	_insert(dbmap, &t1)
+
+	// SelectInt
+	i64 := selectInt(dbmap, "select Int64 from TableWithNull where Str='abc'")
+	if i64 != 78 {
+		t.Errorf("int64 %d != 78", i64)
+	}
+	i64 = selectInt(dbmap, "select count(*) from TableWithNull")
+	if i64 != 1 {
+		t.Errorf("int64 count %d != 1", i64)
+	}
+	i64 = selectInt(dbmap, "select count(*) from TableWithNull where Str="+bindVar, "asdfasdf")
+	if i64 != 0 {
+		t.Errorf("int64 no rows %d != 0", i64)
+	}
+
+	// SelectNullInt
+	n := selectNullInt(dbmap, "select Int64 from TableWithNull where Str='notfound'")
+	if !reflect.DeepEqual(n, sql.NullInt64{0, false}) {
+		t.Errorf("nullint %v != 0,false", n)
+	}
+
+	n = selectNullInt(dbmap, "select Int64 from TableWithNull where Str='abc'")
+	if !reflect.DeepEqual(n, sql.NullInt64{78, true}) {
+		t.Errorf("nullint %v != 78, true", n)
+	}
+
+	// SelectFloat
+	f64 := selectFloat(dbmap, "select Float64 from TableWithNull where Str='abc'")
+	if f64 != 32.2 {
+		t.Errorf("float64 %d != 32.2", f64)
+	}
+	f64 = selectFloat(dbmap, "select min(Float64) from TableWithNull")
+	if f64 != 32.2 {
+		t.Errorf("float64 min %d != 32.2", f64)
+	}
+	f64 = selectFloat(dbmap, "select count(*) from TableWithNull where Str="+bindVar, "asdfasdf")
+	if f64 != 0 {
+		t.Errorf("float64 no rows %d != 0", f64)
+	}
+
+	// SelectNullFloat
+	nf := selectNullFloat(dbmap, "select Float64 from TableWithNull where Str='notfound'")
+	if !reflect.DeepEqual(nf, sql.NullFloat64{0, false}) {
+		t.Errorf("nullfloat %v != 0,false", nf)
+	}
+
+	nf = selectNullFloat(dbmap, "select Float64 from TableWithNull where Str='abc'")
+	if !reflect.DeepEqual(nf, sql.NullFloat64{32.2, true}) {
+		t.Errorf("nullfloat %v != 32.2, true", nf)
+	}
+
+	// SelectStr
+	s := selectStr(dbmap, "select Str from TableWithNull where Int64="+bindVar, 78)
+	if s != "abc" {
+		t.Errorf("s %s != abc", s)
+	}
+	s = selectStr(dbmap, "select Str from TableWithNull where Str='asdfasdf'")
+	if s != "" {
+		t.Errorf("s no rows %s != ''", s)
+	}
+
+	// SelectNullStr
+	ns := selectNullStr(dbmap, "select Str from TableWithNull where Int64="+bindVar, 78)
+	if !reflect.DeepEqual(ns, sql.NullString{"abc", true}) {
+		t.Errorf("nullstr %v != abc,true", ns)
+	}
+	ns = selectNullStr(dbmap, "select Str from TableWithNull where Str='asdfasdf'")
+	if !reflect.DeepEqual(ns, sql.NullString{"", false}) {
+		t.Errorf("nullstr no rows %v != '',false", ns)
+	}
+
+	// SelectInt/Str with named parameters
+	i64 = selectInt(dbmap, "select Int64 from TableWithNull where Str=:abc", map[string]string{"abc": "abc"})
+	if i64 != 78 {
+		t.Errorf("int64 %d != 78", i64)
+	}
+	ns = selectNullStr(dbmap, "select Str from TableWithNull where Int64=:num", map[string]int{"num": 78})
+	if !reflect.DeepEqual(ns, sql.NullString{"abc", true}) {
+		t.Errorf("nullstr %v != abc,true", ns)
+	}
+}
+
+func TestVersionMultipleRows(t *testing.T) {
+	dbmap := initDbMap()
+	defer dropAndClose(dbmap)
+
+	persons := []*Person{
+		&Person{0, 0, 0, "Bob", "Smith", 0},
+		&Person{0, 0, 0, "Jane", "Smith", 0},
+		&Person{0, 0, 0, "Mike", "Smith", 0},
+	}
+
+	_insert(dbmap, persons[0], persons[1], persons[2])
+
+	for x, p := range persons {
+		if p.Version != 1 {
+			t.Errorf("person[%d].Version != 1: %d", x, p.Version)
+		}
+	}
+}
+
+func TestWithStringPk(t *testing.T) {
+	dbmap := newDbMap()
+	dbmap.TraceOn("", log.New(os.Stdout, "gorptest: ", log.Lmicroseconds))
+	dbmap.AddTableWithName(WithStringPk{}, "string_pk_test").SetKeys(true, "Id")
+	_, err := dbmap.Exec("create table string_pk_test (Id varchar(255), Name varchar(255));")
+	if err != nil {
+		t.Errorf("couldn't create string_pk_test: %v", err)
+	}
+	defer dropAndClose(dbmap)
+
+	row := &WithStringPk{"1", "foo"}
+	err = dbmap.Insert(row)
+	if err == nil {
+		t.Errorf("Expected error when inserting into table w/non Int PK and autoincr set true")
+	}
+}
+
+// TestSqlExecutorInterfaceSelects ensures that all DbMap methods starting with Select...
+// are also exposed in the SqlExecutor interface. Select...  functions can always
+// run on Pre/Post hooks.
+func TestSqlExecutorInterfaceSelects(t *testing.T) {
+	dbMapType := reflect.TypeOf(&DbMap{})
+	sqlExecutorType := reflect.TypeOf((*SqlExecutor)(nil)).Elem()
+	numDbMapMethods := dbMapType.NumMethod()
+	for i := 0; i < numDbMapMethods; i += 1 {
+		dbMapMethod := dbMapType.Method(i)
+		if !strings.HasPrefix(dbMapMethod.Name, "Select") {
+			continue
+		}
+		if _, found := sqlExecutorType.MethodByName(dbMapMethod.Name); !found {
+			t.Errorf("Method %s is defined on DbMap but not implemented in SqlExecutor",
+				dbMapMethod.Name)
+		}
+	}
+}
+
+type WithTime struct {
+	Id   int64
+	Time time.Time
+}
+
+type Times struct {
+	One time.Time
+	Two time.Time
+}
+
+type EmbeddedTime struct {
+	Id string
+	Times
+}
+
+func parseTimeOrPanic(format, date string) time.Time {
+	t1, err := time.Parse(format, date)
+	if err != nil {
+		panic(err)
+	}
+	return t1
+}
+
+// TODO: re-enable next two tests when this is merged:
+// https://github.com/ziutek/mymysql/pull/77
+//
+// This test currently fails w/MySQL b/c tz info is lost
+func testWithTime(t *testing.T) {
+	dbmap := initDbMap()
+	defer dropAndClose(dbmap)
+
+	t1 := parseTimeOrPanic("2006-01-02 15:04:05 -0700 MST",
+		"2013-08-09 21:30:43 +0800 CST")
+	w1 := WithTime{1, t1}
+	_insert(dbmap, &w1)
+
+	obj := _get(dbmap, WithTime{}, w1.Id)
+	w2 := obj.(*WithTime)
+	if w1.Time.UnixNano() != w2.Time.UnixNano() {
+		t.Errorf("%v != %v", w1, w2)
+	}
+}
+
+// See: https://github.com/coopernurse/gorp/issues/86
+func testEmbeddedTime(t *testing.T) {
+	dbmap := newDbMap()
+	dbmap.TraceOn("", log.New(os.Stdout, "gorptest: ", log.Lmicroseconds))
+	dbmap.AddTable(EmbeddedTime{}).SetKeys(false, "Id")
+	defer dropAndClose(dbmap)
+	err := dbmap.CreateTables()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	time1 := parseTimeOrPanic("2006-01-02 15:04:05", "2013-08-09 21:30:43")
+
+	t1 := &EmbeddedTime{Id: "abc", Times: Times{One: time1, Two: time1.Add(10 * time.Second)}}
+	_insert(dbmap, t1)
+
+	x := _get(dbmap, EmbeddedTime{}, t1.Id)
+	t2, _ := x.(*EmbeddedTime)
+	if t1.One.UnixNano() != t2.One.UnixNano() || t1.Two.UnixNano() != t2.Two.UnixNano() {
+		t.Errorf("%v != %v", t1, t2)
+	}
+}
+
+func TestWithTimeSelect(t *testing.T) {
+	dbmap := initDbMap()
+	defer dropAndClose(dbmap)
+
+	halfhourago := time.Now().UTC().Add(-30 * time.Minute)
+
+	w1 := WithTime{1, halfhourago.Add(time.Minute * -1)}
+	w2 := WithTime{2, halfhourago.Add(time.Second)}
+	_insert(dbmap, &w1, &w2)
+
+	var caseIds []int64
+	_, err := dbmap.Select(&caseIds, "SELECT id FROM time_test WHERE Time < "+dbmap.Dialect.BindVar(0), halfhourago)
+
+	if err != nil {
+		t.Error(err)
+	}
+	if len(caseIds) != 1 {
+		t.Errorf("%d != 1", len(caseIds))
+	}
+	if caseIds[0] != w1.Id {
+		t.Errorf("%d != %d", caseIds[0], w1.Id)
+	}
+}
+
+func TestInvoicePersonView(t *testing.T) {
+	dbmap := initDbMap()
+	defer dropAndClose(dbmap)
+
+	// Create some rows
+	p1 := &Person{0, 0, 0, "bob", "smith", 0}
+	dbmap.Insert(p1)
+
+	// notice how we can wire up p1.Id to the invoice easily
+	inv1 := &Invoice{0, 0, 0, "xmas order", p1.Id, false}
+	dbmap.Insert(inv1)
+
+	// Run your query
+	query := "select i.Id InvoiceId, p.Id PersonId, i.Memo, p.FName " +
+		"from invoice_test i, person_test p " +
+		"where i.PersonId = p.Id"
+
+	// pass a slice of pointers to Select()
+	// this avoids the need to type assert after the query is run
+	var list []*InvoicePersonView
+	_, err := dbmap.Select(&list, query)
+	if err != nil {
+		panic(err)
+	}
+
+	// this should test true
+	expected := &InvoicePersonView{inv1.Id, p1.Id, inv1.Memo, p1.FName, 0}
+	if !reflect.DeepEqual(list[0], expected) {
+		t.Errorf("%v != %v", list[0], expected)
+	}
+}
+
+func TestQuoteTableNames(t *testing.T) {
+	dbmap := initDbMap()
+	defer dropAndClose(dbmap)
+
+	quotedTableName := dbmap.Dialect.QuoteField("person_test")
+
+	// Use a buffer to hold the log to check generated queries
+	logBuffer := &bytes.Buffer{}
+	dbmap.TraceOn("", log.New(logBuffer, "gorptest:", log.Lmicroseconds))
+
+	// Create some rows
+	p1 := &Person{0, 0, 0, "bob", "smith", 0}
+	errorTemplate := "Expected quoted table name %v in query but didn't find it"
+
+	// Check if Insert quotes the table name
+	id := dbmap.Insert(p1)
+	if !bytes.Contains(logBuffer.Bytes(), []byte(quotedTableName)) {
+		t.Errorf(errorTemplate, quotedTableName)
+	}
+	logBuffer.Reset()
+
+	// Check if Get quotes the table name
+	dbmap.Get(Person{}, id)
+	if !bytes.Contains(logBuffer.Bytes(), []byte(quotedTableName)) {
+		t.Errorf(errorTemplate, quotedTableName)
+	}
+	logBuffer.Reset()
+}
+
+func TestSelectTooManyCols(t *testing.T) {
+	dbmap := initDbMap()
+	defer dropAndClose(dbmap)
+
+	p1 := &Person{0, 0, 0, "bob", "smith", 0}
+	p2 := &Person{0, 0, 0, "jane", "doe", 0}
+	_insert(dbmap, p1)
+	_insert(dbmap, p2)
+
+	obj := _get(dbmap, Person{}, p1.Id)
+	p1 = obj.(*Person)
+	obj = _get(dbmap, Person{}, p2.Id)
+	p2 = obj.(*Person)
+
+	params := map[string]interface{}{
+		"Id": p1.Id,
+	}
+
+	var p3 FNameOnly
+	err := dbmap.SelectOne(&p3, "select * from person_test where Id=:Id", params)
+	if err != nil {
+		if !NonFatalError(err) {
+			t.Error(err)
+		}
+	} else {
+		t.Errorf("Non-fatal error expected")
+	}
+
+	if p1.FName != p3.FName {
+		t.Errorf("%v != %v", p1.FName, p3.FName)
+	}
+
+	var pSlice []FNameOnly
+	_, err = dbmap.Select(&pSlice, "select * from person_test order by fname asc")
+	if err != nil {
+		if !NonFatalError(err) {
+			t.Error(err)
+		}
+	} else {
+		t.Errorf("Non-fatal error expected")
+	}
+
+	if p1.FName != pSlice[0].FName {
+		t.Errorf("%v != %v", p1.FName, pSlice[0].FName)
+	}
+	if p2.FName != pSlice[1].FName {
+		t.Errorf("%v != %v", p2.FName, pSlice[1].FName)
+	}
+}
+
+func TestSelectSingleVal(t *testing.T) {
+	dbmap := initDbMap()
+	defer dropAndClose(dbmap)
+
+	p1 := &Person{0, 0, 0, "bob", "smith", 0}
+	_insert(dbmap, p1)
+
+	obj := _get(dbmap, Person{}, p1.Id)
+	p1 = obj.(*Person)
+
+	params := map[string]interface{}{
+		"Id": p1.Id,
+	}
+
+	var p2 Person
+	err := dbmap.SelectOne(&p2, "select * from person_test where Id=:Id", params)
+	if err != nil {
+		t.Error(err)
+	}
+
+	if !reflect.DeepEqual(p1, &p2) {
+		t.Errorf("%v != %v", p1, &p2)
+	}
+
+	// verify SelectOne allows non-struct holders
+	var s string
+	err = dbmap.SelectOne(&s, "select FName from person_test where Id=:Id", params)
+	if err != nil {
+		t.Error(err)
+	}
+	if s != "bob" {
+		t.Error("Expected bob but got: " + s)
+	}
+
+	// verify SelectOne requires pointer receiver
+	err = dbmap.SelectOne(s, "select FName from person_test where Id=:Id", params)
+	if err == nil {
+		t.Error("SelectOne should have returned error for non-pointer holder")
+	}
+
+	// verify SelectOne works with uninitialized pointers
+	var p3 *Person
+	err = dbmap.SelectOne(&p3, "select * from person_test where Id=:Id", params)
+	if err != nil {
+		t.Error(err)
+	}
+
+	if !reflect.DeepEqual(p1, p3) {
+		t.Errorf("%v != %v", p1, p3)
+	}
+
+	// verify that the receiver is still nil if nothing was found
+	var p4 *Person
+	dbmap.SelectOne(&p3, "select * from person_test where 2<1 AND Id=:Id", params)
+	if p4 != nil {
+		t.Error("SelectOne should not have changed a nil receiver when no rows were found")
+	}
+
+	// verify that the error is set to sql.ErrNoRows if not found
+	err = dbmap.SelectOne(&p2, "select * from person_test where Id=:Id", map[string]interface{}{
+		"Id": -2222,
+	})
+	if err == nil || err != sql.ErrNoRows {
+		t.Error("SelectOne should have returned an sql.ErrNoRows")
+	}
+
+	_insert(dbmap, &Person{0, 0, 0, "bob", "smith", 0})
+	err = dbmap.SelectOne(&p2, "select * from person_test where Fname='bob'")
+	if err == nil {
+		t.Error("Expected error when two rows found")
+	}
+
+	// tests for #150
+	var tInt int64
+	var tStr string
+	var tBool bool
+	var tFloat float64
+	primVals := []interface{}{tInt, tStr, tBool, tFloat}
+	for _, prim := range primVals {
+		err = dbmap.SelectOne(&prim, "select * from person_test where Id=-123")
+		if err == nil || err != sql.ErrNoRows {
+			t.Error("primVals: SelectOne should have returned sql.ErrNoRows")
+		}
+	}
+}
+
+func TestSelectAlias(t *testing.T) {
+	dbmap := initDbMap()
+	defer dropAndClose(dbmap)
+
+	p1 := &IdCreatedExternal{IdCreated: IdCreated{Id: 1, Created: 3}, External: 2}
+
+	// Insert using embedded IdCreated, which reflects the structure of the table
+	_insert(dbmap, &p1.IdCreated)
+
+	// Select into IdCreatedExternal type, which includes some fields not present
+	// in id_created_test
+	var p2 IdCreatedExternal
+	err := dbmap.SelectOne(&p2, "select * from id_created_test where Id=1")
+	if err != nil {
+		t.Error(err)
+	}
+	if p2.Id != 1 || p2.Created != 3 || p2.External != 0 {
+		t.Error("Expected ignored field defaults to not set")
+	}
+
+	// Prove that we can supply an aliased value in the select, and that it will
+	// automatically map to IdCreatedExternal.External
+	err = dbmap.SelectOne(&p2, "SELECT *, 1 AS external FROM id_created_test")
+	if err != nil {
+		t.Error(err)
+	}
+	if p2.External != 1 {
+		t.Error("Expected select as can map to exported field.")
+	}
+
+	var rows *sql.Rows
+	var cols []string
+	rows, err = dbmap.Db.Query("SELECT * FROM id_created_test")
+	cols, err = rows.Columns()
+	if err != nil || len(cols) != 2 {
+		t.Error("Expected ignored column not created")
+	}
+}
+
+func TestMysqlPanicIfDialectNotInitialized(t *testing.T) {
+	_, driver := dialectAndDriver()
+	// this test only applies to MySQL
+	if os.Getenv("GORP_TEST_DIALECT") != "mysql" {
+		return
+	}
+
+	// The expected behaviour is to catch a panic.
+	// Here is the deferred function which will check if a panic has indeed occurred :
+	defer func() {
+		r := recover()
+		if r == nil {
+			t.Error("db.CreateTables() should panic if db is initialized with an incorrect MySQLDialect")
+		}
+	}()
+
+	// invalid MySQLDialect : does not contain Engine or Encoding specification
+	dialect := MySQLDialect{}
+	db := &DbMap{Db: connect(driver), Dialect: dialect}
+	db.AddTableWithName(Invoice{}, "invoice")
+	// the following call should panic :
+	db.CreateTables()
+}
+
+func TestSingleColumnKeyDbReturnsZeroRowsUpdatedOnPKChange(t *testing.T) {
+	dbmap := initDbMap()
+	defer dropAndClose(dbmap)
+	dbmap.AddTableWithName(SingleColumnTable{}, "single_column_table").SetKeys(false, "SomeId")
+	err := dbmap.DropTablesIfExists()
+	if err != nil {
+		t.Error("Drop tables failed")
+	}
+	err = dbmap.CreateTablesIfNotExists()
+	if err != nil {
+		t.Error("Create tables failed")
+	}
+	err = dbmap.TruncateTables()
+	if err != nil {
+		t.Error("Truncate tables failed")
+	}
+
+	sct := SingleColumnTable{
+		SomeId: "A Unique Id String",
+	}
+
+	count, err := dbmap.Update(&sct)
+	if err != nil {
+		t.Error(err)
+	}
+	if count != 0 {
+		t.Errorf("Expected 0 updated rows, got %d", count)
+	}
+
+}
+
+func TestPrepare(t *testing.T) {
+	dbmap := initDbMap()
+	defer dropAndClose(dbmap)
+
+	inv1 := &Invoice{0, 100, 200, "prepare-foo", 0, false}
+	inv2 := &Invoice{0, 100, 200, "prepare-bar", 0, false}
+	_insert(dbmap, inv1, inv2)
+
+	bindVar0 := dbmap.Dialect.BindVar(0)
+	bindVar1 := dbmap.Dialect.BindVar(1)
+	stmt, err := dbmap.Prepare(fmt.Sprintf("UPDATE invoice_test SET Memo=%s WHERE Id=%s", bindVar0, bindVar1))
+	if err != nil {
+		t.Error(err)
+	}
+	defer stmt.Close()
+	_, err = stmt.Exec("prepare-baz", inv1.Id)
+	if err != nil {
+		t.Error(err)
+	}
+	err = dbmap.SelectOne(inv1, "SELECT * from invoice_test WHERE Memo='prepare-baz'")
+	if err != nil {
+		t.Error(err)
+	}
+
+	trans, err := dbmap.Begin()
+	if err != nil {
+		t.Error(err)
+	}
+	transStmt, err := trans.Prepare(fmt.Sprintf("UPDATE invoice_test SET IsPaid=%s WHERE Id=%s", bindVar0, bindVar1))
+	if err != nil {
+		t.Error(err)
+	}
+	defer transStmt.Close()
+	_, err = transStmt.Exec(true, inv2.Id)
+	if err != nil {
+		t.Error(err)
+	}
+	err = dbmap.SelectOne(inv2, fmt.Sprintf("SELECT * from invoice_test WHERE IsPaid=%s", bindVar0), true)
+	if err == nil || err != sql.ErrNoRows {
+		t.Error("SelectOne should have returned an sql.ErrNoRows")
+	}
+	err = trans.SelectOne(inv2, fmt.Sprintf("SELECT * from invoice_test WHERE IsPaid=%s", bindVar0), true)
+	if err != nil {
+		t.Error(err)
+	}
+	err = trans.Commit()
+	if err != nil {
+		t.Error(err)
+	}
+	err = dbmap.SelectOne(inv2, fmt.Sprintf("SELECT * from invoice_test WHERE IsPaid=%s", bindVar0), true)
+	if err != nil {
+		t.Error(err)
+	}
+}
+
+func BenchmarkNativeCrud(b *testing.B) {
+	b.StopTimer()
+	dbmap := initDbMapBench()
+	defer dropAndClose(dbmap)
+	b.StartTimer()
+
+	insert := "insert into invoice_test (Created, Updated, Memo, PersonId) values (?, ?, ?, ?)"
+	sel := "select Id, Created, Updated, Memo, PersonId from invoice_test where Id=?"
+	update := "update invoice_test set Created=?, Updated=?, Memo=?, PersonId=? where Id=?"
+	delete := "delete from invoice_test where Id=?"
+
+	inv := &Invoice{0, 100, 200, "my memo", 0, false}
+
+	for i := 0; i < b.N; i++ {
+		res, err := dbmap.Db.Exec(insert, inv.Created, inv.Updated,
+			inv.Memo, inv.PersonId)
+		if err != nil {
+			panic(err)
+		}
+
+		newid, err := res.LastInsertId()
+		if err != nil {
+			panic(err)
+		}
+		inv.Id = newid
+
+		row := dbmap.Db.QueryRow(sel, inv.Id)
+		err = row.Scan(&inv.Id, &inv.Created, &inv.Updated, &inv.Memo,
+			&inv.PersonId)
+		if err != nil {
+			panic(err)
+		}
+
+		inv.Created = 1000
+		inv.Updated = 2000
+		inv.Memo = "my memo 2"
+		inv.PersonId = 3000
+
+		_, err = dbmap.Db.Exec(update, inv.Created, inv.Updated, inv.Memo,
+			inv.PersonId, inv.Id)
+		if err != nil {
+			panic(err)
+		}
+
+		_, err = dbmap.Db.Exec(delete, inv.Id)
+		if err != nil {
+			panic(err)
+		}
+	}
+
+}
+
+func BenchmarkGorpCrud(b *testing.B) {
+	b.StopTimer()
+	dbmap := initDbMapBench()
+	defer dropAndClose(dbmap)
+	b.StartTimer()
+
+	inv := &Invoice{0, 100, 200, "my memo", 0, true}
+	for i := 0; i < b.N; i++ {
+		err := dbmap.Insert(inv)
+		if err != nil {
+			panic(err)
+		}
+
+		obj, err := dbmap.Get(Invoice{}, inv.Id)
+		if err != nil {
+			panic(err)
+		}
+
+		inv2, ok := obj.(*Invoice)
+		if !ok {
+			panic(fmt.Sprintf("expected *Invoice, got: %v", obj))
+		}
+
+		inv2.Created = 1000
+		inv2.Updated = 2000
+		inv2.Memo = "my memo 2"
+		inv2.PersonId = 3000
+		_, err = dbmap.Update(inv2)
+		if err != nil {
+			panic(err)
+		}
+
+		_, err = dbmap.Delete(inv2)
+		if err != nil {
+			panic(err)
+		}
+
+	}
+}
+
+func initDbMapBench() *DbMap {
+	dbmap := newDbMap()
+	dbmap.Db.Exec("drop table if exists invoice_test")
+	dbmap.AddTableWithName(Invoice{}, "invoice_test").SetKeys(true, "Id")
+	err := dbmap.CreateTables()
+	if err != nil {
+		panic(err)
+	}
+	return dbmap
+}
+
+func initDbMap() *DbMap {
+	dbmap := newDbMap()
+	dbmap.AddTableWithName(Invoice{}, "invoice_test").SetKeys(true, "Id")
+	dbmap.AddTableWithName(InvoiceTag{}, "invoice_tag_test").SetKeys(true, "myid")
+	dbmap.AddTableWithName(AliasTransientField{}, "alias_trans_field_test").SetKeys(true, "id")
+	dbmap.AddTableWithName(OverriddenInvoice{}, "invoice_override_test").SetKeys(false, "Id")
+	dbmap.AddTableWithName(Person{}, "person_test").SetKeys(true, "Id")
+	dbmap.AddTableWithName(WithIgnoredColumn{}, "ignored_column_test").SetKeys(true, "Id")
+	dbmap.AddTableWithName(IdCreated{}, "id_created_test").SetKeys(true, "Id")
+	dbmap.AddTableWithName(TypeConversionExample{}, "type_conv_test").SetKeys(true, "Id")
+	dbmap.AddTableWithName(WithEmbeddedStruct{}, "embedded_struct_test").SetKeys(true, "Id")
+	dbmap.AddTableWithName(WithEmbeddedStructBeforeAutoincrField{}, "embedded_struct_before_autoincr_test").SetKeys(true, "Id")
+	dbmap.AddTableWithName(WithEmbeddedAutoincr{}, "embedded_autoincr_test").SetKeys(true, "Id")
+	dbmap.AddTableWithName(WithTime{}, "time_test").SetKeys(true, "Id")
+	dbmap.TypeConverter = testTypeConverter{}
+	err := dbmap.DropTablesIfExists()
+	if err != nil {
+		panic(err)
+	}
+	err = dbmap.CreateTables()
+	if err != nil {
+		panic(err)
+	}
+
+	// See #146 and TestSelectAlias - this type is mapped to the same
+	// table as IdCreated, but includes an extra field that isn't in the table
+	dbmap.AddTableWithName(IdCreatedExternal{}, "id_created_test").SetKeys(true, "Id")
+
+	return dbmap
+}
+
+func initDbMapNulls() *DbMap {
+	dbmap := newDbMap()
+	dbmap.TraceOn("", log.New(os.Stdout, "gorptest: ", log.Lmicroseconds))
+	dbmap.AddTable(TableWithNull{}).SetKeys(false, "Id")
+	err := dbmap.CreateTables()
+	if err != nil {
+		panic(err)
+	}
+	return dbmap
+}
+
+func newDbMap() *DbMap {
+	dialect, driver := dialectAndDriver()
+	dbmap := &DbMap{Db: connect(driver), Dialect: dialect}
+	dbmap.TraceOn("", log.New(os.Stdout, "gorptest: ", log.Lmicroseconds))
+	return dbmap
+}
+
+func dropAndClose(dbmap *DbMap) {
+	dbmap.DropTablesIfExists()
+	dbmap.Db.Close()
+}
+
+func connect(driver string) *sql.DB {
+	dsn := os.Getenv("GORP_TEST_DSN")
+	if dsn == "" {
+		panic("GORP_TEST_DSN env variable is not set. Please see README.md")
+	}
+
+	db, err := sql.Open(driver, dsn)
+	if err != nil {
+		panic("Error connecting to db: " + err.Error())
+	}
+	return db
+}
+
+func dialectAndDriver() (Dialect, string) {
+	switch os.Getenv("GORP_TEST_DIALECT") {
+	case "mysql":
+		return MySQLDialect{"InnoDB", "UTF8"}, "mymysql"
+	case "gomysql":
+		return MySQLDialect{"InnoDB", "UTF8"}, "mysql"
+	case "postgres":
+		return PostgresDialect{}, "postgres"
+	case "sqlite":
+		return SqliteDialect{}, "sqlite3"
+	}
+	panic("GORP_TEST_DIALECT env variable is not set or is invalid. Please see README.md")
+}
+
+func _insert(dbmap *DbMap, list ...interface{}) {
+	err := dbmap.Insert(list...)
+	if err != nil {
+		panic(err)
+	}
+}
+
+func _update(dbmap *DbMap, list ...interface{}) int64 {
+	count, err := dbmap.Update(list...)
+	if err != nil {
+		panic(err)
+	}
+	return count
+}
+
+func _del(dbmap *DbMap, list ...interface{}) int64 {
+	count, err := dbmap.Delete(list...)
+	if err != nil {
+		panic(err)
+	}
+
+	return count
+}
+
+func _get(dbmap *DbMap, i interface{}, keys ...interface{}) interface{} {
+	obj, err := dbmap.Get(i, keys...)
+	if err != nil {
+		panic(err)
+	}
+
+	return obj
+}
+
+func selectInt(dbmap *DbMap, query string, args ...interface{}) int64 {
+	i64, err := SelectInt(dbmap, query, args...)
+	if err != nil {
+		panic(err)
+	}
+
+	return i64
+}
+
+func selectNullInt(dbmap *DbMap, query string, args ...interface{}) sql.NullInt64 {
+	i64, err := SelectNullInt(dbmap, query, args...)
+	if err != nil {
+		panic(err)
+	}
+
+	return i64
+}
+
+func selectFloat(dbmap *DbMap, query string, args ...interface{}) float64 {
+	f64, err := SelectFloat(dbmap, query, args...)
+	if err != nil {
+		panic(err)
+	}
+
+	return f64
+}
+
+func selectNullFloat(dbmap *DbMap, query string, args ...interface{}) sql.NullFloat64 {
+	f64, err := SelectNullFloat(dbmap, query, args...)
+	if err != nil {
+		panic(err)
+	}
+
+	return f64
+}
+
+func selectStr(dbmap *DbMap, query string, args ...interface{}) string {
+	s, err := SelectStr(dbmap, query, args...)
+	if err != nil {
+		panic(err)
+	}
+
+	return s
+}
+
+func selectNullStr(dbmap *DbMap, query string, args ...interface{}) sql.NullString {
+	s, err := SelectNullStr(dbmap, query, args...)
+	if err != nil {
+		panic(err)
+	}
+
+	return s
+}
+
+func _rawexec(dbmap *DbMap, query string, args ...interface{}) sql.Result {
+	res, err := dbmap.Exec(query, args...)
+	if err != nil {
+		panic(err)
+	}
+	return res
+}
+
+func _rawselect(dbmap *DbMap, i interface{}, query string, args ...interface{}) []interface{} {
+	list, err := dbmap.Select(i, query, args...)
+	if err != nil {
+		panic(err)
+	}
+	return list
+}
diff --git a/Godeps/_workspace/src/github.com/coopernurse/gorp/test_all.sh b/Godeps/_workspace/src/github.com/coopernurse/gorp/test_all.sh
new file mode 100644
index 00000000..f870b39a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coopernurse/gorp/test_all.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# on macs, you may need to:
+# export GOBUILDFLAG=-ldflags -linkmode=external
+
+set -e 
+
+export GORP_TEST_DSN=gorptest/gorptest/gorptest
+export GORP_TEST_DIALECT=mysql
+go test $GOBUILDFLAG .
+
+export GORP_TEST_DSN=gorptest:gorptest@/gorptest
+export GORP_TEST_DIALECT=gomysql
+go test $GOBUILDFLAG .
+
+export GORP_TEST_DSN="user=gorptest password=gorptest dbname=gorptest sslmode=disable"
+export GORP_TEST_DIALECT=postgres
+go test $GOBUILDFLAG .
+
+export GORP_TEST_DSN=/tmp/gorptest.bin
+export GORP_TEST_DIALECT=sqlite
+go test $GOBUILDFLAG .
diff --git a/Godeps/_workspace/src/github.com/coreos/dex b/Godeps/_workspace/src/github.com/coreos/dex
new file mode 120000
index 00000000..3da6a3f7
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/dex
@@ -0,0 +1 @@
+/Users/bobbyrullo/dex
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/http/client.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/http/client.go
new file mode 100644
index 00000000..942e2bb1
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/http/client.go
@@ -0,0 +1,51 @@
+package http
+
+import (
+	"io/ioutil"
+	"net/http"
+	"net/http/httptest"
+)
+
+type Client interface {
+	Do(*http.Request) (*http.Response, error)
+}
+
+type HandlerClient struct {
+	Handler http.Handler
+}
+
+func (hc *HandlerClient) Do(r *http.Request) (*http.Response, error) {
+	w := httptest.NewRecorder()
+	hc.Handler.ServeHTTP(w, r)
+
+	resp := http.Response{
+		StatusCode: w.Code,
+		Header:     w.Header(),
+		Body:       ioutil.NopCloser(w.Body),
+	}
+
+	return &resp, nil
+}
+
+type RequestRecorder struct {
+	Response *http.Response
+	Error    error
+
+	Request *http.Request
+}
+
+func (rr *RequestRecorder) Do(req *http.Request) (*http.Response, error) {
+	rr.Request = req
+
+	if rr.Response == nil && rr.Error == nil {
+		panic("RequestRecorder Response and Error cannot both be nil")
+	} else if rr.Response != nil && rr.Error != nil {
+		panic("RequestRecorder Response and Error cannot both be non-nil")
+	}
+
+	return rr.Response, rr.Error
+}
+
+func (rr *RequestRecorder) RoundTrip(req *http.Request) (*http.Response, error) {
+	return rr.Do(req)
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/http/http.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/http/http.go
new file mode 100644
index 00000000..f0d051b5
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/http/http.go
@@ -0,0 +1,159 @@
+package http
+
+import (
+	"encoding/base64"
+	"encoding/json"
+	"errors"
+	"net/http"
+	"net/url"
+	"path"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/coreos/pkg/capnslog"
+)
+
+var (
+	log = capnslog.NewPackageLogger("github.com/coreos/go-oidc", "http")
+)
+
+func WriteError(w http.ResponseWriter, code int, msg string) {
+	e := struct {
+		Error string `json:"error"`
+	}{
+		Error: msg,
+	}
+	b, err := json.Marshal(e)
+	if err != nil {
+		log.Errorf("Failed marshaling %#v to JSON: %v", e, err)
+	}
+	w.Header().Set("Content-Type", "application/json")
+	w.WriteHeader(code)
+	w.Write(b)
+}
+
+// BasicAuth parses a username and password from the request's
+// Authorization header. This was pulled from golang master:
+// https://codereview.appspot.com/76540043
+func BasicAuth(r *http.Request) (username, password string, ok bool) {
+	auth := r.Header.Get("Authorization")
+	if auth == "" {
+		return
+	}
+
+	if !strings.HasPrefix(auth, "Basic ") {
+		return
+	}
+	c, err := base64.StdEncoding.DecodeString(strings.TrimPrefix(auth, "Basic "))
+	if err != nil {
+		return
+	}
+	cs := string(c)
+	s := strings.IndexByte(cs, ':')
+	if s < 0 {
+		return
+	}
+	return cs[:s], cs[s+1:], true
+}
+
+func cacheControlMaxAge(hdr string) (time.Duration, bool, error) {
+	for _, field := range strings.Split(hdr, ",") {
+		parts := strings.SplitN(strings.TrimSpace(field), "=", 2)
+		k := strings.ToLower(strings.TrimSpace(parts[0]))
+		if k != "max-age" {
+			continue
+		}
+
+		if len(parts) == 1 {
+			return 0, false, errors.New("max-age has no value")
+		}
+
+		v := strings.TrimSpace(parts[1])
+		if v == "" {
+			return 0, false, errors.New("max-age has empty value")
+		}
+
+		age, err := strconv.Atoi(v)
+		if err != nil {
+			return 0, false, err
+		}
+
+		if age <= 0 {
+			return 0, false, nil
+		}
+
+		return time.Duration(age) * time.Second, true, nil
+	}
+
+	return 0, false, nil
+}
+
+func expires(date, expires string) (time.Duration, bool, error) {
+	if date == "" || expires == "" {
+		return 0, false, nil
+	}
+
+	te, err := time.Parse(time.RFC1123, expires)
+	if err != nil {
+		return 0, false, err
+	}
+
+	td, err := time.Parse(time.RFC1123, date)
+	if err != nil {
+		return 0, false, err
+	}
+
+	ttl := te.Sub(td)
+
+	// headers indicate data already expired, caller should not
+	// have to care about this case
+	if ttl <= 0 {
+		return 0, false, nil
+	}
+
+	return ttl, true, nil
+}
+
+func Cacheable(hdr http.Header) (time.Duration, bool, error) {
+	ttl, ok, err := cacheControlMaxAge(hdr.Get("Cache-Control"))
+	if err != nil || ok {
+		return ttl, ok, err
+	}
+
+	return expires(hdr.Get("Date"), hdr.Get("Expires"))
+}
+
+// MergeQuery appends additional query values to an existing URL.
+func MergeQuery(u url.URL, q url.Values) url.URL {
+	uv := u.Query()
+	for k, vs := range q {
+		for _, v := range vs {
+			uv.Add(k, v)
+		}
+	}
+	u.RawQuery = uv.Encode()
+	return u
+}
+
+// NewResourceLocation appends a resource id to the end of the requested URL path.
+func NewResourceLocation(reqURL *url.URL, id string) string {
+	var u url.URL
+	u = *reqURL
+	u.Path = path.Join(u.Path, id)
+	u.RawQuery = ""
+	u.Fragment = ""
+	return u.String()
+}
+
+// CopyRequest returns a clone of the provided *http.Request.
+// The returned object is a shallow copy of the struct and a
+// deep copy of its Header field.
+func CopyRequest(r *http.Request) *http.Request {
+	r2 := *r
+	r2.Header = make(http.Header)
+	for k, s := range r.Header {
+		r2.Header[k] = s
+	}
+	return &r2
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/http/http_test.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/http/http_test.go
new file mode 100644
index 00000000..8ec76a24
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/http/http_test.go
@@ -0,0 +1,380 @@
+package http
+
+import (
+	"net/http"
+	"net/url"
+	"reflect"
+	"strings"
+	"testing"
+	"time"
+)
+
+func TestCacheControlMaxAgeSuccess(t *testing.T) {
+	tests := []struct {
+		hdr     string
+		wantAge time.Duration
+		wantOK  bool
+	}{
+		{"max-age=12", 12 * time.Second, true},
+		{"max-age=-12", 0, false},
+		{"max-age=0", 0, false},
+		{"public, max-age=12", 12 * time.Second, true},
+		{"public, max-age=40192, must-revalidate", 40192 * time.Second, true},
+		{"public, not-max-age=12, must-revalidate", time.Duration(0), false},
+	}
+
+	for i, tt := range tests {
+		maxAge, ok, err := cacheControlMaxAge(tt.hdr)
+		if err != nil {
+			t.Errorf("case %d: err=%v", i, err)
+		}
+		if tt.wantAge != maxAge {
+			t.Errorf("case %d: want=%d got=%d", i, tt.wantAge, maxAge)
+		}
+		if tt.wantOK != ok {
+			t.Errorf("case %d: incorrect ok value: want=%t got=%t", i, tt.wantOK, ok)
+		}
+	}
+}
+
+func TestCacheControlMaxAgeFail(t *testing.T) {
+	tests := []string{
+		"max-age=aasdf",
+		"max-age=",
+		"max-age",
+	}
+
+	for i, tt := range tests {
+		_, ok, err := cacheControlMaxAge(tt)
+		if ok {
+			t.Errorf("case %d: want ok=false, got true", i)
+		}
+		if err == nil {
+			t.Errorf("case %d: want non-nil err", i)
+		}
+	}
+}
+
+func TestMergeQuery(t *testing.T) {
+	tests := []struct {
+		u string
+		q url.Values
+		w string
+	}{
+		// No values
+		{
+			u: "http://example.com",
+			q: nil,
+			w: "http://example.com",
+		},
+		// No additional values
+		{
+			u: "http://example.com?foo=bar",
+			q: nil,
+			w: "http://example.com?foo=bar",
+		},
+		// Simple addition
+		{
+			u: "http://example.com",
+			q: url.Values{
+				"foo": []string{"bar"},
+			},
+			w: "http://example.com?foo=bar",
+		},
+		// Addition with existing values
+		{
+			u: "http://example.com?dog=boo",
+			q: url.Values{
+				"foo": []string{"bar"},
+			},
+			w: "http://example.com?dog=boo&foo=bar",
+		},
+		// Merge
+		{
+			u: "http://example.com?dog=boo",
+			q: url.Values{
+				"dog": []string{"elroy"},
+			},
+			w: "http://example.com?dog=boo&dog=elroy",
+		},
+		// Add and merge
+		{
+			u: "http://example.com?dog=boo",
+			q: url.Values{
+				"dog": []string{"elroy"},
+				"foo": []string{"bar"},
+			},
+			w: "http://example.com?dog=boo&dog=elroy&foo=bar",
+		},
+		// Multivalue merge
+		{
+			u: "http://example.com?dog=boo",
+			q: url.Values{
+				"dog": []string{"elroy", "penny"},
+			},
+			w: "http://example.com?dog=boo&dog=elroy&dog=penny",
+		},
+	}
+
+	for i, tt := range tests {
+		ur, err := url.Parse(tt.u)
+		if err != nil {
+			t.Errorf("case %d: failed parsing test url: %v, error: %v", i, tt.u, err)
+		}
+
+		got := MergeQuery(*ur, tt.q)
+		want, err := url.Parse(tt.w)
+		if err != nil {
+			t.Errorf("case %d: failed parsing want url: %v, error: %v", i, tt.w, err)
+		}
+
+		if !reflect.DeepEqual(*want, got) {
+			t.Errorf("case %d: want: %v, got: %v", i, *want, got)
+		}
+	}
+}
+
+func TestExpiresPass(t *testing.T) {
+	tests := []struct {
+		date    string
+		exp     string
+		wantTTL time.Duration
+		wantOK  bool
+	}{
+		// Expires and Date properly set
+		{
+			date:    "Thu, 01 Dec 1983 22:00:00 GMT",
+			exp:     "Fri, 02 Dec 1983 01:00:00 GMT",
+			wantTTL: 10800 * time.Second,
+			wantOK:  true,
+		},
+		// empty headers
+		{
+			date:   "",
+			exp:    "",
+			wantOK: false,
+		},
+		// lack of Expirs short-ciruits Date parsing
+		{
+			date:   "foo",
+			exp:    "",
+			wantOK: false,
+		},
+		// lack of Date short-ciruits Expires parsing
+		{
+			date:   "",
+			exp:    "foo",
+			wantOK: false,
+		},
+		// no Date
+		{
+			exp:     "Thu, 01 Dec 1983 22:00:00 GMT",
+			wantTTL: 0,
+			wantOK:  false,
+		},
+		// no Expires
+		{
+			date:    "Thu, 01 Dec 1983 22:00:00 GMT",
+			wantTTL: 0,
+			wantOK:  false,
+		},
+		// Expires < Date
+		{
+			date:    "Fri, 02 Dec 1983 01:00:00 GMT",
+			exp:     "Thu, 01 Dec 1983 22:00:00 GMT",
+			wantTTL: 0,
+			wantOK:  false,
+		},
+	}
+
+	for i, tt := range tests {
+		ttl, ok, err := expires(tt.date, tt.exp)
+		if err != nil {
+			t.Errorf("case %d: err=%v", i, err)
+		}
+		if tt.wantTTL != ttl {
+			t.Errorf("case %d: want=%d got=%d", i, tt.wantTTL, ttl)
+		}
+		if tt.wantOK != ok {
+			t.Errorf("case %d: incorrect ok value: want=%t got=%t", i, tt.wantOK, ok)
+		}
+	}
+}
+
+func TestExpiresFail(t *testing.T) {
+	tests := []struct {
+		date string
+		exp  string
+	}{
+		// malformed Date header
+		{
+			date: "foo",
+			exp:  "Fri, 02 Dec 1983 01:00:00 GMT",
+		},
+		// malformed exp header
+		{
+			date: "Fri, 02 Dec 1983 01:00:00 GMT",
+			exp:  "bar",
+		},
+	}
+
+	for i, tt := range tests {
+		_, _, err := expires(tt.date, tt.exp)
+		if err == nil {
+			t.Errorf("case %d: expected non-nil error", i)
+		}
+	}
+}
+
+func TestCacheablePass(t *testing.T) {
+	tests := []struct {
+		headers http.Header
+		wantTTL time.Duration
+		wantOK  bool
+	}{
+		// valid Cache-Control
+		{
+			headers: http.Header{
+				"Cache-Control": []string{"max-age=100"},
+			},
+			wantTTL: 100 * time.Second,
+			wantOK:  true,
+		},
+		// valid Date/Expires
+		{
+			headers: http.Header{
+				"Date":    []string{"Thu, 01 Dec 1983 22:00:00 GMT"},
+				"Expires": []string{"Fri, 02 Dec 1983 01:00:00 GMT"},
+			},
+			wantTTL: 10800 * time.Second,
+			wantOK:  true,
+		},
+		// Cache-Control supersedes Date/Expires
+		{
+			headers: http.Header{
+				"Cache-Control": []string{"max-age=100"},
+				"Date":          []string{"Thu, 01 Dec 1983 22:00:00 GMT"},
+				"Expires":       []string{"Fri, 02 Dec 1983 01:00:00 GMT"},
+			},
+			wantTTL: 100 * time.Second,
+			wantOK:  true,
+		},
+		// no caching headers
+		{
+			headers: http.Header{},
+			wantOK:  false,
+		},
+	}
+
+	for i, tt := range tests {
+		ttl, ok, err := Cacheable(tt.headers)
+		if err != nil {
+			t.Errorf("case %d: err=%v", i, err)
+			continue
+		}
+		if tt.wantTTL != ttl {
+			t.Errorf("case %d: want=%d got=%d", i, tt.wantTTL, ttl)
+		}
+		if tt.wantOK != ok {
+			t.Errorf("case %d: incorrect ok value: want=%t got=%t", i, tt.wantOK, ok)
+		}
+	}
+}
+
+func TestCacheableFail(t *testing.T) {
+	tests := []http.Header{
+		// invalid Cache-Control short-circuits
+		http.Header{
+			"Cache-Control": []string{"max-age"},
+			"Date":          []string{"Thu, 01 Dec 1983 22:00:00 GMT"},
+			"Expires":       []string{"Fri, 02 Dec 1983 01:00:00 GMT"},
+		},
+		// no Cache-Control, invalid Expires
+		http.Header{
+			"Date":    []string{"Thu, 01 Dec 1983 22:00:00 GMT"},
+			"Expires": []string{"boo"},
+		},
+	}
+
+	for i, tt := range tests {
+		_, _, err := Cacheable(tt)
+		if err == nil {
+			t.Errorf("case %d: want non-nil err", i)
+		}
+	}
+}
+
+func TestNewResourceLocation(t *testing.T) {
+	tests := []struct {
+		ru   *url.URL
+		id   string
+		want string
+	}{
+		{
+			ru: &url.URL{
+				Scheme: "http",
+				Host:   "example.com",
+			},
+			id:   "foo",
+			want: "http://example.com/foo",
+		},
+		// https
+		{
+			ru: &url.URL{
+				Scheme: "https",
+				Host:   "example.com",
+			},
+			id:   "foo",
+			want: "https://example.com/foo",
+		},
+		// with path
+		{
+			ru: &url.URL{
+				Scheme: "http",
+				Host:   "example.com",
+				Path:   "one/two/three",
+			},
+			id:   "foo",
+			want: "http://example.com/one/two/three/foo",
+		},
+		// with fragment
+		{
+			ru: &url.URL{
+				Scheme:   "http",
+				Host:     "example.com",
+				Fragment: "frag",
+			},
+			id:   "foo",
+			want: "http://example.com/foo",
+		},
+		// with query
+		{
+			ru: &url.URL{
+				Scheme:   "http",
+				Host:     "example.com",
+				RawQuery: "dog=elroy",
+			},
+			id:   "foo",
+			want: "http://example.com/foo",
+		},
+	}
+
+	for i, tt := range tests {
+		got := NewResourceLocation(tt.ru, tt.id)
+		if tt.want != got {
+			t.Errorf("case %d: want=%s, got=%s", i, tt.want, got)
+		}
+	}
+}
+
+func TestCopyRequest(t *testing.T) {
+	r1, err := http.NewRequest("GET", "http://example.com", strings.NewReader("foo"))
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	r2 := CopyRequest(r1)
+	if !reflect.DeepEqual(r1, r2) {
+		t.Fatalf("Result of CopyRequest incorrect: %#v != %#v", r1, r2)
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/http/middleware.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/http/middleware.go
new file mode 100644
index 00000000..270b3bc0
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/http/middleware.go
@@ -0,0 +1,14 @@
+package http
+
+import (
+	"net/http"
+)
+
+type LoggingMiddleware struct {
+	Next http.Handler
+}
+
+func (l *LoggingMiddleware) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	log.Infof("HTTP %s %v", r.Method, r.URL)
+	l.Next.ServeHTTP(w, r)
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/http/url.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/http/url.go
new file mode 100644
index 00000000..df60eb1a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/http/url.go
@@ -0,0 +1,29 @@
+package http
+
+import (
+	"errors"
+	"net/url"
+)
+
+// ParseNonEmptyURL checks that a string is a parsable URL which is also not empty
+// since `url.Parse("")` does not return an error. Must contian a scheme and a host.
+func ParseNonEmptyURL(u string) (*url.URL, error) {
+	if u == "" {
+		return nil, errors.New("url is empty")
+	}
+
+	ur, err := url.Parse(u)
+	if err != nil {
+		return nil, err
+	}
+
+	if ur.Scheme == "" {
+		return nil, errors.New("url scheme is empty")
+	}
+
+	if ur.Host == "" {
+		return nil, errors.New("url host is empty")
+	}
+
+	return ur, nil
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/http/url_test.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/http/url_test.go
new file mode 100644
index 00000000..2ab25052
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/http/url_test.go
@@ -0,0 +1,49 @@
+package http
+
+import (
+	"net/url"
+	"testing"
+)
+
+func TestParseNonEmptyURL(t *testing.T) {
+	tests := []struct {
+		u  string
+		ok bool
+	}{
+		{"", false},
+		{"http://", false},
+		{"example.com", false},
+		{"example", false},
+		{"http://example", true},
+		{"http://example:1234", true},
+		{"http://example.com", true},
+		{"http://example.com:1234", true},
+	}
+
+	for i, tt := range tests {
+		u, err := ParseNonEmptyURL(tt.u)
+		if err != nil {
+			t.Logf("err: %v", err)
+			if tt.ok {
+				t.Errorf("case %d: unexpected error: %v", i, err)
+			} else {
+				continue
+			}
+		}
+
+		if !tt.ok {
+			t.Errorf("case %d: expected error but got none", i)
+			continue
+		}
+
+		uu, err := url.Parse(tt.u)
+		if err != nil {
+			t.Errorf("case %d: unexpected error: %v", i, err)
+			continue
+		}
+
+		if uu.String() != u.String() {
+			t.Errorf("case %d: incorrect url value, want: %q, got: %q", i, uu.String(), u.String())
+		}
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/claims.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/claims.go
new file mode 100644
index 00000000..e192fd0a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/claims.go
@@ -0,0 +1,79 @@
+package jose
+
+import (
+	"encoding/json"
+	"fmt"
+	"time"
+)
+
+type Claims map[string]interface{}
+
+func (c Claims) Add(name string, value interface{}) {
+	c[name] = value
+}
+
+func (c Claims) StringClaim(name string) (string, bool, error) {
+	cl, ok := c[name]
+	if !ok {
+		return "", false, nil
+	}
+
+	v, ok := cl.(string)
+	if !ok {
+		return "", false, fmt.Errorf("unable to parse claim as string: %v", name)
+	}
+
+	return v, true, nil
+}
+
+func (c Claims) Int64Claim(name string) (int64, bool, error) {
+	cl, ok := c[name]
+	if !ok {
+		return 0, false, nil
+	}
+
+	v, ok := cl.(int64)
+	if !ok {
+		vf, ok := cl.(float64)
+		if !ok {
+			return 0, false, fmt.Errorf("unable to parse claim as int64: %v", name)
+		}
+		v = int64(vf)
+	}
+
+	return v, true, nil
+}
+
+func (c Claims) TimeClaim(name string) (time.Time, bool, error) {
+	v, ok, err := c.Int64Claim(name)
+	if !ok || err != nil {
+		return time.Time{}, ok, err
+	}
+
+	return time.Unix(v, 0).UTC(), true, nil
+}
+
+func decodeClaims(payload []byte) (Claims, error) {
+	var c Claims
+	if err := json.Unmarshal(payload, &c); err != nil {
+		return nil, fmt.Errorf("malformed JWT claims, unable to decode: %v", err)
+	}
+	return c, nil
+}
+
+func marshalClaims(c Claims) ([]byte, error) {
+	b, err := json.Marshal(c)
+	if err != nil {
+		return nil, err
+	}
+	return b, nil
+}
+
+func encodeClaims(c Claims) (string, error) {
+	b, err := marshalClaims(c)
+	if err != nil {
+		return "", err
+	}
+
+	return encodeSegment(b), nil
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/claims_test.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/claims_test.go
new file mode 100644
index 00000000..55e245c0
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/claims_test.go
@@ -0,0 +1,240 @@
+package jose
+
+import (
+	"testing"
+	"time"
+)
+
+func TestString(t *testing.T) {
+	tests := []struct {
+		cl  Claims
+		key string
+		ok  bool
+		err bool
+		val string
+	}{
+		// ok, no err, claim exists
+		{
+			cl: Claims{
+				"foo": "bar",
+			},
+			key: "foo",
+			val: "bar",
+			ok:  true,
+			err: false,
+		},
+		// no claims
+		{
+			cl:  Claims{},
+			key: "foo",
+			val: "",
+			ok:  false,
+			err: false,
+		},
+		// missing claim
+		{
+			cl: Claims{
+				"foo": "bar",
+			},
+			key: "xxx",
+			val: "",
+			ok:  false,
+			err: false,
+		},
+		// unparsable: type
+		{
+			cl: Claims{
+				"foo": struct{}{},
+			},
+			key: "foo",
+			val: "",
+			ok:  false,
+			err: true,
+		},
+		// unparsable: nil value
+		{
+			cl: Claims{
+				"foo": nil,
+			},
+			key: "foo",
+			val: "",
+			ok:  false,
+			err: true,
+		},
+	}
+
+	for i, tt := range tests {
+		val, ok, err := tt.cl.StringClaim(tt.key)
+
+		if tt.err && err == nil {
+			t.Errorf("case %d: want err=non-nil, got err=nil", i)
+		} else if !tt.err && err != nil {
+			t.Errorf("case %d: want err=nil, got err=%v", i, err)
+		}
+
+		if tt.ok != ok {
+			t.Errorf("case %d: want ok=%v, got ok=%v", i, tt.ok, ok)
+		}
+
+		if tt.val != val {
+			t.Errorf("case %d: want val=%v, got val=%v", i, tt.val, val)
+		}
+	}
+}
+
+func TestInt64(t *testing.T) {
+	tests := []struct {
+		cl  Claims
+		key string
+		ok  bool
+		err bool
+		val int64
+	}{
+		// ok, no err, claim exists
+		{
+			cl: Claims{
+				"foo": int64(100),
+			},
+			key: "foo",
+			val: int64(100),
+			ok:  true,
+			err: false,
+		},
+		// no claims
+		{
+			cl:  Claims{},
+			key: "foo",
+			val: 0,
+			ok:  false,
+			err: false,
+		},
+		// missing claim
+		{
+			cl: Claims{
+				"foo": "bar",
+			},
+			key: "xxx",
+			val: 0,
+			ok:  false,
+			err: false,
+		},
+		// unparsable: type
+		{
+			cl: Claims{
+				"foo": struct{}{},
+			},
+			key: "foo",
+			val: 0,
+			ok:  false,
+			err: true,
+		},
+		// unparsable: nil value
+		{
+			cl: Claims{
+				"foo": nil,
+			},
+			key: "foo",
+			val: 0,
+			ok:  false,
+			err: true,
+		},
+	}
+
+	for i, tt := range tests {
+		val, ok, err := tt.cl.Int64Claim(tt.key)
+
+		if tt.err && err == nil {
+			t.Errorf("case %d: want err=non-nil, got err=nil", i)
+		} else if !tt.err && err != nil {
+			t.Errorf("case %d: want err=nil, got err=%v", i, err)
+		}
+
+		if tt.ok != ok {
+			t.Errorf("case %d: want ok=%v, got ok=%v", i, tt.ok, ok)
+		}
+
+		if tt.val != val {
+			t.Errorf("case %d: want val=%v, got val=%v", i, tt.val, val)
+		}
+	}
+}
+
+func TestTime(t *testing.T) {
+	now := time.Now().UTC()
+	unixNow := now.Unix()
+
+	tests := []struct {
+		cl  Claims
+		key string
+		ok  bool
+		err bool
+		val time.Time
+	}{
+		// ok, no err, claim exists
+		{
+			cl: Claims{
+				"foo": unixNow,
+			},
+			key: "foo",
+			val: time.Unix(now.Unix(), 0).UTC(),
+			ok:  true,
+			err: false,
+		},
+		// no claims
+		{
+			cl:  Claims{},
+			key: "foo",
+			val: time.Time{},
+			ok:  false,
+			err: false,
+		},
+		// missing claim
+		{
+			cl: Claims{
+				"foo": "bar",
+			},
+			key: "xxx",
+			val: time.Time{},
+			ok:  false,
+			err: false,
+		},
+		// unparsable: type
+		{
+			cl: Claims{
+				"foo": struct{}{},
+			},
+			key: "foo",
+			val: time.Time{},
+			ok:  false,
+			err: true,
+		},
+		// unparsable: nil value
+		{
+			cl: Claims{
+				"foo": nil,
+			},
+			key: "foo",
+			val: time.Time{},
+			ok:  false,
+			err: true,
+		},
+	}
+
+	for i, tt := range tests {
+		val, ok, err := tt.cl.TimeClaim(tt.key)
+
+		if tt.err && err == nil {
+			t.Errorf("case %d: want err=non-nil, got err=nil", i)
+		} else if !tt.err && err != nil {
+			t.Errorf("case %d: want err=nil, got err=%v", i, err)
+		}
+
+		if tt.ok != ok {
+			t.Errorf("case %d: want ok=%v, got ok=%v", i, tt.ok, ok)
+		}
+
+		if tt.val != val {
+			t.Errorf("case %d: want val=%v, got val=%v", i, tt.val, val)
+		}
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/jose.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/jose.go
new file mode 100644
index 00000000..4f99aeb7
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/jose.go
@@ -0,0 +1,61 @@
+package jose
+
+import (
+	"encoding/base64"
+	"encoding/json"
+	"fmt"
+	"strings"
+)
+
+const (
+	HeaderMediaType    = "typ"
+	HeaderKeyAlgorithm = "alg"
+	HeaderKeyID        = "kid"
+)
+
+type JOSEHeader map[string]string
+
+func (j JOSEHeader) Validate() error {
+	if _, exists := j[HeaderKeyAlgorithm]; !exists {
+		return fmt.Errorf("header missing %q parameter", HeaderKeyAlgorithm)
+	}
+
+	return nil
+}
+
+func decodeHeader(seg string) (JOSEHeader, error) {
+	b, err := decodeSegment(seg)
+	if err != nil {
+		return nil, err
+	}
+
+	var h JOSEHeader
+	err = json.Unmarshal(b, &h)
+	if err != nil {
+		return nil, err
+	}
+
+	return h, nil
+}
+
+func encodeHeader(h JOSEHeader) (string, error) {
+	b, err := json.Marshal(h)
+	if err != nil {
+		return "", err
+	}
+
+	return encodeSegment(b), nil
+}
+
+// Decode JWT specific base64url encoding with padding stripped
+func decodeSegment(seg string) ([]byte, error) {
+	if l := len(seg) % 4; l != 0 {
+		seg += strings.Repeat("=", 4-l)
+	}
+	return base64.URLEncoding.DecodeString(seg)
+}
+
+// Encode JWT specific base64url encoding with padding stripped
+func encodeSegment(seg []byte) string {
+	return strings.TrimRight(base64.URLEncoding.EncodeToString(seg), "=")
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/jwk.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/jwk.go
new file mode 100644
index 00000000..045f5fde
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/jwk.go
@@ -0,0 +1,131 @@
+package jose
+
+import (
+	"bytes"
+	"encoding/base64"
+	"encoding/binary"
+	"encoding/json"
+	"math/big"
+	"strings"
+)
+
+// JSON Web Key
+// https://tools.ietf.org/html/draft-ietf-jose-json-web-key-36#page-5
+type JWK struct {
+	ID       string
+	Type     string
+	Alg      string
+	Use      string
+	Exponent int
+	Modulus  *big.Int
+	Secret   []byte
+}
+
+type jwkJSON struct {
+	ID       string `json:"kid"`
+	Type     string `json:"kty"`
+	Alg      string `json:"alg"`
+	Use      string `json:"use"`
+	Exponent string `json:"e"`
+	Modulus  string `json:"n"`
+}
+
+func (j *JWK) MarshalJSON() ([]byte, error) {
+	t := jwkJSON{
+		ID:       j.ID,
+		Type:     j.Type,
+		Alg:      j.Alg,
+		Use:      j.Use,
+		Exponent: encodeExponent(j.Exponent),
+		Modulus:  encodeModulus(j.Modulus),
+	}
+
+	return json.Marshal(&t)
+}
+
+func (j *JWK) UnmarshalJSON(data []byte) error {
+	var t jwkJSON
+	err := json.Unmarshal(data, &t)
+	if err != nil {
+		return err
+	}
+
+	e, err := decodeExponent(t.Exponent)
+	if err != nil {
+		return err
+	}
+
+	n, err := decodeModulus(t.Modulus)
+	if err != nil {
+		return err
+	}
+
+	j.ID = t.ID
+	j.Type = t.Type
+	j.Alg = t.Alg
+	j.Use = t.Use
+	j.Exponent = e
+	j.Modulus = n
+
+	return nil
+}
+
+func decodeExponent(e string) (int, error) {
+	decE, err := decodeBase64URLPaddingOptional(e)
+	if err != nil {
+		return 0, err
+	}
+	var eBytes []byte
+	if len(decE) < 8 {
+		eBytes = make([]byte, 8-len(decE), 8)
+		eBytes = append(eBytes, decE...)
+	} else {
+		eBytes = decE
+	}
+	eReader := bytes.NewReader(eBytes)
+	var E uint64
+	err = binary.Read(eReader, binary.BigEndian, &E)
+	if err != nil {
+		return 0, err
+	}
+	return int(E), nil
+}
+
+func encodeExponent(e int) string {
+	b := make([]byte, 8)
+	binary.BigEndian.PutUint64(b, uint64(e))
+	var idx int
+	for ; idx < 8; idx++ {
+		if b[idx] != 0x0 {
+			break
+		}
+	}
+	return base64.URLEncoding.EncodeToString(b[idx:])
+}
+
+// Turns a URL encoded modulus of a key into a big int.
+func decodeModulus(n string) (*big.Int, error) {
+	decN, err := decodeBase64URLPaddingOptional(n)
+	if err != nil {
+		return nil, err
+	}
+	N := big.NewInt(0)
+	N.SetBytes(decN)
+	return N, nil
+}
+
+func encodeModulus(n *big.Int) string {
+	return base64.URLEncoding.EncodeToString(n.Bytes())
+}
+
+// decodeBase64URLPaddingOptional decodes Base64 whether there is padding or not.
+// The stdlib version currently doesn't handle this.
+// We can get rid of this is if this bug:
+//   https://github.com/golang/go/issues/4237
+// ever closes.
+func decodeBase64URLPaddingOptional(e string) ([]byte, error) {
+	if m := len(e) % 4; m != 0 {
+		e += strings.Repeat("=", 4-m)
+	}
+	return base64.URLEncoding.DecodeString(e)
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/jwk_test.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/jwk_test.go
new file mode 100644
index 00000000..63351c45
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/jwk_test.go
@@ -0,0 +1,64 @@
+package jose
+
+import (
+	"testing"
+)
+
+func TestDecodeBase64URLPaddingOptional(t *testing.T) {
+	tests := []struct {
+		encoded string
+		decoded string
+		err     bool
+	}{
+		{
+			// With padding
+			encoded: "VGVjdG9uaWM=",
+			decoded: "Tectonic",
+		},
+		{
+			// Without padding
+			encoded: "VGVjdG9uaWM",
+			decoded: "Tectonic",
+		},
+		{
+			// Even More padding
+			encoded: "VGVjdG9uaQ==",
+			decoded: "Tectoni",
+		},
+		{
+			// And take it away!
+			encoded: "VGVjdG9uaQ",
+			decoded: "Tectoni",
+		},
+		{
+			// Too much padding.
+			encoded: "VGVjdG9uaWNh=",
+			decoded: "",
+			err:     true,
+		},
+		{
+			// Too much padding.
+			encoded: "VGVjdG9uaWNh=",
+			decoded: "",
+			err:     true,
+		},
+	}
+
+	for i, tt := range tests {
+		got, err := decodeBase64URLPaddingOptional(tt.encoded)
+		if tt.err {
+			if err == nil {
+				t.Errorf("case %d: expected non-nil err", i)
+			}
+			continue
+		}
+
+		if err != nil {
+			t.Errorf("case %d: want nil err, got: %v", i, err)
+		}
+
+		if string(got) != tt.decoded {
+			t.Errorf("case %d: want=%q, got=%q", i, tt.decoded, got)
+		}
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/jws.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/jws.go
new file mode 100644
index 00000000..1049ece8
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/jws.go
@@ -0,0 +1,51 @@
+package jose
+
+import (
+	"fmt"
+	"strings"
+)
+
+type JWS struct {
+	RawHeader  string
+	Header     JOSEHeader
+	RawPayload string
+	Payload    []byte
+	Signature  []byte
+}
+
+// Given a raw encoded JWS token parses it and verifies the structure.
+func ParseJWS(raw string) (JWS, error) {
+	parts := strings.Split(raw, ".")
+	if len(parts) != 3 {
+		return JWS{}, fmt.Errorf("malformed JWS, only %d segments", len(parts))
+	}
+
+	rawSig := parts[2]
+	jws := JWS{
+		RawHeader:  parts[0],
+		RawPayload: parts[1],
+	}
+
+	header, err := decodeHeader(jws.RawHeader)
+	if err != nil {
+		return JWS{}, fmt.Errorf("malformed JWS, unable to decode header, %s", err)
+	}
+	if err = header.Validate(); err != nil {
+		return JWS{}, fmt.Errorf("malformed JWS, %s", err)
+	}
+	jws.Header = header
+
+	payload, err := decodeSegment(jws.RawPayload)
+	if err != nil {
+		return JWS{}, fmt.Errorf("malformed JWS, unable to decode payload: %s", err)
+	}
+	jws.Payload = payload
+
+	sig, err := decodeSegment(rawSig)
+	if err != nil {
+		return JWS{}, fmt.Errorf("malformed JWS, unable to decode signature: %s", err)
+	}
+	jws.Signature = sig
+
+	return jws, nil
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/jws_test.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/jws_test.go
new file mode 100644
index 00000000..78c81261
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/jws_test.go
@@ -0,0 +1,74 @@
+package jose
+
+import (
+	"strings"
+	"testing"
+)
+
+type testCase struct{ t string }
+
+var validInput []testCase
+
+var invalidInput []testCase
+
+func init() {
+	validInput = []testCase{
+		{
+			"eyJ0eXAiOiJKV1QiLA0KICJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJqb2UiLA0KICJleHAiOjEzMDA4MTkzODAsDQogImh0dHA6Ly9leGFtcGxlLmNvbS9pc19yb290Ijp0cnVlfQ.dBjftJeZ4CVP-mB92K27uhbUJU1p1r_wW1gFWFOEjXk",
+		},
+	}
+
+	invalidInput = []testCase{
+		// empty
+		{
+			"",
+		},
+		// undecodeable
+		{
+			"aaa.bbb.ccc",
+		},
+		// missing parts
+		{
+			"aaa",
+		},
+		// missing parts
+		{
+			"aaa.bbb",
+		},
+		// too many parts
+		{
+			"aaa.bbb.ccc.ddd",
+		},
+		// invalid header
+		// EncodeHeader(map[string]string{"foo": "bar"})
+		{
+			"eyJmb28iOiJiYXIifQ.bbb.ccc",
+		},
+	}
+}
+
+func TestParseJWS(t *testing.T) {
+	for i, tt := range validInput {
+		jws, err := ParseJWS(tt.t)
+		if err != nil {
+			t.Errorf("test: %d. expected: valid, actual: invalid", i)
+		}
+
+		expectedHeader := strings.Split(tt.t, ".")[0]
+		if jws.RawHeader != expectedHeader {
+			t.Errorf("test: %d. expected: %s, actual: %s", i, expectedHeader, jws.RawHeader)
+		}
+
+		expectedPayload := strings.Split(tt.t, ".")[1]
+		if jws.RawPayload != expectedPayload {
+			t.Errorf("test: %d. expected: %s, actual: %s", i, expectedPayload, jws.RawPayload)
+		}
+	}
+
+	for i, tt := range invalidInput {
+		_, err := ParseJWS(tt.t)
+		if err == nil {
+			t.Errorf("test: %d. expected: invalid, actual: valid", i)
+		}
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/jwt.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/jwt.go
new file mode 100644
index 00000000..bbea12c3
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/jwt.go
@@ -0,0 +1,84 @@
+package jose
+
+import (
+	"strings"
+)
+
+type JWT JWS
+
+func ParseJWT(token string) (jwt JWT, err error) {
+	jws, err := ParseJWS(token)
+	if err != nil {
+		return
+	}
+
+	return JWT(jws), nil
+}
+
+func NewJWT(header JOSEHeader, claims Claims) (jwt JWT, err error) {
+	jwt = JWT{}
+
+	jwt.Header = header
+	jwt.Header[HeaderMediaType] = "JWT"
+
+	claimBytes, err := marshalClaims(claims)
+	if err != nil {
+		return
+	}
+	jwt.Payload = claimBytes
+
+	eh, err := encodeHeader(header)
+	if err != nil {
+		return
+	}
+	jwt.RawHeader = eh
+
+	ec, err := encodeClaims(claims)
+	if err != nil {
+		return
+	}
+	jwt.RawPayload = ec
+
+	return
+}
+
+func (j *JWT) KeyID() (string, bool) {
+	kID, ok := j.Header[HeaderKeyID]
+	return kID, ok
+}
+
+func (j *JWT) Claims() (Claims, error) {
+	return decodeClaims(j.Payload)
+}
+
+// Encoded data part of the token which may be signed.
+func (j *JWT) Data() string {
+	return strings.Join([]string{j.RawHeader, j.RawPayload}, ".")
+}
+
+// Full encoded JWT token string in format: header.claims.signature
+func (j *JWT) Encode() string {
+	d := j.Data()
+	s := encodeSegment(j.Signature)
+	return strings.Join([]string{d, s}, ".")
+}
+
+func NewSignedJWT(claims map[string]interface{}, s Signer) (*JWT, error) {
+	header := JOSEHeader{
+		HeaderKeyAlgorithm: s.Alg(),
+		HeaderKeyID:        s.ID(),
+	}
+
+	jwt, err := NewJWT(header, Claims(claims))
+	if err != nil {
+		return nil, err
+	}
+
+	sig, err := s.Sign([]byte(jwt.Data()))
+	if err != nil {
+		return nil, err
+	}
+	jwt.Signature = sig
+
+	return &jwt, nil
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/jwt_test.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/jwt_test.go
new file mode 100644
index 00000000..3a1cd9ae
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/jwt_test.go
@@ -0,0 +1,94 @@
+package jose
+
+import (
+	"reflect"
+	"testing"
+)
+
+func TestParseJWT(t *testing.T) {
+	tests := []struct {
+		r string
+		h JOSEHeader
+		c Claims
+	}{
+		{
+			// Example from JWT spec:
+			// http://self-issued.info/docs/draft-ietf-oauth-json-web-token.html#ExampleJWT
+			"eyJ0eXAiOiJKV1QiLA0KICJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJqb2UiLA0KICJleHAiOjEzMDA4MTkzODAsDQogImh0dHA6Ly9leGFtcGxlLmNvbS9pc19yb290Ijp0cnVlfQ.dBjftJeZ4CVP-mB92K27uhbUJU1p1r_wW1gFWFOEjXk",
+			JOSEHeader{
+				HeaderMediaType:    "JWT",
+				HeaderKeyAlgorithm: "HS256",
+			},
+			Claims{
+				"iss": "joe",
+				// NOTE: test numbers must be floats for equality checks to work since values are converted form interface{} to float64 by default.
+				"exp": 1300819380.0,
+				"http://example.com/is_root": true,
+			},
+		},
+	}
+
+	for i, tt := range tests {
+		jwt, err := ParseJWT(tt.r)
+		if err != nil {
+			t.Errorf("raw token should parse. test: %d. expected: valid, actual: invalid. err=%v", i, err)
+		}
+
+		if !reflect.DeepEqual(tt.h, jwt.Header) {
+			t.Errorf("JOSE headers should match. test: %d. expected: %v, actual: %v", i, tt.h, jwt.Header)
+		}
+
+		claims, err := jwt.Claims()
+		if err != nil {
+			t.Errorf("test: %d. expected: valid claim parsing. err=%v", i, err)
+		}
+		if !reflect.DeepEqual(tt.c, claims) {
+			t.Errorf("claims should match. test: %d. expected: %v, actual: %v", i, tt.c, claims)
+		}
+
+		enc := jwt.Encode()
+		if enc != tt.r {
+			t.Errorf("encoded jwt should match raw jwt. test: %d. expected: %v, actual: %v", i, tt.r, enc)
+		}
+	}
+}
+
+func TestNewJWTHeaderTyp(t *testing.T) {
+	jwt, err := NewJWT(JOSEHeader{}, Claims{})
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	want := "JWT"
+	got := jwt.Header[HeaderMediaType]
+	if want != got {
+		t.Fatalf("Header %q incorrect: want=%s got=%s", HeaderMediaType, want, got)
+	}
+
+}
+
+func TestNewJWTHeaderKeyID(t *testing.T) {
+	jwt, err := NewJWT(JOSEHeader{HeaderKeyID: "foo"}, Claims{})
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	want := "foo"
+	got, ok := jwt.KeyID()
+	if !ok {
+		t.Fatalf("KeyID not set")
+	} else if want != got {
+		t.Fatalf("KeyID incorrect: want=%s got=%s", want, got)
+	}
+}
+
+func TestNewJWTHeaderKeyIDNotSet(t *testing.T) {
+	jwt, err := NewJWT(JOSEHeader{}, Claims{})
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	if _, ok := jwt.KeyID(); ok {
+		t.Fatalf("KeyID set, but should not be")
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/sig.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/sig.go
new file mode 100644
index 00000000..220681bd
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/sig.go
@@ -0,0 +1,25 @@
+package jose
+
+import (
+	"fmt"
+	"strings"
+)
+
+type Verifier interface {
+	ID() string
+	Alg() string
+	Verify(sig []byte, data []byte) error
+}
+
+type Signer interface {
+	Verifier
+	Sign(data []byte) (sig []byte, err error)
+}
+
+func NewVerifier(jwk JWK) (Verifier, error) {
+	if strings.ToUpper(jwk.Type) != "RSA" {
+		return nil, fmt.Errorf("unsupported key type %q", jwk.Type)
+	}
+
+	return NewVerifierRSA(jwk)
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/sig_hmac.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/sig_hmac.go
new file mode 100644
index 00000000..bcf42b70
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/sig_hmac.go
@@ -0,0 +1,68 @@
+package jose
+
+import (
+	"bytes"
+	"crypto"
+	"crypto/hmac"
+	_ "crypto/sha256"
+	"errors"
+	"fmt"
+	"strings"
+)
+
+type VerifierHMAC struct {
+	KeyID  string
+	Hash   crypto.Hash
+	Secret []byte
+}
+
+type SignerHMAC struct {
+	VerifierHMAC
+}
+
+func NewVerifierHMAC(jwk JWK) (*VerifierHMAC, error) {
+	if strings.ToUpper(jwk.Alg) != "HS256" {
+		return nil, fmt.Errorf("unsupported key algorithm %q", jwk.Alg)
+	}
+
+	v := VerifierHMAC{
+		KeyID:  jwk.ID,
+		Secret: jwk.Secret,
+		Hash:   crypto.SHA256,
+	}
+
+	return &v, nil
+}
+
+func (v *VerifierHMAC) ID() string {
+	return v.KeyID
+}
+
+func (v *VerifierHMAC) Alg() string {
+	return "HS256"
+}
+
+func (v *VerifierHMAC) Verify(sig []byte, data []byte) error {
+	h := hmac.New(v.Hash.New, v.Secret)
+	h.Write(data)
+	if !bytes.Equal(sig, h.Sum(nil)) {
+		return errors.New("invalid hmac signature")
+	}
+	return nil
+}
+
+func NewSignerHMAC(kid string, secret []byte) *SignerHMAC {
+	return &SignerHMAC{
+		VerifierHMAC: VerifierHMAC{
+			KeyID:  kid,
+			Secret: secret,
+			Hash:   crypto.SHA256,
+		},
+	}
+}
+
+func (s *SignerHMAC) Sign(data []byte) ([]byte, error) {
+	h := hmac.New(s.Hash.New, s.Secret)
+	h.Write(data)
+	return h.Sum(nil), nil
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/sig_hmac_test.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/sig_hmac_test.go
new file mode 100644
index 00000000..76c6722f
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/sig_hmac_test.go
@@ -0,0 +1,85 @@
+package jose
+
+import (
+	"bytes"
+	"encoding/base64"
+	"testing"
+)
+
+var hmacTestCases = []struct {
+	data  string
+	sig   string
+	jwk   JWK
+	valid bool
+	desc  string
+}{
+	{
+		"test",
+		"Aymga2LNFrM-tnkr6MYLFY2Jou46h2_Omogeu0iMCRQ=",
+		JWK{
+			ID:     "fake-key",
+			Alg:    "HS256",
+			Secret: []byte("secret"),
+		},
+		true,
+		"valid case",
+	},
+	{
+		"test",
+		"Aymga2LNFrM-tnkr6MYLFY2Jou46h2_Omogeu0iMCRQ=",
+		JWK{
+			ID:     "different-key",
+			Alg:    "HS256",
+			Secret: []byte("secret"),
+		},
+		true,
+		"invalid: different key, should not match",
+	},
+	{
+		"test sig and non-matching data",
+		"Aymga2LNFrM-tnkr6MYLFY2Jou46h2_Omogeu0iMCRQ=",
+		JWK{
+			ID:     "fake-key",
+			Alg:    "HS256",
+			Secret: []byte("secret"),
+		},
+		false,
+		"invalid: sig and data should not match",
+	},
+}
+
+func TestVerify(t *testing.T) {
+	for _, tt := range hmacTestCases {
+		v, err := NewVerifierHMAC(tt.jwk)
+		if err != nil {
+			t.Errorf("should construct hmac verifier. test: %s. err=%v", tt.desc, err)
+		}
+
+		decSig, _ := base64.URLEncoding.DecodeString(tt.sig)
+		err = v.Verify(decSig, []byte(tt.data))
+		if err == nil && !tt.valid {
+			t.Errorf("verify failure. test: %s. expected: invalid, actual: valid.", tt.desc)
+		}
+		if err != nil && tt.valid {
+			t.Errorf("verify failure. test: %s. expected: valid, actual: invalid. err=%v", tt.desc, err)
+		}
+	}
+}
+
+func TestSign(t *testing.T) {
+	for _, tt := range hmacTestCases {
+		s := NewSignerHMAC("test", tt.jwk.Secret)
+		sig, err := s.Sign([]byte(tt.data))
+		if err != nil {
+			t.Errorf("sign failure. test: %s. err=%v", tt.desc, err)
+		}
+
+		expSig, _ := base64.URLEncoding.DecodeString(tt.sig)
+		if tt.valid && !bytes.Equal(sig, expSig) {
+			t.Errorf("sign failure. test: %s. expected: %s, actual: %s.", tt.desc, tt.sig, base64.URLEncoding.EncodeToString(sig))
+		}
+		if !tt.valid && bytes.Equal(sig, expSig) {
+			t.Errorf("sign failure. test: %s. expected: invalid signature.", tt.desc)
+		}
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/sig_rsa.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/sig_rsa.go
new file mode 100644
index 00000000..57066f02
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/jose/sig_rsa.go
@@ -0,0 +1,68 @@
+package jose
+
+import (
+	"crypto"
+	"crypto/rand"
+	"crypto/rsa"
+	"fmt"
+	"strings"
+)
+
+type VerifierRSA struct {
+	KeyID     string
+	Hash      crypto.Hash
+	PublicKey rsa.PublicKey
+}
+
+type SignerRSA struct {
+	PrivateKey rsa.PrivateKey
+	VerifierRSA
+}
+
+func NewVerifierRSA(jwk JWK) (*VerifierRSA, error) {
+	if strings.ToUpper(jwk.Alg) != "RS256" {
+		return nil, fmt.Errorf("unsupported key algorithm %q", jwk.Alg)
+	}
+
+	v := VerifierRSA{
+		KeyID: jwk.ID,
+		PublicKey: rsa.PublicKey{
+			N: jwk.Modulus,
+			E: jwk.Exponent,
+		},
+		Hash: crypto.SHA256,
+	}
+
+	return &v, nil
+}
+
+func NewSignerRSA(kid string, key rsa.PrivateKey) *SignerRSA {
+	return &SignerRSA{
+		PrivateKey: key,
+		VerifierRSA: VerifierRSA{
+			KeyID:     kid,
+			PublicKey: key.PublicKey,
+			Hash:      crypto.SHA256,
+		},
+	}
+}
+
+func (v *VerifierRSA) ID() string {
+	return v.KeyID
+}
+
+func (v *VerifierRSA) Alg() string {
+	return "RS256"
+}
+
+func (v *VerifierRSA) Verify(sig []byte, data []byte) error {
+	h := v.Hash.New()
+	h.Write(data)
+	return rsa.VerifyPKCS1v15(&v.PublicKey, v.Hash, h.Sum(nil), sig)
+}
+
+func (s *SignerRSA) Sign(data []byte) ([]byte, error) {
+	h := s.Hash.New()
+	h.Write(data)
+	return rsa.SignPKCS1v15(rand.Reader, &s.PrivateKey, s.Hash, h.Sum(nil))
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/key/key.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/key/key.go
new file mode 100644
index 00000000..2add0f47
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/key/key.go
@@ -0,0 +1,139 @@
+package key
+
+import (
+	"crypto/rand"
+	"crypto/rsa"
+	"encoding/base64"
+	"math/big"
+	"time"
+
+	"github.com/coreos/go-oidc/jose"
+)
+
+func NewPublicKey(jwk jose.JWK) *PublicKey {
+	return &PublicKey{jwk: jwk}
+}
+
+type PublicKey struct {
+	jwk jose.JWK
+}
+
+func (k *PublicKey) ID() string {
+	return k.jwk.ID
+}
+
+func (k *PublicKey) Verifier() (jose.Verifier, error) {
+	return jose.NewVerifierRSA(k.jwk)
+}
+
+type PrivateKey struct {
+	KeyID      string
+	PrivateKey *rsa.PrivateKey
+}
+
+func (k *PrivateKey) ID() string {
+	return k.KeyID
+}
+
+func (k *PrivateKey) Signer() jose.Signer {
+	return jose.NewSignerRSA(k.ID(), *k.PrivateKey)
+}
+
+func (k *PrivateKey) JWK() jose.JWK {
+	return jose.JWK{
+		ID:       k.KeyID,
+		Type:     "RSA",
+		Alg:      "RS256",
+		Use:      "sig",
+		Exponent: k.PrivateKey.PublicKey.E,
+		Modulus:  k.PrivateKey.PublicKey.N,
+	}
+}
+
+type KeySet interface {
+	ExpiresAt() time.Time
+}
+
+type PublicKeySet struct {
+	keys      []PublicKey
+	index     map[string]*PublicKey
+	expiresAt time.Time
+}
+
+func NewPublicKeySet(jwks []jose.JWK, exp time.Time) *PublicKeySet {
+	keys := make([]PublicKey, len(jwks))
+	index := make(map[string]*PublicKey)
+	for i, jwk := range jwks {
+		keys[i] = *NewPublicKey(jwk)
+		index[keys[i].ID()] = &keys[i]
+	}
+	return &PublicKeySet{
+		keys:      keys,
+		index:     index,
+		expiresAt: exp,
+	}
+}
+
+func (s *PublicKeySet) ExpiresAt() time.Time {
+	return s.expiresAt
+}
+
+func (s *PublicKeySet) Keys() []PublicKey {
+	return s.keys
+}
+
+func (s *PublicKeySet) Key(id string) *PublicKey {
+	return s.index[id]
+}
+
+type PrivateKeySet struct {
+	keys        []*PrivateKey
+	ActiveKeyID string
+	expiresAt   time.Time
+}
+
+func NewPrivateKeySet(keys []*PrivateKey, exp time.Time) *PrivateKeySet {
+	return &PrivateKeySet{
+		keys:        keys,
+		ActiveKeyID: keys[0].ID(),
+		expiresAt:   exp.UTC(),
+	}
+}
+
+func (s *PrivateKeySet) Keys() []*PrivateKey {
+	return s.keys
+}
+
+func (s *PrivateKeySet) ExpiresAt() time.Time {
+	return s.expiresAt
+}
+
+func (s *PrivateKeySet) Active() *PrivateKey {
+	for i, k := range s.keys {
+		if k.ID() == s.ActiveKeyID {
+			return s.keys[i]
+		}
+	}
+
+	return nil
+}
+
+type GeneratePrivateKeyFunc func() (*PrivateKey, error)
+
+func GeneratePrivateKey() (*PrivateKey, error) {
+	pk, err := rsa.GenerateKey(rand.Reader, 1024)
+	if err != nil {
+		return nil, err
+	}
+
+	k := PrivateKey{
+		KeyID:      base64BigInt(pk.PublicKey.N),
+		PrivateKey: pk,
+	}
+
+	return &k, nil
+}
+
+func base64BigInt(b *big.Int) string {
+	return base64.URLEncoding.EncodeToString(b.Bytes())
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/key/key_test.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/key/key_test.go
new file mode 100644
index 00000000..d4985151
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/key/key_test.go
@@ -0,0 +1,68 @@
+package key
+
+import (
+	"crypto/rsa"
+	"math/big"
+	"reflect"
+	"testing"
+	"time"
+
+	"github.com/coreos/go-oidc/jose"
+)
+
+func TestPrivateRSAKeyJWK(t *testing.T) {
+	n := big.NewInt(int64(17))
+	if n == nil {
+		panic("NewInt returned nil")
+	}
+
+	k := &PrivateKey{
+		KeyID: "foo",
+		PrivateKey: &rsa.PrivateKey{
+			PublicKey: rsa.PublicKey{N: n, E: 65537},
+		},
+	}
+
+	want := jose.JWK{
+		ID:       "foo",
+		Type:     "RSA",
+		Alg:      "RS256",
+		Use:      "sig",
+		Modulus:  n,
+		Exponent: 65537,
+	}
+
+	got := k.JWK()
+	if !reflect.DeepEqual(want, got) {
+		t.Fatalf("JWK mismatch: want=%#v got=%#v", want, got)
+	}
+}
+
+func TestPublicKeySetKey(t *testing.T) {
+	n := big.NewInt(int64(17))
+	if n == nil {
+		panic("NewInt returned nil")
+	}
+
+	k := jose.JWK{
+		ID:       "foo",
+		Type:     "RSA",
+		Alg:      "RS256",
+		Use:      "sig",
+		Modulus:  n,
+		Exponent: 65537,
+	}
+	now := time.Now().UTC()
+	ks := NewPublicKeySet([]jose.JWK{k}, now)
+
+	want := &PublicKey{jwk: k}
+	got := ks.Key("foo")
+	if !reflect.DeepEqual(want, got) {
+		t.Errorf("Unexpected response from PublicKeySet.Key: want=%#v got=%#v", want, got)
+	}
+
+	got = ks.Key("bar")
+	if got != nil {
+		t.Errorf("Expected nil response from PublicKeySet.Key, got %#v", got)
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/key/manager.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/key/manager.go
new file mode 100644
index 00000000..476ab6a8
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/key/manager.go
@@ -0,0 +1,99 @@
+package key
+
+import (
+	"errors"
+	"time"
+
+	"github.com/jonboulle/clockwork"
+
+	"github.com/coreos/go-oidc/jose"
+	"github.com/coreos/pkg/health"
+)
+
+type PrivateKeyManager interface {
+	ExpiresAt() time.Time
+	Signer() (jose.Signer, error)
+	JWKs() ([]jose.JWK, error)
+	PublicKeys() ([]PublicKey, error)
+
+	WritableKeySetRepo
+	health.Checkable
+}
+
+func NewPrivateKeyManager() PrivateKeyManager {
+	return &privateKeyManager{
+		clock: clockwork.NewRealClock(),
+	}
+}
+
+type privateKeyManager struct {
+	keySet *PrivateKeySet
+	clock  clockwork.Clock
+}
+
+func (m *privateKeyManager) ExpiresAt() time.Time {
+	if m.keySet == nil {
+		return m.clock.Now().UTC()
+	}
+
+	return m.keySet.ExpiresAt()
+}
+
+func (m *privateKeyManager) Signer() (jose.Signer, error) {
+	if err := m.Healthy(); err != nil {
+		return nil, err
+	}
+
+	return m.keySet.Active().Signer(), nil
+}
+
+func (m *privateKeyManager) JWKs() ([]jose.JWK, error) {
+	if err := m.Healthy(); err != nil {
+		return nil, err
+	}
+
+	keys := m.keySet.Keys()
+	jwks := make([]jose.JWK, len(keys))
+	for i, k := range keys {
+		jwks[i] = k.JWK()
+	}
+	return jwks, nil
+}
+
+func (m *privateKeyManager) PublicKeys() ([]PublicKey, error) {
+	jwks, err := m.JWKs()
+	if err != nil {
+		return nil, err
+	}
+	keys := make([]PublicKey, len(jwks))
+	for i, jwk := range jwks {
+		keys[i] = *NewPublicKey(jwk)
+	}
+	return keys, nil
+}
+
+func (m *privateKeyManager) Healthy() error {
+	if m.keySet == nil {
+		return errors.New("private key manager uninitialized")
+	}
+
+	if len(m.keySet.Keys()) == 0 {
+		return errors.New("private key manager zero keys")
+	}
+
+	if m.keySet.ExpiresAt().Before(m.clock.Now().UTC()) {
+		return errors.New("private key manager keys expired")
+	}
+
+	return nil
+}
+
+func (m *privateKeyManager) Set(keySet KeySet) error {
+	privKeySet, ok := keySet.(*PrivateKeySet)
+	if !ok {
+		return errors.New("unable to cast to PrivateKeySet")
+	}
+
+	m.keySet = privKeySet
+	return nil
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/key/manager_test.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/key/manager_test.go
new file mode 100644
index 00000000..f3c753e7
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/key/manager_test.go
@@ -0,0 +1,225 @@
+package key
+
+import (
+	"crypto/rsa"
+	"math/big"
+	"reflect"
+	"strconv"
+	"testing"
+	"time"
+
+	"github.com/jonboulle/clockwork"
+
+	"github.com/coreos/go-oidc/jose"
+)
+
+var (
+	jwk1 jose.JWK
+	jwk2 jose.JWK
+	jwk3 jose.JWK
+)
+
+func init() {
+	jwk1 = jose.JWK{
+		ID:       "1",
+		Type:     "RSA",
+		Alg:      "RS256",
+		Use:      "sig",
+		Modulus:  big.NewInt(1),
+		Exponent: 65537,
+	}
+
+	jwk2 = jose.JWK{
+		ID:       "2",
+		Type:     "RSA",
+		Alg:      "RS256",
+		Use:      "sig",
+		Modulus:  big.NewInt(2),
+		Exponent: 65537,
+	}
+
+	jwk3 = jose.JWK{
+		ID:       "3",
+		Type:     "RSA",
+		Alg:      "RS256",
+		Use:      "sig",
+		Modulus:  big.NewInt(3),
+		Exponent: 65537,
+	}
+}
+
+func generatePrivateKeyStatic(t *testing.T, idAndN int) *PrivateKey {
+	n := big.NewInt(int64(idAndN))
+	if n == nil {
+		t.Fatalf("Call to NewInt(%d) failed", idAndN)
+	}
+
+	pk := &rsa.PrivateKey{
+		PublicKey: rsa.PublicKey{N: n, E: 65537},
+	}
+
+	return &PrivateKey{
+		KeyID:      strconv.Itoa(idAndN),
+		PrivateKey: pk,
+	}
+}
+
+func TestPrivateKeyManagerJWKsRotate(t *testing.T) {
+	k1 := generatePrivateKeyStatic(t, 1)
+	k2 := generatePrivateKeyStatic(t, 2)
+	k3 := generatePrivateKeyStatic(t, 3)
+	km := NewPrivateKeyManager()
+	err := km.Set(&PrivateKeySet{
+		keys:        []*PrivateKey{k1, k2, k3},
+		ActiveKeyID: k1.KeyID,
+		expiresAt:   time.Now().Add(time.Minute),
+	})
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	want := []jose.JWK{jwk1, jwk2, jwk3}
+	got, err := km.JWKs()
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+	if !reflect.DeepEqual(want, got) {
+		t.Fatalf("JWK mismatch: want=%#v got=%#v", want, got)
+	}
+}
+
+func TestPrivateKeyManagerSigner(t *testing.T) {
+	k := generatePrivateKeyStatic(t, 13)
+
+	km := NewPrivateKeyManager()
+	err := km.Set(&PrivateKeySet{
+		keys:        []*PrivateKey{k},
+		ActiveKeyID: k.KeyID,
+		expiresAt:   time.Now().Add(time.Minute),
+	})
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	signer, err := km.Signer()
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	wantID := "13"
+	gotID := signer.ID()
+	if wantID != gotID {
+		t.Fatalf("Signer has incorrect ID: want=%s got=%s", wantID, gotID)
+	}
+}
+
+func TestPrivateKeyManagerHealthyFail(t *testing.T) {
+	keyFixture := generatePrivateKeyStatic(t, 1)
+	tests := []*privateKeyManager{
+		// keySet nil
+		&privateKeyManager{
+			keySet: nil,
+			clock:  clockwork.NewRealClock(),
+		},
+		// zero keys
+		&privateKeyManager{
+			keySet: &PrivateKeySet{
+				keys:      []*PrivateKey{},
+				expiresAt: time.Now().Add(time.Minute),
+			},
+			clock: clockwork.NewRealClock(),
+		},
+		// key set expired
+		&privateKeyManager{
+			keySet: &PrivateKeySet{
+				keys:      []*PrivateKey{keyFixture},
+				expiresAt: time.Now().Add(-1 * time.Minute),
+			},
+			clock: clockwork.NewRealClock(),
+		},
+	}
+
+	for i, tt := range tests {
+		if err := tt.Healthy(); err == nil {
+			t.Errorf("case %d: nil error", i)
+		}
+	}
+}
+
+func TestPrivateKeyManagerHealthyFailsOtherMethods(t *testing.T) {
+	km := NewPrivateKeyManager()
+	if _, err := km.JWKs(); err == nil {
+		t.Fatalf("Expected non-nil error")
+	}
+	if _, err := km.Signer(); err == nil {
+		t.Fatalf("Expected non-nil error")
+	}
+}
+
+func TestPrivateKeyManagerExpiresAt(t *testing.T) {
+	fc := clockwork.NewFakeClock()
+	now := fc.Now().UTC()
+
+	k := generatePrivateKeyStatic(t, 17)
+	km := &privateKeyManager{
+		clock: fc,
+	}
+
+	want := fc.Now().UTC()
+	got := km.ExpiresAt()
+	if want != got {
+		t.Fatalf("Incorrect expiration time: want=%v got=%v", want, got)
+	}
+
+	err := km.Set(&PrivateKeySet{
+		keys:        []*PrivateKey{k},
+		ActiveKeyID: k.KeyID,
+		expiresAt:   now.Add(2 * time.Minute),
+	})
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	want = fc.Now().UTC().Add(2 * time.Minute)
+	got = km.ExpiresAt()
+	if want != got {
+		t.Fatalf("Incorrect expiration time: want=%v got=%v", want, got)
+	}
+}
+
+func TestPublicKeys(t *testing.T) {
+	km := NewPrivateKeyManager()
+	k1 := generatePrivateKeyStatic(t, 1)
+	k2 := generatePrivateKeyStatic(t, 2)
+	k3 := generatePrivateKeyStatic(t, 3)
+
+	tests := [][]*PrivateKey{
+		[]*PrivateKey{k1},
+		[]*PrivateKey{k1, k2},
+		[]*PrivateKey{k1, k2, k3},
+	}
+
+	for i, tt := range tests {
+		ks := &PrivateKeySet{
+			keys:      tt,
+			expiresAt: time.Now().Add(time.Hour),
+		}
+		km.Set(ks)
+
+		jwks, err := km.JWKs()
+		if err != nil {
+			t.Fatalf("Unexpected error: %v", err)
+		}
+
+		pks := NewPublicKeySet(jwks, time.Now().Add(time.Hour))
+		want := pks.Keys()
+		got, err := km.PublicKeys()
+		if err != nil {
+			t.Fatalf("Unexpected error: %v", err)
+		}
+
+		if !reflect.DeepEqual(want, got) {
+			t.Errorf("case %d: Invalid public keys: want=%v got=%v", i, want, got)
+		}
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/key/repo.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/key/repo.go
new file mode 100644
index 00000000..1d4ce8d3
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/key/repo.go
@@ -0,0 +1,45 @@
+package key
+
+import "errors"
+
+var ErrorNoKeys = errors.New("no keys found")
+
+type WritableKeySetRepo interface {
+	Set(KeySet) error
+}
+
+type ReadableKeySetRepo interface {
+	Get() (KeySet, error)
+}
+
+type PrivateKeySetRepo interface {
+	WritableKeySetRepo
+	ReadableKeySetRepo
+}
+
+func NewPrivateKeySetRepo() PrivateKeySetRepo {
+	return &memPrivateKeySetRepo{}
+}
+
+type memPrivateKeySetRepo struct {
+	pks PrivateKeySet
+}
+
+func (r *memPrivateKeySetRepo) Set(ks KeySet) error {
+	pks, ok := ks.(*PrivateKeySet)
+	if !ok {
+		return errors.New("unable to cast to PrivateKeySet")
+	} else if pks == nil {
+		return errors.New("nil KeySet")
+	}
+
+	r.pks = *pks
+	return nil
+}
+
+func (r *memPrivateKeySetRepo) Get() (KeySet, error) {
+	if r.pks.keys == nil {
+		return nil, ErrorNoKeys
+	}
+	return KeySet(&r.pks), nil
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/key/rotate.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/key/rotate.go
new file mode 100644
index 00000000..9c5508bc
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/key/rotate.go
@@ -0,0 +1,165 @@
+package key
+
+import (
+	"errors"
+	"time"
+
+	"github.com/coreos/pkg/capnslog"
+	ptime "github.com/coreos/pkg/timeutil"
+	"github.com/jonboulle/clockwork"
+)
+
+var (
+	log = capnslog.NewPackageLogger("github.com/coreos/go-oidc", "key")
+
+	ErrorPrivateKeysExpired = errors.New("private keys have expired")
+)
+
+func NewPrivateKeyRotator(repo PrivateKeySetRepo, ttl time.Duration) *PrivateKeyRotator {
+	return &PrivateKeyRotator{
+		repo: repo,
+		ttl:  ttl,
+
+		keep:        2,
+		generateKey: GeneratePrivateKey,
+		clock:       clockwork.NewRealClock(),
+	}
+}
+
+type PrivateKeyRotator struct {
+	repo        PrivateKeySetRepo
+	generateKey GeneratePrivateKeyFunc
+	clock       clockwork.Clock
+	keep        int
+	ttl         time.Duration
+}
+
+func (r *PrivateKeyRotator) expiresAt() time.Time {
+	return r.clock.Now().UTC().Add(r.ttl)
+}
+
+func (r *PrivateKeyRotator) Healthy() error {
+	pks, err := r.privateKeySet()
+	if err != nil {
+		return err
+	}
+
+	if r.clock.Now().After(pks.ExpiresAt()) {
+		return ErrorPrivateKeysExpired
+	}
+
+	return nil
+}
+
+func (r *PrivateKeyRotator) privateKeySet() (*PrivateKeySet, error) {
+	ks, err := r.repo.Get()
+	if err != nil {
+		return nil, err
+	}
+
+	pks, ok := ks.(*PrivateKeySet)
+	if !ok {
+		return nil, errors.New("unable to cast to PrivateKeySet")
+	}
+	return pks, nil
+}
+
+func (r *PrivateKeyRotator) nextRotation() (time.Duration, error) {
+	pks, err := r.privateKeySet()
+	if err == ErrorNoKeys {
+		log.Infof("No keys in private key set; must rotate immediately")
+		return 0, nil
+	}
+	if err != nil {
+		return 0, err
+	}
+
+	now := r.clock.Now()
+
+	// Ideally, we want to rotate after half the TTL has elapsed.
+	idealRotationTime := pks.ExpiresAt().Add(-r.ttl / 2)
+
+	// If we are past the ideal rotation time, rotate immediatly.
+	return max(0, idealRotationTime.Sub(now)), nil
+}
+
+func max(a, b time.Duration) time.Duration {
+	if a > b {
+		return a
+	}
+	return b
+}
+
+func (r *PrivateKeyRotator) Run() chan struct{} {
+	attempt := func() {
+		k, err := r.generateKey()
+		if err != nil {
+			log.Errorf("Failed generating signing key: %v", err)
+			return
+		}
+
+		exp := r.expiresAt()
+		if err := rotatePrivateKeys(r.repo, k, r.keep, exp); err != nil {
+			log.Errorf("Failed key rotation: %v", err)
+			return
+		}
+
+		log.Infof("Rotated signing keys: id=%s expiresAt=%s", k.ID(), exp)
+	}
+
+	stop := make(chan struct{})
+	go func() {
+		for {
+			var nextRotation time.Duration
+			var sleep time.Duration
+			var err error
+			for {
+				if nextRotation, err = r.nextRotation(); err == nil {
+					break
+				}
+				sleep = ptime.ExpBackoff(sleep, time.Minute)
+				log.Errorf("error getting nextRotation, retrying in %v: %v", sleep, err)
+				time.Sleep(sleep)
+			}
+
+			log.Infof("will rotate keys in %v", nextRotation)
+			select {
+			case <-r.clock.After(nextRotation):
+				attempt()
+			case <-stop:
+				return
+			}
+		}
+	}()
+
+	return stop
+}
+
+func rotatePrivateKeys(repo PrivateKeySetRepo, k *PrivateKey, keep int, exp time.Time) error {
+	ks, err := repo.Get()
+	if err != nil && err != ErrorNoKeys {
+		return err
+	}
+
+	var keys []*PrivateKey
+	if ks != nil {
+		pks, ok := ks.(*PrivateKeySet)
+		if !ok {
+			return errors.New("unable to cast to PrivateKeySet")
+		}
+		keys = pks.Keys()
+	}
+
+	keys = append([]*PrivateKey{k}, keys...)
+	if l := len(keys); l > keep {
+		keys = keys[0:keep]
+	}
+
+	nks := PrivateKeySet{
+		keys:        keys,
+		ActiveKeyID: k.ID(),
+		expiresAt:   exp,
+	}
+
+	return repo.Set(KeySet(&nks))
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/key/rotate_test.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/key/rotate_test.go
new file mode 100644
index 00000000..394a84f0
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/key/rotate_test.go
@@ -0,0 +1,311 @@
+package key
+
+import (
+	"reflect"
+	"testing"
+	"time"
+
+	"github.com/jonboulle/clockwork"
+)
+
+func generatePrivateKeySerialFunc(t *testing.T) GeneratePrivateKeyFunc {
+	var n int
+	return func() (*PrivateKey, error) {
+		n++
+		return generatePrivateKeyStatic(t, n), nil
+	}
+}
+
+func TestRotate(t *testing.T) {
+	now := time.Now()
+	k1 := generatePrivateKeyStatic(t, 1)
+	k2 := generatePrivateKeyStatic(t, 2)
+	k3 := generatePrivateKeyStatic(t, 3)
+
+	tests := []struct {
+		start *PrivateKeySet
+		key   *PrivateKey
+		keep  int
+		exp   time.Time
+		want  *PrivateKeySet
+	}{
+		// start with nil keys
+		{
+			start: nil,
+			key:   k1,
+			keep:  2,
+			exp:   now.Add(time.Second),
+			want: &PrivateKeySet{
+				keys:        []*PrivateKey{k1},
+				ActiveKeyID: k1.KeyID,
+				expiresAt:   now.Add(time.Second),
+			},
+		},
+		// start with zero keys
+		{
+			start: &PrivateKeySet{},
+			key:   k1,
+			keep:  2,
+			exp:   now.Add(time.Second),
+			want: &PrivateKeySet{
+				keys:        []*PrivateKey{k1},
+				ActiveKeyID: k1.KeyID,
+				expiresAt:   now.Add(time.Second),
+			},
+		},
+		// add second key
+		{
+			start: &PrivateKeySet{
+				keys:        []*PrivateKey{k1},
+				ActiveKeyID: k1.KeyID,
+				expiresAt:   now,
+			},
+			key:  k2,
+			keep: 2,
+			exp:  now.Add(time.Second),
+			want: &PrivateKeySet{
+				keys:        []*PrivateKey{k2, k1},
+				ActiveKeyID: k2.KeyID,
+				expiresAt:   now.Add(time.Second),
+			},
+		},
+		// rotate in third key
+		{
+			start: &PrivateKeySet{
+				keys:        []*PrivateKey{k2, k1},
+				ActiveKeyID: k2.KeyID,
+				expiresAt:   now,
+			},
+			key:  k3,
+			keep: 2,
+			exp:  now.Add(time.Second),
+			want: &PrivateKeySet{
+				keys:        []*PrivateKey{k3, k2},
+				ActiveKeyID: k3.KeyID,
+				expiresAt:   now.Add(time.Second),
+			},
+		},
+	}
+
+	for i, tt := range tests {
+		repo := NewPrivateKeySetRepo()
+		if tt.start != nil {
+			err := repo.Set(tt.start)
+			if err != nil {
+				log.Fatalf("case %d: unexpected error: %v", i, err)
+			}
+		}
+
+		rotatePrivateKeys(repo, tt.key, tt.keep, tt.exp)
+		got, err := repo.Get()
+		if err != nil {
+			t.Errorf("case %d: unexpected error: %v", i, err)
+			continue
+		}
+		if !reflect.DeepEqual(tt.want, got) {
+			t.Errorf("case %d: unexpected result: want=%#v got=%#v", i, tt.want, got)
+		}
+	}
+}
+
+func TestPrivateKeyRotatorRun(t *testing.T) {
+	fc := clockwork.NewFakeClock()
+	now := fc.Now().UTC()
+
+	k1 := generatePrivateKeyStatic(t, 1)
+	k2 := generatePrivateKeyStatic(t, 2)
+	k3 := generatePrivateKeyStatic(t, 3)
+	k4 := generatePrivateKeyStatic(t, 4)
+
+	kRepo := NewPrivateKeySetRepo()
+	krot := NewPrivateKeyRotator(kRepo, 4*time.Second)
+	krot.clock = fc
+	krot.generateKey = generatePrivateKeySerialFunc(t)
+
+	steps := []*PrivateKeySet{
+		&PrivateKeySet{
+			keys:        []*PrivateKey{k1},
+			ActiveKeyID: k1.KeyID,
+			expiresAt:   now.Add(4 * time.Second),
+		},
+		&PrivateKeySet{
+			keys:        []*PrivateKey{k2, k1},
+			ActiveKeyID: k2.KeyID,
+			expiresAt:   now.Add(6 * time.Second),
+		},
+		&PrivateKeySet{
+			keys:        []*PrivateKey{k3, k2},
+			ActiveKeyID: k3.KeyID,
+			expiresAt:   now.Add(8 * time.Second),
+		},
+		&PrivateKeySet{
+			keys:        []*PrivateKey{k4, k3},
+			ActiveKeyID: k4.KeyID,
+			expiresAt:   now.Add(10 * time.Second),
+		},
+	}
+
+	stop := krot.Run()
+	defer close(stop)
+
+	for i, st := range steps {
+		// wait for the rotater to get sleepy
+		fc.BlockUntil(1)
+
+		got, err := kRepo.Get()
+		if err != nil {
+			t.Fatalf("step %d: unexpected error: %v", i, err)
+		}
+		if !reflect.DeepEqual(st, got) {
+			t.Fatalf("step %d: unexpected state: want=%#v got=%#v", i, st, got)
+		}
+		fc.Advance(2 * time.Second)
+	}
+}
+
+func TestPrivateKeyRotatorExpiresAt(t *testing.T) {
+	fc := clockwork.NewFakeClock()
+	krot := &PrivateKeyRotator{
+		clock: fc,
+		ttl:   time.Minute,
+	}
+	got := krot.expiresAt()
+	want := fc.Now().UTC().Add(time.Minute)
+	if !reflect.DeepEqual(want, got) {
+		t.Errorf("Incorrect expiration time: want=%v got=%v", want, got)
+	}
+}
+
+func TestNextRotation(t *testing.T) {
+	fc := clockwork.NewFakeClock()
+	now := fc.Now().UTC()
+
+	tests := []struct {
+		expiresAt time.Time
+		ttl       time.Duration
+		numKeys   int
+		expected  time.Duration
+	}{
+		{
+			// closest to prod
+			expiresAt: now.Add(time.Hour * 24),
+			ttl:       time.Hour * 24,
+			numKeys:   2,
+			expected:  time.Hour * 12,
+		},
+		{
+			expiresAt: now.Add(time.Hour * 2),
+			ttl:       time.Hour * 4,
+			numKeys:   2,
+			expected:  0,
+		},
+		{
+			// No keys.
+			expiresAt: now.Add(time.Hour * 2),
+			ttl:       time.Hour * 4,
+			numKeys:   0,
+			expected:  0,
+		},
+		{
+			// Nil keyset.
+			expiresAt: now.Add(time.Hour * 2),
+			ttl:       time.Hour * 4,
+			numKeys:   -1,
+			expected:  0,
+		},
+		{
+			// KeySet expired.
+			expiresAt: now.Add(time.Hour * -2),
+			ttl:       time.Hour * 4,
+			numKeys:   2,
+			expected:  0,
+		},
+		{
+			// Expiry past now + TTL
+			expiresAt: now.Add(time.Hour * 5),
+			ttl:       time.Hour * 4,
+			numKeys:   2,
+			expected:  3 * time.Hour,
+		},
+	}
+
+	for i, tt := range tests {
+		kRepo := NewPrivateKeySetRepo()
+		krot := NewPrivateKeyRotator(kRepo, tt.ttl)
+		krot.clock = fc
+		pks := &PrivateKeySet{
+			expiresAt: tt.expiresAt,
+		}
+		if tt.numKeys != -1 {
+			for n := 0; n < tt.numKeys; n++ {
+				pks.keys = append(pks.keys, generatePrivateKeyStatic(t, n))
+			}
+			err := kRepo.Set(pks)
+			if err != nil {
+				log.Fatalf("case %d: unexpected error: %v", i, err)
+			}
+
+		}
+		actual, err := krot.nextRotation()
+		if err != nil {
+			t.Errorf("case %d: error calling shouldRotate(): %v", i, err)
+		}
+		if actual != tt.expected {
+			t.Errorf("case %d: actual == %v, want %v", i, actual, tt.expected)
+		}
+	}
+}
+
+func TestHealthy(t *testing.T) {
+	fc := clockwork.NewFakeClock()
+	now := fc.Now().UTC()
+
+	tests := []struct {
+		expiresAt time.Time
+		numKeys   int
+		expected  error
+	}{
+		{
+			expiresAt: now.Add(time.Hour),
+			numKeys:   2,
+			expected:  nil,
+		},
+		{
+			expiresAt: now.Add(time.Hour),
+			numKeys:   -1,
+			expected:  ErrorNoKeys,
+		},
+		{
+			expiresAt: now.Add(time.Hour),
+			numKeys:   0,
+			expected:  ErrorNoKeys,
+		},
+		{
+			expiresAt: now.Add(-time.Hour),
+			numKeys:   2,
+			expected:  ErrorPrivateKeysExpired,
+		},
+	}
+
+	for i, tt := range tests {
+		kRepo := NewPrivateKeySetRepo()
+		krot := NewPrivateKeyRotator(kRepo, time.Hour)
+		krot.clock = fc
+		pks := &PrivateKeySet{
+			expiresAt: tt.expiresAt,
+		}
+		if tt.numKeys != -1 {
+			for n := 0; n < tt.numKeys; n++ {
+				pks.keys = append(pks.keys, generatePrivateKeyStatic(t, n))
+			}
+			err := kRepo.Set(pks)
+			if err != nil {
+				log.Fatalf("case %d: unexpected error: %v", i, err)
+			}
+
+		}
+		if err := krot.Healthy(); err != tt.expected {
+			t.Errorf("case %d: got==%q, want==%q", i, err, tt.expected)
+		}
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/key/sync.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/key/sync.go
new file mode 100644
index 00000000..076ee462
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/key/sync.go
@@ -0,0 +1,91 @@
+package key
+
+import (
+	"errors"
+	"time"
+
+	"github.com/jonboulle/clockwork"
+
+	"github.com/coreos/pkg/timeutil"
+)
+
+func NewKeySetSyncer(r ReadableKeySetRepo, w WritableKeySetRepo) *KeySetSyncer {
+	return &KeySetSyncer{
+		readable: r,
+		writable: w,
+		clock:    clockwork.NewRealClock(),
+	}
+}
+
+type KeySetSyncer struct {
+	readable ReadableKeySetRepo
+	writable WritableKeySetRepo
+	clock    clockwork.Clock
+}
+
+func (s *KeySetSyncer) Run() chan struct{} {
+	stop := make(chan struct{})
+	go func() {
+		var failing bool
+		var next time.Duration
+		for {
+			exp, err := sync(s.readable, s.writable, s.clock)
+			if err != nil || exp == 0 {
+				if !failing {
+					failing = true
+					next = time.Second
+				} else {
+					next = timeutil.ExpBackoff(next, time.Minute)
+				}
+				if exp == 0 {
+					log.Errorf("Synced to already expired key set, retrying in %v: %v", next, err)
+
+				} else {
+					log.Errorf("Failed syncing key set, retrying in %v: %v", next, err)
+				}
+			} else {
+				failing = false
+				next = exp / 2
+				log.Infof("Synced key set, checking again in %v", next)
+			}
+
+			select {
+			case <-s.clock.After(next):
+				continue
+			case <-stop:
+				return
+			}
+		}
+	}()
+
+	return stop
+}
+
+func Sync(r ReadableKeySetRepo, w WritableKeySetRepo) (time.Duration, error) {
+	return sync(r, w, clockwork.NewRealClock())
+}
+
+// sync copies the keyset from r to the KeySet at w and returns the duration in which the KeySet will expire.
+// If keyset has already expired, returns a zero duration.
+func sync(r ReadableKeySetRepo, w WritableKeySetRepo, clock clockwork.Clock) (exp time.Duration, err error) {
+	var ks KeySet
+	ks, err = r.Get()
+	if err != nil {
+		return
+	}
+
+	if ks == nil {
+		err = errors.New("no source KeySet")
+		return
+	}
+
+	if err = w.Set(ks); err != nil {
+		return
+	}
+
+	now := clock.Now()
+	if ks.ExpiresAt().After(now) {
+		exp = ks.ExpiresAt().Sub(now)
+	}
+	return
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/key/sync_test.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/key/sync_test.go
new file mode 100644
index 00000000..ec8ef736
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/key/sync_test.go
@@ -0,0 +1,205 @@
+package key
+
+import (
+	"errors"
+	"reflect"
+	"testing"
+	"time"
+
+	"github.com/jonboulle/clockwork"
+)
+
+type staticReadableKeySetRepo struct {
+	ks  KeySet
+	err error
+}
+
+func (r *staticReadableKeySetRepo) Get() (KeySet, error) {
+	return r.ks, r.err
+}
+
+func TestKeySyncerSync(t *testing.T) {
+	fc := clockwork.NewFakeClock()
+	now := fc.Now().UTC()
+
+	k1 := generatePrivateKeyStatic(t, 1)
+	k2 := generatePrivateKeyStatic(t, 2)
+	k3 := generatePrivateKeyStatic(t, 3)
+
+	steps := []struct {
+		fromKS  KeySet
+		fromErr error
+		advance time.Duration
+		want    *PrivateKeySet
+	}{
+		// on startup, first sync should trigger within a second
+		{
+			fromKS: &PrivateKeySet{
+				keys:        []*PrivateKey{k1},
+				ActiveKeyID: k1.KeyID,
+				expiresAt:   now.Add(10 * time.Second),
+			},
+			advance: time.Second,
+			want: &PrivateKeySet{
+				keys:        []*PrivateKey{k1},
+				ActiveKeyID: k1.KeyID,
+				expiresAt:   now.Add(10 * time.Second),
+			},
+		},
+		// advance halfway into TTL, triggering sync
+		{
+			fromKS: &PrivateKeySet{
+				keys:        []*PrivateKey{k2, k1},
+				ActiveKeyID: k2.KeyID,
+				expiresAt:   now.Add(15 * time.Second),
+			},
+			advance: 5 * time.Second,
+			want: &PrivateKeySet{
+				keys:        []*PrivateKey{k2, k1},
+				ActiveKeyID: k2.KeyID,
+				expiresAt:   now.Add(15 * time.Second),
+			},
+		},
+
+		// advance halfway into TTL, triggering sync that fails
+		{
+			fromErr: errors.New("fail!"),
+			advance: 10 * time.Second,
+			want: &PrivateKeySet{
+				keys:        []*PrivateKey{k2, k1},
+				ActiveKeyID: k2.KeyID,
+				expiresAt:   now.Add(15 * time.Second),
+			},
+		},
+
+		// sync retries quickly, and succeeds with fixed data
+		{
+			fromKS: &PrivateKeySet{
+				keys:        []*PrivateKey{k3, k2, k1},
+				ActiveKeyID: k3.KeyID,
+				expiresAt:   now.Add(25 * time.Second),
+			},
+			advance: 3 * time.Second,
+			want: &PrivateKeySet{
+				keys:        []*PrivateKey{k3, k2, k1},
+				ActiveKeyID: k3.KeyID,
+				expiresAt:   now.Add(25 * time.Second),
+			},
+		},
+	}
+
+	from := &staticReadableKeySetRepo{}
+	to := NewPrivateKeySetRepo()
+
+	syncer := NewKeySetSyncer(from, to)
+	syncer.clock = fc
+	stop := syncer.Run()
+	defer close(stop)
+
+	for i, st := range steps {
+		from.ks = st.fromKS
+		from.err = st.fromErr
+
+		fc.Advance(st.advance)
+		fc.BlockUntil(1)
+
+		ks, err := to.Get()
+		if err != nil {
+			t.Fatalf("step %d: unable to get keys: %v", i, err)
+		}
+		if !reflect.DeepEqual(st.want, ks) {
+			t.Fatalf("step %d: incorrect state: want=%#v got=%#v", i, st.want, ks)
+		}
+	}
+}
+
+func TestSync(t *testing.T) {
+	fc := clockwork.NewFakeClock()
+	now := fc.Now().UTC()
+
+	k1 := generatePrivateKeyStatic(t, 1)
+	k2 := generatePrivateKeyStatic(t, 2)
+	k3 := generatePrivateKeyStatic(t, 3)
+
+	tests := []struct {
+		keySet *PrivateKeySet
+		want   time.Duration
+	}{
+		{
+			keySet: &PrivateKeySet{
+				keys:        []*PrivateKey{k1},
+				ActiveKeyID: k1.KeyID,
+				expiresAt:   now.Add(time.Minute),
+			},
+			want: time.Minute,
+		},
+		{
+			keySet: &PrivateKeySet{
+				keys:        []*PrivateKey{k2, k1},
+				ActiveKeyID: k2.KeyID,
+				expiresAt:   now.Add(time.Minute),
+			},
+			want: time.Minute,
+		},
+		{
+			keySet: &PrivateKeySet{
+				keys:        []*PrivateKey{k3, k2, k1},
+				ActiveKeyID: k2.KeyID,
+				expiresAt:   now.Add(time.Minute),
+			},
+			want: time.Minute,
+		},
+		{
+			keySet: &PrivateKeySet{
+				keys:        []*PrivateKey{k2, k1},
+				ActiveKeyID: k2.KeyID,
+				expiresAt:   now.Add(time.Hour),
+			},
+			want: time.Hour,
+		},
+		{
+			keySet: &PrivateKeySet{
+				keys:        []*PrivateKey{k1},
+				ActiveKeyID: k1.KeyID,
+				expiresAt:   now.Add(-time.Hour),
+			},
+			want: 0,
+		},
+	}
+
+	for i, tt := range tests {
+		from := NewPrivateKeySetRepo()
+		to := NewPrivateKeySetRepo()
+
+		err := from.Set(tt.keySet)
+		if err != nil {
+			t.Errorf("case %d: unexpected error: %v", i, err)
+			continue
+		}
+		exp, err := sync(from, to, fc)
+		if err != nil {
+			t.Errorf("case %d: unexpected error: %v", i, err)
+			continue
+		}
+
+		if tt.want != exp {
+			t.Errorf("case %d: want=%v got=%v", i, tt.want, exp)
+		}
+	}
+}
+
+func TestSyncFail(t *testing.T) {
+	tests := []error{
+		nil,
+		errors.New("fail!"),
+	}
+
+	for i, tt := range tests {
+		from := &staticReadableKeySetRepo{ks: nil, err: tt}
+		to := NewPrivateKeySetRepo()
+
+		if _, err := sync(from, to, clockwork.NewFakeClock()); err == nil {
+			t.Errorf("case %d: expected non-nil error", i)
+		}
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/oauth2/error.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/oauth2/error.go
new file mode 100644
index 00000000..d5e5ab9d
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/oauth2/error.go
@@ -0,0 +1,39 @@
+package oauth2
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+const (
+	ErrorAccessDenied            = "access_denied"
+	ErrorInvalidClient           = "invalid_client"
+	ErrorInvalidGrant            = "invalid_grant"
+	ErrorInvalidRequest          = "invalid_request"
+	ErrorServerError             = "server_error"
+	ErrorUnauthorizedClient      = "unauthorized_client"
+	ErrorUnsupportedGrantType    = "unsupported_grant_type"
+	ErrorUnsupportedResponseType = "unsupported_response_type"
+)
+
+type Error struct {
+	Type  string `json:"error"`
+	State string `json:"state,omitempty"`
+}
+
+func (e *Error) Error() string {
+	return e.Type
+}
+
+func NewError(typ string) *Error {
+	return &Error{Type: typ}
+}
+
+func unmarshalError(b []byte) error {
+	var oerr Error
+	err := json.Unmarshal(b, &oerr)
+	if err != nil {
+		return fmt.Errorf("unrecognized error: %s", string(b))
+	}
+	return &oerr
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/oauth2/error_test.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/oauth2/error_test.go
new file mode 100644
index 00000000..41174893
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/oauth2/error_test.go
@@ -0,0 +1,79 @@
+package oauth2
+
+import (
+	"fmt"
+	"reflect"
+	"testing"
+)
+
+func TestUnmarshalError(t *testing.T) {
+	tests := []struct {
+		b []byte
+		e *Error
+		o bool
+	}{
+		{
+			b: []byte("{ \"error\": \"invalid_client\", \"state\": \"foo\" }"),
+			e: &Error{Type: ErrorInvalidClient, State: "foo"},
+			o: true,
+		},
+		{
+			b: []byte("{ \"error\": \"invalid_grant\", \"state\": \"bar\" }"),
+			e: &Error{Type: ErrorInvalidGrant, State: "bar"},
+			o: true,
+		},
+		{
+			b: []byte("{ \"error\": \"invalid_request\", \"state\": \"\" }"),
+			e: &Error{Type: ErrorInvalidRequest, State: ""},
+			o: true,
+		},
+		{
+			b: []byte("{ \"error\": \"server_error\", \"state\": \"elroy\" }"),
+			e: &Error{Type: ErrorServerError, State: "elroy"},
+			o: true,
+		},
+		{
+			b: []byte("{ \"error\": \"unsupported_grant_type\", \"state\": \"\" }"),
+			e: &Error{Type: ErrorUnsupportedGrantType, State: ""},
+			o: true,
+		},
+		{
+			b: []byte("{ \"error\": \"unsupported_response_type\", \"state\": \"\" }"),
+			e: &Error{Type: ErrorUnsupportedResponseType, State: ""},
+			o: true,
+		},
+		// Should fail json unmarshal
+		{
+			b: nil,
+			e: nil,
+			o: false,
+		},
+		{
+			b: []byte("random string"),
+			e: nil,
+			o: false,
+		},
+	}
+
+	for i, tt := range tests {
+		err := unmarshalError(tt.b)
+		oerr, ok := err.(*Error)
+
+		if ok != tt.o {
+			t.Errorf("%v != %v, %v", ok, tt.o, oerr)
+			t.Errorf("case %d: want=%+v, got=%+v", i, tt.e, oerr)
+		}
+
+		if ok && !reflect.DeepEqual(tt.e, oerr) {
+			t.Errorf("case %d: want=%+v, got=%+v", i, tt.e, oerr)
+		}
+
+		if !ok && tt.e != nil {
+			want := fmt.Sprintf("unrecognized error: %s", string(tt.b))
+			got := tt.e.Error()
+			if want != got {
+				t.Errorf("case %d: want=%+v, got=%+v", i, want, got)
+			}
+		}
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/oauth2/oauth2.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/oauth2/oauth2.go
new file mode 100644
index 00000000..7d5c7316
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/oauth2/oauth2.go
@@ -0,0 +1,326 @@
+package oauth2
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io/ioutil"
+	"mime"
+	"net/http"
+	"net/url"
+	"strconv"
+	"strings"
+
+	phttp "github.com/coreos/go-oidc/http"
+)
+
+const (
+	ResponseTypeCode = "code"
+)
+
+const (
+	GrantTypeAuthCode     = "authorization_code"
+	GrantTypeClientCreds  = "client_credentials"
+	GrantTypeImplicit     = "implicit"
+	GrantTypeRefreshToken = "refresh_token"
+
+	AuthMethodClientSecretPost  = "client_secret_post"
+	AuthMethodClientSecretBasic = "client_secret_basic"
+	AuthMethodClientSecretJWT   = "client_secret_jwt"
+	AuthMethodPrivateKeyJWT     = "private_key_jwt"
+)
+
+type Config struct {
+	Credentials ClientCredentials
+	Scope       []string
+	RedirectURL string
+	AuthURL     string
+	TokenURL    string
+
+	// Must be one of the AuthMethodXXX methods above. Right now, only
+	// AuthMethodClientSecretPost and AuthMethodClientSecretBasic are supported.
+	AuthMethod string
+}
+
+type Client struct {
+	hc          phttp.Client
+	creds       ClientCredentials
+	scope       []string
+	authURL     *url.URL
+	redirectURL *url.URL
+	tokenURL    *url.URL
+	authMethod  string
+}
+
+type ClientCredentials struct {
+	ID     string
+	Secret string
+}
+
+func NewClient(hc phttp.Client, cfg Config) (c *Client, err error) {
+	if len(cfg.Credentials.ID) == 0 {
+		err = errors.New("missing client id")
+		return
+	}
+
+	if len(cfg.Credentials.Secret) == 0 {
+		err = errors.New("missing client secret")
+		return
+	}
+
+	if cfg.AuthMethod == "" {
+		cfg.AuthMethod = AuthMethodClientSecretBasic
+	} else if cfg.AuthMethod != AuthMethodClientSecretPost && cfg.AuthMethod != AuthMethodClientSecretBasic {
+		err = fmt.Errorf("auth method %q is not supported", cfg.AuthMethod)
+		return
+	}
+
+	au, err := phttp.ParseNonEmptyURL(cfg.AuthURL)
+	if err != nil {
+		return
+	}
+
+	tu, err := phttp.ParseNonEmptyURL(cfg.TokenURL)
+	if err != nil {
+		return
+	}
+
+	// Allow empty redirect URL in the case where the client
+	// only needs to verify a given token.
+	ru, err := url.Parse(cfg.RedirectURL)
+	if err != nil {
+		return
+	}
+
+	c = &Client{
+		creds:       cfg.Credentials,
+		scope:       cfg.Scope,
+		redirectURL: ru,
+		authURL:     au,
+		tokenURL:    tu,
+		hc:          hc,
+		authMethod:  cfg.AuthMethod,
+	}
+
+	return
+}
+
+// Generate the url for initial redirect to oauth provider.
+func (c *Client) AuthCodeURL(state, accessType, prompt string) string {
+	v := c.commonURLValues()
+	v.Set("state", state)
+	if strings.ToLower(accessType) == "offline" {
+		v.Set("access_type", "offline")
+	}
+
+	if prompt != "" {
+		v.Set("prompt", prompt)
+	}
+	v.Set("response_type", "code")
+
+	q := v.Encode()
+	u := *c.authURL
+	if u.RawQuery == "" {
+		u.RawQuery = q
+	} else {
+		u.RawQuery += "&" + q
+	}
+	return u.String()
+}
+
+func (c *Client) commonURLValues() url.Values {
+	return url.Values{
+		"redirect_uri": {c.redirectURL.String()},
+		"scope":        {strings.Join(c.scope, " ")},
+		"client_id":    {c.creds.ID},
+	}
+}
+
+func (c *Client) newAuthenticatedRequest(url string, values url.Values) (*http.Request, error) {
+	var req *http.Request
+	var err error
+	switch c.authMethod {
+	case AuthMethodClientSecretPost:
+		values.Set("client_secret", c.creds.Secret)
+		req, err = http.NewRequest("POST", url, strings.NewReader(values.Encode()))
+		if err != nil {
+			return nil, err
+		}
+	case AuthMethodClientSecretBasic:
+		req, err = http.NewRequest("POST", url, strings.NewReader(values.Encode()))
+		if err != nil {
+			return nil, err
+		}
+		req.SetBasicAuth(c.creds.ID, c.creds.Secret)
+	default:
+		panic("misconfigured client: auth method not supported")
+	}
+
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	return req, nil
+
+}
+
+// ClientCredsToken posts the client id and secret to obtain a token scoped to the OAuth2 client via the "client_credentials" grant type.
+// May not be supported by all OAuth2 servers.
+func (c *Client) ClientCredsToken(scope []string) (result TokenResponse, err error) {
+	v := url.Values{
+		"scope":      {strings.Join(scope, " ")},
+		"grant_type": {GrantTypeClientCreds},
+	}
+
+	req, err := c.newAuthenticatedRequest(c.tokenURL.String(), v)
+	if err != nil {
+		return
+	}
+
+	resp, err := c.hc.Do(req)
+	if err != nil {
+		return
+	}
+	defer resp.Body.Close()
+
+	return parseTokenResponse(resp)
+}
+
+// RequestToken requests a token from the Token Endpoint with the specified grantType.
+// If 'grantType' == GrantTypeAuthCode, then 'value' should be the authorization code.
+// If 'grantType' == GrantTypeRefreshToken, then 'value' should be the refresh token.
+func (c *Client) RequestToken(grantType, value string) (result TokenResponse, err error) {
+	v := c.commonURLValues()
+
+	v.Set("grant_type", grantType)
+	v.Set("client_secret", c.creds.Secret)
+	switch grantType {
+	case GrantTypeAuthCode:
+		v.Set("code", value)
+	case GrantTypeRefreshToken:
+		v.Set("refresh_token", value)
+	default:
+		err = fmt.Errorf("unsupported grant_type: %v", grantType)
+		return
+	}
+
+	req, err := c.newAuthenticatedRequest(c.tokenURL.String(), v)
+	if err != nil {
+		return
+	}
+
+	resp, err := c.hc.Do(req)
+	if err != nil {
+		return
+	}
+	defer resp.Body.Close()
+
+	return parseTokenResponse(resp)
+}
+
+func parseTokenResponse(resp *http.Response) (result TokenResponse, err error) {
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return
+	}
+
+	if resp.StatusCode < 200 || resp.StatusCode > 299 {
+		err = unmarshalError(body)
+		return
+	}
+
+	contentType, _, err := mime.ParseMediaType(resp.Header.Get("Content-Type"))
+	if err != nil {
+		return
+	}
+
+	result = TokenResponse{
+		RawBody: body,
+	}
+
+	if contentType == "application/x-www-form-urlencoded" || contentType == "text/plain" {
+		var vals url.Values
+		vals, err = url.ParseQuery(string(body))
+		if err != nil {
+			return
+		}
+		result.AccessToken = vals.Get("access_token")
+		result.TokenType = vals.Get("token_type")
+		result.IDToken = vals.Get("id_token")
+		result.RefreshToken = vals.Get("refresh_token")
+		result.Scope = vals.Get("scope")
+		e := vals.Get("expires_in")
+		if e == "" {
+			e = vals.Get("expires")
+		}
+		result.Expires, err = strconv.Atoi(e)
+		if err != nil {
+			return
+		}
+	} else {
+		b := make(map[string]interface{})
+		if err = json.Unmarshal(body, &b); err != nil {
+			return
+		}
+		result.AccessToken, _ = b["access_token"].(string)
+		result.TokenType, _ = b["token_type"].(string)
+		result.IDToken, _ = b["id_token"].(string)
+		result.RefreshToken, _ = b["refresh_token"].(string)
+		result.Scope, _ = b["scope"].(string)
+		e, ok := b["expires_in"].(int)
+		if !ok {
+			e, _ = b["expires"].(int)
+		}
+		result.Expires = e
+	}
+
+	return
+}
+
+type TokenResponse struct {
+	AccessToken  string
+	TokenType    string
+	Expires      int
+	IDToken      string
+	RefreshToken string // OPTIONAL.
+	Scope        string // OPTIONAL, if identical to the scope requested by the client, otherwise, REQUIRED.
+	RawBody      []byte // In case callers need some other non-standard info from the token response
+}
+
+type AuthCodeRequest struct {
+	ResponseType string
+	ClientID     string
+	RedirectURL  *url.URL
+	Scope        []string
+	State        string
+}
+
+func ParseAuthCodeRequest(q url.Values) (AuthCodeRequest, error) {
+	acr := AuthCodeRequest{
+		ResponseType: q.Get("response_type"),
+		ClientID:     q.Get("client_id"),
+		State:        q.Get("state"),
+		Scope:        make([]string, 0),
+	}
+
+	qs := strings.TrimSpace(q.Get("scope"))
+	if qs != "" {
+		acr.Scope = strings.Split(qs, " ")
+	}
+
+	err := func() error {
+		if acr.ClientID == "" {
+			return NewError(ErrorInvalidRequest)
+		}
+
+		redirectURL := q.Get("redirect_uri")
+		if redirectURL != "" {
+			ru, err := url.Parse(redirectURL)
+			if err != nil {
+				return NewError(ErrorInvalidRequest)
+			}
+			acr.RedirectURL = ru
+		}
+
+		return nil
+	}()
+
+	return acr, err
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/oauth2/oauth2_test.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/oauth2/oauth2_test.go
new file mode 100644
index 00000000..9e5fd9a3
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/oauth2/oauth2_test.go
@@ -0,0 +1,262 @@
+package oauth2
+
+import (
+	"errors"
+	"net/url"
+	"reflect"
+	"strings"
+	"testing"
+
+	phttp "github.com/coreos/go-oidc/http"
+)
+
+func TestParseAuthCodeRequest(t *testing.T) {
+	tests := []struct {
+		query   url.Values
+		wantACR AuthCodeRequest
+		wantErr error
+	}{
+		// no redirect_uri
+		{
+			query: url.Values{
+				"response_type": []string{"code"},
+				"scope":         []string{"foo bar baz"},
+				"client_id":     []string{"XXX"},
+				"state":         []string{"pants"},
+			},
+			wantACR: AuthCodeRequest{
+				ResponseType: "code",
+				ClientID:     "XXX",
+				Scope:        []string{"foo", "bar", "baz"},
+				State:        "pants",
+				RedirectURL:  nil,
+			},
+		},
+
+		// with redirect_uri
+		{
+			query: url.Values{
+				"response_type": []string{"code"},
+				"redirect_uri":  []string{"https://127.0.0.1:5555/callback?foo=bar"},
+				"scope":         []string{"foo bar baz"},
+				"client_id":     []string{"XXX"},
+				"state":         []string{"pants"},
+			},
+			wantACR: AuthCodeRequest{
+				ResponseType: "code",
+				ClientID:     "XXX",
+				Scope:        []string{"foo", "bar", "baz"},
+				State:        "pants",
+				RedirectURL: &url.URL{
+					Scheme:   "https",
+					Host:     "127.0.0.1:5555",
+					Path:     "/callback",
+					RawQuery: "foo=bar",
+				},
+			},
+		},
+
+		// unsupported response_type doesn't trigger error
+		{
+			query: url.Values{
+				"response_type": []string{"token"},
+				"redirect_uri":  []string{"https://127.0.0.1:5555/callback?foo=bar"},
+				"scope":         []string{"foo bar baz"},
+				"client_id":     []string{"XXX"},
+				"state":         []string{"pants"},
+			},
+			wantACR: AuthCodeRequest{
+				ResponseType: "token",
+				ClientID:     "XXX",
+				Scope:        []string{"foo", "bar", "baz"},
+				State:        "pants",
+				RedirectURL: &url.URL{
+					Scheme:   "https",
+					Host:     "127.0.0.1:5555",
+					Path:     "/callback",
+					RawQuery: "foo=bar",
+				},
+			},
+		},
+
+		// unparseable redirect_uri
+		{
+			query: url.Values{
+				"response_type": []string{"code"},
+				"redirect_uri":  []string{":"},
+				"scope":         []string{"foo bar baz"},
+				"client_id":     []string{"XXX"},
+				"state":         []string{"pants"},
+			},
+			wantACR: AuthCodeRequest{
+				ResponseType: "code",
+				ClientID:     "XXX",
+				Scope:        []string{"foo", "bar", "baz"},
+				State:        "pants",
+			},
+			wantErr: NewError(ErrorInvalidRequest),
+		},
+
+		// no client_id, redirect_uri not parsed
+		{
+			query: url.Values{
+				"response_type": []string{"code"},
+				"redirect_uri":  []string{"https://127.0.0.1:5555/callback?foo=bar"},
+				"scope":         []string{"foo bar baz"},
+				"client_id":     []string{},
+				"state":         []string{"pants"},
+			},
+			wantACR: AuthCodeRequest{
+				ResponseType: "code",
+				ClientID:     "",
+				Scope:        []string{"foo", "bar", "baz"},
+				State:        "pants",
+				RedirectURL:  nil,
+			},
+			wantErr: NewError(ErrorInvalidRequest),
+		},
+	}
+
+	for i, tt := range tests {
+		got, err := ParseAuthCodeRequest(tt.query)
+		if !reflect.DeepEqual(tt.wantErr, err) {
+			t.Errorf("case %d: incorrect error value: want=%q got=%q", i, tt.wantErr, err)
+		}
+
+		if !reflect.DeepEqual(tt.wantACR, got) {
+			t.Errorf("case %d: incorrect AuthCodeRequest value: want=%#v got=%#v", i, tt.wantACR, got)
+		}
+	}
+}
+
+func TestClientCredsToken(t *testing.T) {
+	hc := &phttp.RequestRecorder{Error: errors.New("error")}
+	cfg := Config{
+		Credentials: ClientCredentials{ID: "cid", Secret: "csecret"},
+		Scope:       []string{"foo-scope", "bar-scope"},
+		TokenURL:    "http://example.com/token",
+		AuthMethod:  AuthMethodClientSecretBasic,
+		RedirectURL: "http://example.com/redirect",
+		AuthURL:     "http://example.com/auth",
+	}
+
+	c, err := NewClient(hc, cfg)
+	if err != nil {
+		t.Errorf("unexpected error %v", err)
+	}
+
+	scope := []string{"openid"}
+	c.ClientCredsToken(scope)
+	if hc.Request == nil {
+		t.Error("request is empty")
+	}
+
+	tu := hc.Request.URL.String()
+	if cfg.TokenURL != tu {
+		t.Errorf("wrong token url, want=%v, got=%v", cfg.TokenURL, tu)
+	}
+
+	ct := hc.Request.Header.Get("Content-Type")
+	if ct != "application/x-www-form-urlencoded" {
+		t.Errorf("wrong content-type, want=application/x-www-form-urlencoded, got=%v", ct)
+	}
+
+	cid, secret, ok := phttp.BasicAuth(hc.Request)
+	if !ok {
+		t.Error("unexpected error parsing basic auth")
+	}
+
+	if cfg.Credentials.ID != cid {
+		t.Errorf("wrong client ID, want=%v, got=%v", cfg.Credentials.ID, cid)
+	}
+
+	if cfg.Credentials.Secret != secret {
+		t.Errorf("wrong client secret, want=%v, got=%v", cfg.Credentials.Secret, secret)
+	}
+
+	err = hc.Request.ParseForm()
+	if err != nil {
+		t.Error("unexpected error parsing form")
+	}
+
+	gt := hc.Request.PostForm.Get("grant_type")
+	if gt != GrantTypeClientCreds {
+		t.Errorf("wrong grant_type, want=client_credentials, got=%v", gt)
+	}
+
+	sc := strings.Split(hc.Request.PostForm.Get("scope"), " ")
+	if !reflect.DeepEqual(scope, sc) {
+		t.Errorf("wrong scope, want=%v, got=%v", scope, sc)
+	}
+}
+
+func TestNewAuthenticatedRequest(t *testing.T) {
+	tests := []struct {
+		authMethod string
+		url        string
+		values     url.Values
+	}{
+		{
+			authMethod: AuthMethodClientSecretBasic,
+			url:        "http://example.com/token",
+			values:     url.Values{},
+		},
+		{
+			authMethod: AuthMethodClientSecretPost,
+			url:        "http://example.com/token",
+			values:     url.Values{},
+		},
+	}
+
+	for i, tt := range tests {
+		hc := &phttp.HandlerClient{}
+		cfg := Config{
+			Credentials: ClientCredentials{ID: "cid", Secret: "csecret"},
+			Scope:       []string{"foo-scope", "bar-scope"},
+			TokenURL:    "http://example.com/token",
+			AuthURL:     "http://example.com/auth",
+			RedirectURL: "http://example.com/redirect",
+			AuthMethod:  tt.authMethod,
+		}
+		c, err := NewClient(hc, cfg)
+		req, err := c.newAuthenticatedRequest(tt.url, tt.values)
+		if err != nil {
+			t.Errorf("case %d: unexpected error: %v", i, err)
+			continue
+		}
+		err = req.ParseForm()
+		if err != nil {
+			t.Errorf("case %d: want nil err, got %v", i, err)
+		}
+
+		if tt.authMethod == AuthMethodClientSecretBasic {
+			cid, secret, ok := phttp.BasicAuth(req)
+			if !ok {
+				t.Errorf("case %d: !ok parsing Basic Auth headers", i)
+				continue
+			}
+			if cid != cfg.Credentials.ID {
+				t.Errorf("case %d: want CID == %q, got CID == %q", i, cfg.Credentials.ID, cid)
+			}
+			if secret != cfg.Credentials.Secret {
+				t.Errorf("case %d: want secret == %q, got secret == %q", i, cfg.Credentials.Secret, secret)
+			}
+		} else if tt.authMethod == AuthMethodClientSecretPost {
+			if req.PostFormValue("client_secret") != cfg.Credentials.Secret {
+				t.Errorf("case %d: want client_secret == %q, got client_secret == %q",
+					i, cfg.Credentials.Secret, req.PostFormValue("client_secret"))
+			}
+		}
+
+		for k, v := range tt.values {
+			if !reflect.DeepEqual(v, req.PostForm[k]) {
+				t.Errorf("case %d: key:%q want==%q, got==%q", i, k, v, req.PostForm[k])
+			}
+		}
+
+		if req.URL.String() != tt.url {
+			t.Errorf("case %d: want URL==%q, got URL==%q", i, tt.url, req.URL.String())
+		}
+
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/client.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/client.go
new file mode 100644
index 00000000..85a7af21
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/client.go
@@ -0,0 +1,323 @@
+package oidc
+
+import (
+	"errors"
+	"fmt"
+	"net/http"
+	"net/url"
+	"sync"
+	"time"
+
+	phttp "github.com/coreos/go-oidc/http"
+	"github.com/coreos/go-oidc/jose"
+	"github.com/coreos/go-oidc/key"
+	"github.com/coreos/go-oidc/oauth2"
+)
+
+const (
+	// amount of time that must pass after the last key sync
+	// completes before another attempt may begin
+	keySyncWindow = 5 * time.Second
+)
+
+var (
+	DefaultScope = []string{"openid", "email", "profile"}
+
+	supportedAuthMethods = map[string]struct{}{
+		oauth2.AuthMethodClientSecretBasic: struct{}{},
+		oauth2.AuthMethodClientSecretPost:  struct{}{},
+	}
+)
+
+type ClientCredentials oauth2.ClientCredentials
+
+type ClientIdentity struct {
+	Credentials ClientCredentials
+	Metadata    ClientMetadata
+}
+
+type ClientMetadata struct {
+	RedirectURLs []url.URL
+}
+
+func (m *ClientMetadata) Valid() error {
+	if len(m.RedirectURLs) == 0 {
+		return errors.New("zero redirect URLs")
+	}
+
+	for _, u := range m.RedirectURLs {
+		if u.Scheme != "http" && u.Scheme != "https" {
+			return errors.New("invalid redirect URL: scheme not http/https")
+		} else if u.Host == "" {
+			return errors.New("invalid redirect URL: host empty")
+		}
+	}
+
+	return nil
+}
+
+type ClientConfig struct {
+	HTTPClient     phttp.Client
+	Credentials    ClientCredentials
+	Scope          []string
+	RedirectURL    string
+	ProviderConfig ProviderConfig
+	KeySet         key.PublicKeySet
+}
+
+func NewClient(cfg ClientConfig) (*Client, error) {
+	// Allow empty redirect URL in the case where the client
+	// only needs to verify a given token.
+	ru, err := url.Parse(cfg.RedirectURL)
+	if err != nil {
+		return nil, fmt.Errorf("invalid redirect URL: %v", err)
+	}
+
+	c := Client{
+		credentials:    cfg.Credentials,
+		httpClient:     cfg.HTTPClient,
+		scope:          cfg.Scope,
+		redirectURL:    ru.String(),
+		providerConfig: cfg.ProviderConfig,
+		keySet:         cfg.KeySet,
+	}
+
+	if c.httpClient == nil {
+		c.httpClient = http.DefaultClient
+	}
+
+	if c.scope == nil {
+		c.scope = make([]string, len(DefaultScope))
+		copy(c.scope, DefaultScope)
+	}
+
+	return &c, nil
+}
+
+type Client struct {
+	httpClient     phttp.Client
+	providerConfig ProviderConfig
+	credentials    ClientCredentials
+	redirectURL    string
+	scope          []string
+	keySet         key.PublicKeySet
+
+	keySetSyncMutex sync.RWMutex
+	lastKeySetSync  time.Time
+}
+
+func (c *Client) Healthy() error {
+	now := time.Now().UTC()
+
+	if c.providerConfig.Empty() {
+		return errors.New("oidc client provider config empty")
+	}
+
+	if !c.providerConfig.ExpiresAt.IsZero() && c.providerConfig.ExpiresAt.Before(now) {
+		return errors.New("oidc client provider config expired")
+	}
+
+	return nil
+}
+
+func (c *Client) OAuthClient() (*oauth2.Client, error) {
+	authMethod, err := c.chooseAuthMethod()
+	if err != nil {
+		return nil, err
+	}
+
+	ocfg := oauth2.Config{
+		Credentials: oauth2.ClientCredentials(c.credentials),
+		RedirectURL: c.redirectURL,
+		AuthURL:     c.providerConfig.AuthEndpoint,
+		TokenURL:    c.providerConfig.TokenEndpoint,
+		Scope:       c.scope,
+		AuthMethod:  authMethod,
+	}
+
+	return oauth2.NewClient(c.httpClient, ocfg)
+}
+
+func (c *Client) chooseAuthMethod() (string, error) {
+	if len(c.providerConfig.TokenEndpointAuthMethodsSupported) == 0 {
+		return oauth2.AuthMethodClientSecretBasic, nil
+	}
+
+	for _, authMethod := range c.providerConfig.TokenEndpointAuthMethodsSupported {
+		if _, ok := supportedAuthMethods[authMethod]; ok {
+			return authMethod, nil
+		}
+	}
+
+	return "", errors.New("no supported auth methods")
+}
+
+func (c *Client) SyncProviderConfig(discoveryURL string) chan struct{} {
+	rp := &providerConfigRepo{c}
+	r := NewHTTPProviderConfigGetter(c.httpClient, discoveryURL)
+	return NewProviderConfigSyncer(r, rp).Run()
+}
+
+func (c *Client) maybeSyncKeys() error {
+	tooSoon := func() bool {
+		return time.Now().UTC().Before(c.lastKeySetSync.Add(keySyncWindow))
+	}
+
+	// ignore request to sync keys if a sync operation has been
+	// attempted too recently
+	if tooSoon() {
+		return nil
+	}
+
+	c.keySetSyncMutex.Lock()
+	defer c.keySetSyncMutex.Unlock()
+
+	// check again, as another goroutine may have been holding
+	// the lock while updating the keys
+	if tooSoon() {
+		return nil
+	}
+
+	r := NewRemotePublicKeyRepo(c.httpClient, c.providerConfig.KeysEndpoint)
+	w := &clientKeyRepo{client: c}
+	_, err := key.Sync(r, w)
+	c.lastKeySetSync = time.Now().UTC()
+
+	return err
+}
+
+type providerConfigRepo struct {
+	client *Client
+}
+
+func (r *providerConfigRepo) Set(cfg ProviderConfig) error {
+	r.client.providerConfig = cfg
+	return nil
+}
+
+type clientKeyRepo struct {
+	client *Client
+}
+
+func (r *clientKeyRepo) Set(ks key.KeySet) error {
+	pks, ok := ks.(*key.PublicKeySet)
+	if !ok {
+		return errors.New("unable to cast to PublicKey")
+	}
+	r.client.keySet = *pks
+	return nil
+}
+
+func (c *Client) ClientCredsToken(scope []string) (jose.JWT, error) {
+	if !c.providerConfig.SupportsGrantType(oauth2.GrantTypeClientCreds) {
+		return jose.JWT{}, fmt.Errorf("%v grant type is not supported", oauth2.GrantTypeClientCreds)
+	}
+
+	oac, err := c.OAuthClient()
+	if err != nil {
+		return jose.JWT{}, err
+	}
+
+	t, err := oac.ClientCredsToken(scope)
+	if err != nil {
+		return jose.JWT{}, err
+	}
+
+	jwt, err := jose.ParseJWT(t.IDToken)
+	if err != nil {
+		return jose.JWT{}, err
+	}
+
+	return jwt, c.VerifyJWT(jwt)
+}
+
+// ExchangeAuthCode exchanges an OAuth2 auth code for an OIDC JWT ID token.
+func (c *Client) ExchangeAuthCode(code string) (jose.JWT, error) {
+	oac, err := c.OAuthClient()
+	if err != nil {
+		return jose.JWT{}, err
+	}
+
+	t, err := oac.RequestToken(oauth2.GrantTypeAuthCode, code)
+	if err != nil {
+		return jose.JWT{}, err
+	}
+
+	jwt, err := jose.ParseJWT(t.IDToken)
+	if err != nil {
+		return jose.JWT{}, err
+	}
+
+	return jwt, c.VerifyJWT(jwt)
+}
+
+// RefreshToken uses a refresh token to exchange for a new OIDC JWT ID Token.
+func (c *Client) RefreshToken(refreshToken string) (jose.JWT, error) {
+	oac, err := c.OAuthClient()
+	if err != nil {
+		return jose.JWT{}, err
+	}
+
+	t, err := oac.RequestToken(oauth2.GrantTypeRefreshToken, refreshToken)
+	if err != nil {
+		return jose.JWT{}, err
+	}
+
+	jwt, err := jose.ParseJWT(t.IDToken)
+	if err != nil {
+		return jose.JWT{}, err
+	}
+
+	return jwt, c.VerifyJWT(jwt)
+}
+
+func (c *Client) VerifyJWT(jwt jose.JWT) error {
+	var keysFunc func() []key.PublicKey
+	if kID, ok := jwt.KeyID(); ok {
+		keysFunc = c.keysFuncWithID(kID)
+	} else {
+		keysFunc = c.keysFuncAll()
+	}
+
+	v := NewJWTVerifier(
+		c.providerConfig.Issuer,
+		c.credentials.ID,
+		c.maybeSyncKeys, keysFunc)
+
+	return v.Verify(jwt)
+}
+
+// keysFuncWithID returns a function that retrieves at most unexpired
+// public key from the Client that matches the provided ID
+func (c *Client) keysFuncWithID(kID string) func() []key.PublicKey {
+	return func() []key.PublicKey {
+		c.keySetSyncMutex.RLock()
+		defer c.keySetSyncMutex.RUnlock()
+
+		if c.keySet.ExpiresAt().Before(time.Now()) {
+			return []key.PublicKey{}
+		}
+
+		k := c.keySet.Key(kID)
+		if k == nil {
+			return []key.PublicKey{}
+		}
+
+		return []key.PublicKey{*k}
+	}
+}
+
+// keysFuncAll returns a function that retrieves all unexpired public
+// keys from the Client
+func (c *Client) keysFuncAll() func() []key.PublicKey {
+	return func() []key.PublicKey {
+		c.keySetSyncMutex.RLock()
+		defer c.keySetSyncMutex.RUnlock()
+
+		if c.keySet.ExpiresAt().Before(time.Now()) {
+			return []key.PublicKey{}
+		}
+
+		return c.keySet.Keys()
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/client_test.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/client_test.go
new file mode 100644
index 00000000..e66688fc
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/client_test.go
@@ -0,0 +1,367 @@
+package oidc
+
+import (
+	"net/url"
+	"reflect"
+	"testing"
+	"time"
+
+	"github.com/coreos/go-oidc/jose"
+	"github.com/coreos/go-oidc/key"
+	"github.com/coreos/go-oidc/oauth2"
+)
+
+func TestNewClientScopeDefault(t *testing.T) {
+	tests := []struct {
+		c ClientConfig
+		e []string
+	}{
+		{
+			// No scope
+			c: ClientConfig{RedirectURL: "http://example.com/redirect"},
+			e: DefaultScope,
+		},
+		{
+			// Nil scope
+			c: ClientConfig{RedirectURL: "http://example.com/redirect", Scope: nil},
+			e: DefaultScope,
+		},
+		{
+			// Empty scope
+			c: ClientConfig{RedirectURL: "http://example.com/redirect", Scope: []string{}},
+			e: []string{},
+		},
+		{
+			// Custom scope equal to default
+			c: ClientConfig{RedirectURL: "http://example.com/redirect", Scope: []string{"openid", "email", "profile"}},
+			e: DefaultScope,
+		},
+		{
+			// Custom scope not including defaults
+			c: ClientConfig{RedirectURL: "http://example.com/redirect", Scope: []string{"foo", "bar"}},
+			e: []string{"foo", "bar"},
+		},
+		{
+			// Custom scopes overlapping with defaults
+			c: ClientConfig{RedirectURL: "http://example.com/redirect", Scope: []string{"openid", "foo"}},
+			e: []string{"openid", "foo"},
+		},
+	}
+
+	for i, tt := range tests {
+		c, err := NewClient(tt.c)
+		if err != nil {
+			t.Errorf("case %d: unexpected error from NewClient: %v", i, err)
+			continue
+		}
+		if !reflect.DeepEqual(tt.e, c.scope) {
+			t.Errorf("case %d: want: %v, got: %v", i, tt.e, c.scope)
+		}
+	}
+}
+
+func TestHealthy(t *testing.T) {
+	now := time.Now().UTC()
+
+	tests := []struct {
+		c *Client
+		h bool
+	}{
+		// all ok
+		{
+			c: &Client{
+				providerConfig: ProviderConfig{
+					Issuer:    "http://example.com",
+					ExpiresAt: now.Add(time.Hour),
+				},
+			},
+			h: true,
+		},
+		// zero-value ProviderConfig.ExpiresAt
+		{
+			c: &Client{
+				providerConfig: ProviderConfig{
+					Issuer: "http://example.com",
+				},
+			},
+			h: true,
+		},
+		// expired ProviderConfig
+		{
+			c: &Client{
+				providerConfig: ProviderConfig{
+					Issuer:    "http://example.com",
+					ExpiresAt: now.Add(time.Hour * -1),
+				},
+			},
+			h: false,
+		},
+		// empty ProviderConfig
+		{
+			c: &Client{},
+			h: false,
+		},
+	}
+
+	for i, tt := range tests {
+		err := tt.c.Healthy()
+		want := tt.h
+		got := (err == nil)
+
+		if want != got {
+			t.Errorf("case %d: want: healthy=%v, got: healhty=%v, err: %v", i, want, got, err)
+		}
+	}
+}
+
+func TestClientKeysFuncAll(t *testing.T) {
+	priv1, err := key.GeneratePrivateKey()
+	if err != nil {
+		t.Fatalf("failed to generate private key, error=%v", err)
+	}
+
+	priv2, err := key.GeneratePrivateKey()
+	if err != nil {
+		t.Fatalf("failed to generate private key, error=%v", err)
+	}
+
+	now := time.Now()
+	future := now.Add(time.Hour)
+	past := now.Add(-1 * time.Hour)
+
+	tests := []struct {
+		keySet *key.PublicKeySet
+		want   []key.PublicKey
+	}{
+		// two keys, non-expired set
+		{
+			keySet: key.NewPublicKeySet([]jose.JWK{priv2.JWK(), priv1.JWK()}, future),
+			want:   []key.PublicKey{*key.NewPublicKey(priv2.JWK()), *key.NewPublicKey(priv1.JWK())},
+		},
+
+		// no keys, non-expired set
+		{
+			keySet: key.NewPublicKeySet([]jose.JWK{}, future),
+			want:   []key.PublicKey{},
+		},
+
+		// two keys, expired set
+		{
+			keySet: key.NewPublicKeySet([]jose.JWK{priv2.JWK(), priv1.JWK()}, past),
+			want:   []key.PublicKey{},
+		},
+
+		// no keys, expired set
+		{
+			keySet: key.NewPublicKeySet([]jose.JWK{}, past),
+			want:   []key.PublicKey{},
+		},
+	}
+
+	for i, tt := range tests {
+		var c Client
+		c.keySet = *tt.keySet
+		keysFunc := c.keysFuncAll()
+		got := keysFunc()
+		if !reflect.DeepEqual(tt.want, got) {
+			t.Errorf("case %d: want=%#v got=%#v", i, tt.want, got)
+		}
+	}
+}
+
+func TestClientKeysFuncWithID(t *testing.T) {
+	priv1, err := key.GeneratePrivateKey()
+	if err != nil {
+		t.Fatalf("failed to generate private key, error=%v", err)
+	}
+
+	priv2, err := key.GeneratePrivateKey()
+	if err != nil {
+		t.Fatalf("failed to generate private key, error=%v", err)
+	}
+
+	now := time.Now()
+	future := now.Add(time.Hour)
+	past := now.Add(-1 * time.Hour)
+
+	tests := []struct {
+		keySet *key.PublicKeySet
+		argID  string
+		want   []key.PublicKey
+	}{
+		// two keys, match, non-expired set
+		{
+			keySet: key.NewPublicKeySet([]jose.JWK{priv2.JWK(), priv1.JWK()}, future),
+			argID:  priv2.ID(),
+			want:   []key.PublicKey{*key.NewPublicKey(priv2.JWK())},
+		},
+
+		// two keys, no match, non-expired set
+		{
+			keySet: key.NewPublicKeySet([]jose.JWK{priv2.JWK(), priv1.JWK()}, future),
+			argID:  "XXX",
+			want:   []key.PublicKey{},
+		},
+
+		// no keys, no match, non-expired set
+		{
+			keySet: key.NewPublicKeySet([]jose.JWK{}, future),
+			argID:  priv2.ID(),
+			want:   []key.PublicKey{},
+		},
+
+		// two keys, match, expired set
+		{
+			keySet: key.NewPublicKeySet([]jose.JWK{priv2.JWK(), priv1.JWK()}, past),
+			argID:  priv2.ID(),
+			want:   []key.PublicKey{},
+		},
+
+		// no keys, no match, expired set
+		{
+			keySet: key.NewPublicKeySet([]jose.JWK{}, past),
+			argID:  priv2.ID(),
+			want:   []key.PublicKey{},
+		},
+	}
+
+	for i, tt := range tests {
+		var c Client
+		c.keySet = *tt.keySet
+		keysFunc := c.keysFuncWithID(tt.argID)
+		got := keysFunc()
+		if !reflect.DeepEqual(tt.want, got) {
+			t.Errorf("case %d: want=%#v got=%#v", i, tt.want, got)
+		}
+	}
+}
+
+func TestClientMetadataValid(t *testing.T) {
+	tests := []ClientMetadata{
+		// one RedirectURL
+		ClientMetadata{
+			RedirectURLs: []url.URL{url.URL{Scheme: "http", Host: "example.com"}},
+		},
+
+		// one RedirectURL w/ nonempty path
+		ClientMetadata{
+			RedirectURLs: []url.URL{url.URL{Scheme: "http", Host: "example.com", Path: "/foo"}},
+		},
+
+		// two RedirectURLs
+		ClientMetadata{
+			RedirectURLs: []url.URL{
+				url.URL{Scheme: "http", Host: "foo.example.com"},
+				url.URL{Scheme: "http", Host: "bar.example.com"},
+			},
+		},
+	}
+
+	for i, tt := range tests {
+		if err := tt.Valid(); err != nil {
+			t.Errorf("case %d: unexpected error: %v", i, err)
+		}
+	}
+}
+
+func TestClientMetadataInvalid(t *testing.T) {
+	tests := []ClientMetadata{
+		// nil RedirectURls slice
+		ClientMetadata{
+			RedirectURLs: nil,
+		},
+
+		// empty RedirectURLs slice
+		ClientMetadata{
+			RedirectURLs: []url.URL{},
+		},
+
+		// empty url.URL
+		ClientMetadata{
+			RedirectURLs: []url.URL{url.URL{}},
+		},
+
+		// empty url.URL following OK item
+		ClientMetadata{
+			RedirectURLs: []url.URL{url.URL{Scheme: "http", Host: "example.com"}, url.URL{}},
+		},
+
+		// url.URL with empty Host
+		ClientMetadata{
+			RedirectURLs: []url.URL{url.URL{Scheme: "http", Host: ""}},
+		},
+
+		// url.URL with empty Scheme
+		ClientMetadata{
+			RedirectURLs: []url.URL{url.URL{Scheme: "", Host: "example.com"}},
+		},
+
+		// url.URL with non-HTTP(S) Scheme
+		ClientMetadata{
+			RedirectURLs: []url.URL{url.URL{Scheme: "tcp", Host: "127.0.0.1"}},
+		},
+	}
+
+	for i, tt := range tests {
+		if err := tt.Valid(); err == nil {
+			t.Errorf("case %d: expected non-nil error", i)
+		}
+	}
+}
+
+func TestChooseAuthMethod(t *testing.T) {
+	tests := []struct {
+		supported []string
+		chosen    string
+		err       bool
+	}{
+		{
+			supported: []string{},
+			chosen:    oauth2.AuthMethodClientSecretBasic,
+		},
+		{
+			supported: []string{oauth2.AuthMethodClientSecretBasic},
+			chosen:    oauth2.AuthMethodClientSecretBasic,
+		},
+		{
+			supported: []string{oauth2.AuthMethodClientSecretPost},
+			chosen:    oauth2.AuthMethodClientSecretPost,
+		},
+		{
+			supported: []string{oauth2.AuthMethodClientSecretPost, oauth2.AuthMethodClientSecretBasic},
+			chosen:    oauth2.AuthMethodClientSecretPost,
+		},
+		{
+			supported: []string{oauth2.AuthMethodClientSecretBasic, oauth2.AuthMethodClientSecretPost},
+			chosen:    oauth2.AuthMethodClientSecretBasic,
+		},
+		{
+			supported: []string{oauth2.AuthMethodClientSecretJWT, oauth2.AuthMethodClientSecretPost},
+			chosen:    oauth2.AuthMethodClientSecretPost,
+		},
+		{
+			supported: []string{oauth2.AuthMethodClientSecretJWT},
+			chosen:    "",
+			err:       true,
+		},
+	}
+
+	for i, tt := range tests {
+		client := Client{
+			providerConfig: ProviderConfig{
+				TokenEndpointAuthMethodsSupported: tt.supported,
+			},
+		}
+		got, err := client.chooseAuthMethod()
+		if tt.err {
+			if err == nil {
+				t.Errorf("case %d: expected non-nil err", i)
+			}
+			continue
+		}
+
+		if got != tt.chosen {
+			t.Errorf("case %d: want=%q, got=%q", i, tt.chosen, got)
+		}
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/identity.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/identity.go
new file mode 100644
index 00000000..9bfa8e34
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/identity.go
@@ -0,0 +1,44 @@
+package oidc
+
+import (
+	"errors"
+	"time"
+
+	"github.com/coreos/go-oidc/jose"
+)
+
+type Identity struct {
+	ID        string
+	Name      string
+	Email     string
+	ExpiresAt time.Time
+}
+
+func IdentityFromClaims(claims jose.Claims) (*Identity, error) {
+	if claims == nil {
+		return nil, errors.New("nil claim set")
+	}
+
+	var ident Identity
+	var err error
+	var ok bool
+
+	if ident.ID, ok, err = claims.StringClaim("sub"); err != nil {
+		return nil, err
+	} else if !ok {
+		return nil, errors.New("missing required claim: sub")
+	}
+
+	if ident.Email, _, err = claims.StringClaim("email"); err != nil {
+		return nil, err
+	}
+
+	exp, ok, err := claims.TimeClaim("exp")
+	if err != nil {
+		return nil, err
+	} else if ok {
+		ident.ExpiresAt = exp
+	}
+
+	return &ident, nil
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/identity_test.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/identity_test.go
new file mode 100644
index 00000000..d286c669
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/identity_test.go
@@ -0,0 +1,113 @@
+package oidc
+
+import (
+	"reflect"
+	"testing"
+	"time"
+
+	"github.com/coreos/go-oidc/jose"
+)
+
+func TestIdentityFromClaims(t *testing.T) {
+	tests := []struct {
+		claims jose.Claims
+		want   Identity
+	}{
+		{
+			claims: jose.Claims{
+				"sub":   "123850281",
+				"name":  "Elroy",
+				"email": "elroy@example.com",
+				"exp":   float64(1.416935146e+09),
+			},
+			want: Identity{
+				ID:        "123850281",
+				Name:      "",
+				Email:     "elroy@example.com",
+				ExpiresAt: time.Date(2014, time.November, 25, 17, 05, 46, 0, time.UTC),
+			},
+		},
+		{
+			claims: jose.Claims{
+				"sub":  "123850281",
+				"name": "Elroy",
+				"exp":  float64(1.416935146e+09),
+			},
+			want: Identity{
+				ID:        "123850281",
+				Name:      "",
+				Email:     "",
+				ExpiresAt: time.Date(2014, time.November, 25, 17, 05, 46, 0, time.UTC),
+			},
+		},
+		{
+			claims: jose.Claims{
+				"sub":   "123850281",
+				"name":  "Elroy",
+				"email": "elroy@example.com",
+				"exp":   int64(1416935146),
+			},
+			want: Identity{
+				ID:        "123850281",
+				Name:      "",
+				Email:     "elroy@example.com",
+				ExpiresAt: time.Date(2014, time.November, 25, 17, 05, 46, 0, time.UTC),
+			},
+		},
+		{
+			claims: jose.Claims{
+				"sub":   "123850281",
+				"name":  "Elroy",
+				"email": "elroy@example.com",
+			},
+			want: Identity{
+				ID:        "123850281",
+				Name:      "",
+				Email:     "elroy@example.com",
+				ExpiresAt: time.Time{},
+			},
+		},
+	}
+
+	for i, tt := range tests {
+		got, err := IdentityFromClaims(tt.claims)
+		if err != nil {
+			t.Errorf("case %d: unexpected error: %v", i, err)
+			continue
+		}
+		if !reflect.DeepEqual(tt.want, *got) {
+			t.Errorf("case %d: want=%#v got=%#v", i, tt.want, *got)
+		}
+	}
+}
+
+func TestIdentityFromClaimsFail(t *testing.T) {
+	tests := []jose.Claims{
+		// sub incorrect type
+		jose.Claims{
+			"sub":   123,
+			"name":  "foo",
+			"email": "elroy@example.com",
+		},
+		// email incorrect type
+		jose.Claims{
+			"sub":   "123850281",
+			"name":  "Elroy",
+			"email": false,
+		},
+		// exp incorrect type
+		jose.Claims{
+			"sub":   "123850281",
+			"name":  "Elroy",
+			"email": "elroy@example.com",
+			"exp":   "2014-11-25 18:05:46 +0000 UTC",
+		},
+	}
+
+	for i, tt := range tests {
+		_, err := IdentityFromClaims(tt)
+		if err == nil {
+			t.Errorf("case %d: expected non-nil error", i)
+		}
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/interface.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/interface.go
new file mode 100644
index 00000000..248cac0b
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/interface.go
@@ -0,0 +1,3 @@
+package oidc
+
+type LoginFunc func(ident Identity, sessionKey string) (redirectURL string, err error)
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/key.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/key.go
new file mode 100644
index 00000000..004310d4
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/key.go
@@ -0,0 +1,57 @@
+package oidc
+
+import (
+	"encoding/json"
+	"errors"
+	"net/http"
+	"time"
+
+	phttp "github.com/coreos/go-oidc/http"
+	"github.com/coreos/go-oidc/jose"
+	"github.com/coreos/go-oidc/key"
+)
+
+func NewRemotePublicKeyRepo(hc phttp.Client, ep string) *remotePublicKeyRepo {
+	return &remotePublicKeyRepo{hc: hc, ep: ep}
+}
+
+type remotePublicKeyRepo struct {
+	hc phttp.Client
+	ep string
+}
+
+func (r *remotePublicKeyRepo) Get() (key.KeySet, error) {
+	req, err := http.NewRequest("GET", r.ep, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	resp, err := r.hc.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+
+	var d struct {
+		Keys []jose.JWK `json:"keys"`
+	}
+	if err := json.NewDecoder(resp.Body).Decode(&d); err != nil {
+		return nil, err
+	}
+
+	if len(d.Keys) == 0 {
+		return nil, errors.New("zero keys in response")
+	}
+
+	ttl, ok, err := phttp.Cacheable(resp.Header)
+	if err != nil {
+		return nil, err
+	}
+	if !ok {
+		return nil, errors.New("HTTP cache headers not set")
+	}
+
+	exp := time.Now().UTC().Add(ttl)
+	ks := key.NewPublicKeySet(d.Keys, exp)
+	return ks, nil
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/provider.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/provider.go
new file mode 100644
index 00000000..bfdeef3f
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/provider.go
@@ -0,0 +1,259 @@
+package oidc
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"time"
+
+	"github.com/coreos/pkg/capnslog"
+	"github.com/coreos/pkg/timeutil"
+	"github.com/jonboulle/clockwork"
+
+	phttp "github.com/coreos/go-oidc/http"
+	"github.com/coreos/go-oidc/oauth2"
+)
+
+var (
+	log = capnslog.NewPackageLogger("github.com/coreos/go-oidc", "http")
+)
+
+const (
+	MaximumProviderConfigSyncInterval = 24 * time.Hour
+	MinimumProviderConfigSyncInterval = time.Minute
+
+	discoveryConfigPath = "/.well-known/openid-configuration"
+)
+
+type ProviderConfig struct {
+	Issuer                            string    `json:"issuer"`
+	AuthEndpoint                      string    `json:"authorization_endpoint"`
+	TokenEndpoint                     string    `json:"token_endpoint"`
+	KeysEndpoint                      string    `json:"jwks_uri"`
+	ResponseTypesSupported            []string  `json:"response_types_supported"`
+	GrantTypesSupported               []string  `json:"grant_types_supported"`
+	SubjectTypesSupported             []string  `json:"subject_types_supported"`
+	IDTokenAlgValuesSupported         []string  `json:"id_token_alg_values_supported"`
+	TokenEndpointAuthMethodsSupported []string  `json:"token_endpoint_auth_methods_supported"`
+	ExpiresAt                         time.Time `json:"-"`
+}
+
+func (p ProviderConfig) Empty() bool {
+	return p.Issuer == ""
+}
+
+func (p ProviderConfig) SupportsGrantType(grantType string) bool {
+	var supported []string
+	if len(p.GrantTypesSupported) == 0 {
+		// If omitted, the default value is ["authorization_code", "implicit"].
+		// http://openid.net/specs/openid-connect-discovery-1_0.html#ProviderMetadata
+		supported = []string{oauth2.GrantTypeAuthCode, oauth2.GrantTypeImplicit}
+	} else {
+		supported = p.GrantTypesSupported
+	}
+
+	for _, t := range supported {
+		if t == grantType {
+			return true
+		}
+	}
+	return false
+}
+
+type ProviderConfigGetter interface {
+	Get() (ProviderConfig, error)
+}
+
+type ProviderConfigSetter interface {
+	Set(ProviderConfig) error
+}
+
+type ProviderConfigSyncer struct {
+	from  ProviderConfigGetter
+	to    ProviderConfigSetter
+	clock clockwork.Clock
+}
+
+func NewProviderConfigSyncer(from ProviderConfigGetter, to ProviderConfigSetter) *ProviderConfigSyncer {
+	return &ProviderConfigSyncer{
+		from:  from,
+		to:    to,
+		clock: clockwork.NewRealClock(),
+	}
+}
+
+func (s *ProviderConfigSyncer) Run() chan struct{} {
+	stop := make(chan struct{})
+
+	var next pcsStepper
+	next = &pcsStepNext{aft: time.Duration(0)}
+
+	go func() {
+		for {
+			select {
+			case <-s.clock.After(next.after()):
+				next = next.step(s.sync)
+			case <-stop:
+				return
+			}
+		}
+	}()
+
+	return stop
+}
+
+func (s *ProviderConfigSyncer) sync() (time.Duration, error) {
+	cfg, err := s.from.Get()
+	if err != nil {
+		return 0, err
+	}
+
+	if err = s.to.Set(cfg); err != nil {
+		return 0, fmt.Errorf("error setting provider config: %v", err)
+	}
+
+	log.Infof("Updating provider config: config=%#v", cfg)
+
+	return nextSyncAfter(cfg.ExpiresAt, s.clock), nil
+}
+
+type pcsStepFunc func() (time.Duration, error)
+
+type pcsStepper interface {
+	after() time.Duration
+	step(pcsStepFunc) pcsStepper
+}
+
+type pcsStepNext struct {
+	aft time.Duration
+}
+
+func (n *pcsStepNext) after() time.Duration {
+	return n.aft
+}
+
+func (n *pcsStepNext) step(fn pcsStepFunc) (next pcsStepper) {
+	ttl, err := fn()
+	if err == nil {
+		next = &pcsStepNext{aft: ttl}
+		log.Debugf("Synced provider config, next attempt in %v", next.after())
+	} else {
+		next = &pcsStepRetry{aft: time.Second}
+		log.Errorf("Provider config sync failed, retrying in %v: %v", next.after(), err)
+	}
+	return
+}
+
+type pcsStepRetry struct {
+	aft time.Duration
+}
+
+func (r *pcsStepRetry) after() time.Duration {
+	return r.aft
+}
+
+func (r *pcsStepRetry) step(fn pcsStepFunc) (next pcsStepper) {
+	ttl, err := fn()
+	if err == nil {
+		next = &pcsStepNext{aft: ttl}
+		log.Infof("Provider config sync no longer failing")
+	} else {
+		next = &pcsStepRetry{aft: timeutil.ExpBackoff(r.aft, time.Minute)}
+		log.Errorf("Provider config sync still failing, retrying in %v: %v", next.after(), err)
+	}
+	return
+}
+
+func nextSyncAfter(exp time.Time, clock clockwork.Clock) time.Duration {
+	if exp.IsZero() {
+		return MaximumProviderConfigSyncInterval
+	}
+
+	t := exp.Sub(clock.Now()) / 2
+	if t > MaximumProviderConfigSyncInterval {
+		t = MaximumProviderConfigSyncInterval
+	} else if t < MinimumProviderConfigSyncInterval {
+		t = MinimumProviderConfigSyncInterval
+	}
+
+	return t
+}
+
+type httpProviderConfigGetter struct {
+	hc        phttp.Client
+	issuerURL string
+	clock     clockwork.Clock
+}
+
+func NewHTTPProviderConfigGetter(hc phttp.Client, issuerURL string) *httpProviderConfigGetter {
+	return &httpProviderConfigGetter{
+		hc:        hc,
+		issuerURL: issuerURL,
+		clock:     clockwork.NewRealClock(),
+	}
+}
+
+func (r *httpProviderConfigGetter) Get() (cfg ProviderConfig, err error) {
+	req, err := http.NewRequest("GET", r.issuerURL+discoveryConfigPath, nil)
+	if err != nil {
+		return
+	}
+
+	resp, err := r.hc.Do(req)
+	if err != nil {
+		return
+	}
+	defer resp.Body.Close()
+
+	if err = json.NewDecoder(resp.Body).Decode(&cfg); err != nil {
+		return
+	}
+
+	var ttl time.Duration
+	var ok bool
+	ttl, ok, err = phttp.Cacheable(resp.Header)
+	if err != nil {
+		return
+	} else if ok {
+		cfg.ExpiresAt = r.clock.Now().UTC().Add(ttl)
+	}
+
+	// The issuer value returned MUST be identical to the Issuer URL that was directly used to retrieve the configuration information.
+	// http://openid.net/specs/openid-connect-discovery-1_0.html#ProviderConfigurationValidation
+	if !urlEqual(cfg.Issuer, r.issuerURL) {
+		err = fmt.Errorf(`"issuer" in config (%v) does not match provided issuer URL (%v)`, cfg.Issuer, r.issuerURL)
+		return
+	}
+
+	return
+}
+
+func FetchProviderConfig(hc phttp.Client, issuerURL string) (ProviderConfig, error) {
+	if hc == nil {
+		hc = http.DefaultClient
+	}
+
+	g := NewHTTPProviderConfigGetter(hc, issuerURL)
+	return g.Get()
+}
+
+func WaitForProviderConfig(hc phttp.Client, issuerURL string) (pcfg ProviderConfig) {
+	return waitForProviderConfig(hc, issuerURL, clockwork.NewRealClock())
+}
+
+func waitForProviderConfig(hc phttp.Client, issuerURL string, clock clockwork.Clock) (pcfg ProviderConfig) {
+	var sleep time.Duration
+	var err error
+	for {
+		pcfg, err = FetchProviderConfig(hc, issuerURL)
+		if err == nil {
+			break
+		}
+
+		sleep = timeutil.ExpBackoff(sleep, time.Minute)
+		fmt.Printf("Failed fetching provider config, trying again in %v: %v\n", sleep, err)
+		time.Sleep(sleep)
+	}
+
+	return
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/provider_test.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/provider_test.go
new file mode 100644
index 00000000..83f139ef
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/provider_test.go
@@ -0,0 +1,466 @@
+package oidc
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"reflect"
+	"testing"
+	"time"
+
+	"github.com/jonboulle/clockwork"
+
+	phttp "github.com/coreos/go-oidc/http"
+	"github.com/coreos/go-oidc/oauth2"
+)
+
+type fakeProviderConfigGetterSetter struct {
+	cfg      *ProviderConfig
+	getCount int
+	setCount int
+}
+
+func (g *fakeProviderConfigGetterSetter) Get() (ProviderConfig, error) {
+	g.getCount++
+	return *g.cfg, nil
+}
+
+func (g *fakeProviderConfigGetterSetter) Set(cfg ProviderConfig) error {
+	g.cfg = &cfg
+	g.setCount++
+	return nil
+}
+
+type fakeProviderConfigHandler struct {
+	cfg    ProviderConfig
+	maxAge time.Duration
+}
+
+func (s *fakeProviderConfigHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	b, _ := json.Marshal(s.cfg)
+	if s.maxAge.Seconds() >= 0 {
+		w.Header().Set("Cache-Control", fmt.Sprintf("public, max-age=%d", int(s.maxAge.Seconds())))
+	}
+	w.Header().Set("Content-Type", "application/json")
+	w.Write(b)
+}
+
+func TestHTTPProviderConfigGetter(t *testing.T) {
+	svr := &fakeProviderConfigHandler{}
+	hc := &phttp.HandlerClient{Handler: svr}
+	fc := clockwork.NewFakeClock()
+	now := fc.Now().UTC()
+
+	tests := []struct {
+		dsc string
+		age time.Duration
+		cfg ProviderConfig
+		ok  bool
+	}{
+		// everything is good
+		{
+			dsc: "https://example.com",
+			age: time.Minute,
+			cfg: ProviderConfig{
+				Issuer:    "https://example.com",
+				ExpiresAt: now.Add(time.Minute),
+			},
+			ok: true,
+		},
+		// iss and disco url differ by scheme only (how google works)
+		{
+			dsc: "https://example.com",
+			age: time.Minute,
+			cfg: ProviderConfig{
+				Issuer:    "example.com",
+				ExpiresAt: now.Add(time.Minute),
+			},
+			ok: true,
+		},
+		// issuer and discovery URL mismatch
+		{
+			dsc: "https://foo.com",
+			age: time.Minute,
+			cfg: ProviderConfig{
+				Issuer:    "https://example.com",
+				ExpiresAt: now.Add(time.Minute),
+			},
+			ok: false,
+		},
+		// missing cache header results in zero ExpiresAt
+		{
+			dsc: "https://example.com",
+			age: -1,
+			cfg: ProviderConfig{
+				Issuer: "https://example.com",
+			},
+			ok: true,
+		},
+	}
+
+	for i, tt := range tests {
+		svr.cfg = tt.cfg
+		svr.maxAge = tt.age
+		getter := NewHTTPProviderConfigGetter(hc, tt.dsc)
+		getter.clock = fc
+
+		got, err := getter.Get()
+		if err != nil {
+			if tt.ok {
+				t.Fatalf("test %d: unexpected error: %v", i, err)
+			}
+			continue
+		}
+
+		if !tt.ok {
+			t.Fatalf("test %d: expected error", i)
+			continue
+		}
+
+		if !reflect.DeepEqual(tt.cfg, got) {
+			t.Fatalf("test %d: want: %#v, got: %#v", i, tt.cfg, got)
+		}
+	}
+}
+
+func TestProviderConfigSyncerRun(t *testing.T) {
+	c1 := &ProviderConfig{
+		Issuer: "http://first.example.com",
+	}
+	c2 := &ProviderConfig{
+		Issuer: "http://second.example.com",
+	}
+
+	tests := []struct {
+		first     *ProviderConfig
+		advance   time.Duration
+		second    *ProviderConfig
+		firstExp  time.Duration
+		secondExp time.Duration
+		count     int
+	}{
+		// exp is 10m, should have same config after 1s
+		{
+			first:     c1,
+			firstExp:  time.Duration(10 * time.Minute),
+			advance:   time.Minute,
+			second:    c1,
+			secondExp: time.Duration(10 * time.Minute),
+			count:     1,
+		},
+		// exp is 10m, should have new config after 10/2 = 5m
+		{
+			first:     c1,
+			firstExp:  time.Duration(10 * time.Minute),
+			advance:   time.Duration(5 * time.Minute),
+			second:    c2,
+			secondExp: time.Duration(10 * time.Minute),
+			count:     2,
+		},
+		// exp is 20m, should have new config after 20/2 = 10m
+		{
+			first:     c1,
+			firstExp:  time.Duration(20 * time.Minute),
+			advance:   time.Duration(10 * time.Minute),
+			second:    c2,
+			secondExp: time.Duration(30 * time.Minute),
+			count:     2,
+		},
+	}
+
+	assertCfg := func(i int, to *fakeProviderConfigGetterSetter, want ProviderConfig) {
+		got, err := to.Get()
+		if err != nil {
+			t.Fatalf("test %d: unable to get config: %v", i, err)
+		}
+		if !reflect.DeepEqual(want, got) {
+			t.Fatalf("test %d: incorrect state:\nwant=%#v\ngot=%#v", i, want, got)
+		}
+	}
+
+	for i, tt := range tests {
+		from := &fakeProviderConfigGetterSetter{}
+		to := &fakeProviderConfigGetterSetter{}
+
+		fc := clockwork.NewFakeClock()
+		now := fc.Now().UTC()
+		syncer := NewProviderConfigSyncer(from, to)
+		syncer.clock = fc
+
+		tt.first.ExpiresAt = now.Add(tt.firstExp)
+		tt.second.ExpiresAt = now.Add(tt.secondExp)
+		if err := from.Set(*tt.first); err != nil {
+			t.Fatalf("test %d: unexpected error: %v", i, err)
+		}
+
+		stop := syncer.Run()
+		defer close(stop)
+		fc.BlockUntil(1)
+
+		// first sync
+		assertCfg(i, to, *tt.first)
+
+		if err := from.Set(*tt.second); err != nil {
+			t.Fatalf("test %d: unexpected error: %v", i, err)
+		}
+
+		fc.Advance(tt.advance)
+		fc.BlockUntil(1)
+
+		// second sync
+		assertCfg(i, to, *tt.second)
+
+		if tt.count != from.getCount {
+			t.Fatalf("test %d: want: %v, got: %v", i, tt.count, from.getCount)
+		}
+	}
+}
+
+type staticProviderConfigGetter struct {
+	cfg ProviderConfig
+	err error
+}
+
+func (g *staticProviderConfigGetter) Get() (ProviderConfig, error) {
+	return g.cfg, g.err
+}
+
+type staticProviderConfigSetter struct {
+	cfg *ProviderConfig
+	err error
+}
+
+func (s *staticProviderConfigSetter) Set(cfg ProviderConfig) error {
+	s.cfg = &cfg
+	return s.err
+}
+
+func TestProviderConfigSyncerSyncFailure(t *testing.T) {
+	fc := clockwork.NewFakeClock()
+
+	tests := []struct {
+		from *staticProviderConfigGetter
+		to   *staticProviderConfigSetter
+
+		// want indicates what ProviderConfig should be passed to Set.
+		// If nil, the Set should not be called.
+		want *ProviderConfig
+	}{
+		// generic Get failure
+		{
+			from: &staticProviderConfigGetter{err: errors.New("fail")},
+			to:   &staticProviderConfigSetter{},
+			want: nil,
+		},
+		// generic Set failure
+		{
+			from: &staticProviderConfigGetter{cfg: ProviderConfig{ExpiresAt: fc.Now().Add(time.Minute)}},
+			to:   &staticProviderConfigSetter{err: errors.New("fail")},
+			want: &ProviderConfig{ExpiresAt: fc.Now().Add(time.Minute)},
+		},
+	}
+
+	for i, tt := range tests {
+		pcs := &ProviderConfigSyncer{
+			from:  tt.from,
+			to:    tt.to,
+			clock: fc,
+		}
+		_, err := pcs.sync()
+		if err == nil {
+			t.Errorf("case %d: expected non-nil error", i)
+		}
+		if !reflect.DeepEqual(tt.want, tt.to.cfg) {
+			t.Errorf("case %d: Set mismatch: want=%#v got=%#v", i, tt.want, tt.to.cfg)
+		}
+	}
+}
+
+func TestNextSyncAfter(t *testing.T) {
+	fc := clockwork.NewFakeClock()
+
+	tests := []struct {
+		exp  time.Time
+		want time.Duration
+	}{
+		{
+			exp:  fc.Now().Add(time.Hour),
+			want: 30 * time.Minute,
+		},
+		// override large values with the maximum
+		{
+			exp:  fc.Now().Add(168 * time.Hour), // one week
+			want: 24 * time.Hour,
+		},
+		// override "now" values with the minimum
+		{
+			exp:  fc.Now(),
+			want: time.Minute,
+		},
+		// override negative values with the minimum
+		{
+			exp:  fc.Now().Add(-1 * time.Minute),
+			want: time.Minute,
+		},
+		// zero-value Time results in maximum sync interval
+		{
+			exp:  time.Time{},
+			want: 24 * time.Hour,
+		},
+	}
+
+	for i, tt := range tests {
+		got := nextSyncAfter(tt.exp, fc)
+		if tt.want != got {
+			t.Errorf("case %d: want=%v got=%v", i, tt.want, got)
+		}
+	}
+}
+
+func TestProviderConfigEmpty(t *testing.T) {
+	cfg := ProviderConfig{}
+	if !cfg.Empty() {
+		t.Fatalf("Empty provider config reports non-empty")
+	}
+	cfg = ProviderConfig{Issuer: "http://example.com"}
+	if cfg.Empty() {
+		t.Fatalf("Non-empty provider config reports empty")
+	}
+}
+
+func TestPCSStepAfter(t *testing.T) {
+	pass := func() (time.Duration, error) { return 7 * time.Second, nil }
+	fail := func() (time.Duration, error) { return 0, errors.New("fail") }
+
+	tests := []struct {
+		stepper  pcsStepper
+		stepFunc pcsStepFunc
+		want     pcsStepper
+	}{
+		// good step results in retry at TTL
+		{
+			stepper:  &pcsStepNext{},
+			stepFunc: pass,
+			want:     &pcsStepNext{aft: 7 * time.Second},
+		},
+
+		// good step after failed step results results in retry at TTL
+		{
+			stepper:  &pcsStepRetry{aft: 2 * time.Second},
+			stepFunc: pass,
+			want:     &pcsStepNext{aft: 7 * time.Second},
+		},
+
+		// failed step results in a retry in 1s
+		{
+			stepper:  &pcsStepNext{},
+			stepFunc: fail,
+			want:     &pcsStepRetry{aft: time.Second},
+		},
+
+		// failed retry backs off by a factor of 2
+		{
+			stepper:  &pcsStepRetry{aft: time.Second},
+			stepFunc: fail,
+			want:     &pcsStepRetry{aft: 2 * time.Second},
+		},
+
+		// failed retry backs off by a factor of 2, up to 1m
+		{
+			stepper:  &pcsStepRetry{aft: 32 * time.Second},
+			stepFunc: fail,
+			want:     &pcsStepRetry{aft: 60 * time.Second},
+		},
+	}
+
+	for i, tt := range tests {
+		got := tt.stepper.step(tt.stepFunc)
+		if !reflect.DeepEqual(tt.want, got) {
+			t.Errorf("case %d: want=%#v got=%#v", i, tt.want, got)
+		}
+	}
+}
+
+func TestProviderConfigSupportsGrantType(t *testing.T) {
+	tests := []struct {
+		types []string
+		typ   string
+		want  bool
+	}{
+		// explicitly supported
+		{
+			types: []string{"foo_type"},
+			typ:   "foo_type",
+			want:  true,
+		},
+
+		// explicitly unsupported
+		{
+			types: []string{"bar_type"},
+			typ:   "foo_type",
+			want:  false,
+		},
+
+		// default type explicitly unsupported
+		{
+			types: []string{oauth2.GrantTypeImplicit},
+			typ:   oauth2.GrantTypeAuthCode,
+			want:  false,
+		},
+
+		// type not found in default set
+		{
+			types: []string{},
+			typ:   "foo_type",
+			want:  false,
+		},
+
+		// type found in default set
+		{
+			types: []string{},
+			typ:   oauth2.GrantTypeAuthCode,
+			want:  true,
+		},
+	}
+
+	for i, tt := range tests {
+		cfg := ProviderConfig{
+			GrantTypesSupported: tt.types,
+		}
+		got := cfg.SupportsGrantType(tt.typ)
+		if tt.want != got {
+			t.Errorf("case %d: assert %v supports %v: want=%t got=%t", i, tt.types, tt.typ, tt.want, got)
+		}
+	}
+}
+
+func TestWaitForProviderConfigImmediateSuccess(t *testing.T) {
+	cfg := ProviderConfig{Issuer: "http://example.com"}
+	b, err := json.Marshal(cfg)
+	if err != nil {
+		t.Fatalf("Failed marshaling provider config")
+	}
+
+	resp := http.Response{Body: ioutil.NopCloser(bytes.NewBuffer(b))}
+	hc := &phttp.RequestRecorder{Response: &resp}
+	fc := clockwork.NewFakeClock()
+
+	reschan := make(chan ProviderConfig)
+	go func() {
+		reschan <- waitForProviderConfig(hc, cfg.Issuer, fc)
+	}()
+
+	var got ProviderConfig
+	select {
+	case got = <-reschan:
+	case <-time.After(time.Second):
+		t.Fatalf("Did not receive result within 1s")
+	}
+
+	if !reflect.DeepEqual(cfg, got) {
+		t.Fatalf("Received incorrect provider config: want=%#v got=%#v", cfg, got)
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/transport.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/transport.go
new file mode 100644
index 00000000..93ff9e1f
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/transport.go
@@ -0,0 +1,79 @@
+package oidc
+
+import (
+	"fmt"
+	"net/http"
+	"sync"
+
+	phttp "github.com/coreos/go-oidc/http"
+	"github.com/coreos/go-oidc/jose"
+)
+
+type TokenRefresher interface {
+	// Verify checks if the provided token is currently valid or not.
+	Verify(jose.JWT) error
+
+	// Refresh attempts to authenticate and retrieve a new token.
+	Refresh() (jose.JWT, error)
+}
+
+type ClientCredsTokenRefresher struct {
+	Issuer     string
+	OIDCClient *Client
+}
+
+func (c *ClientCredsTokenRefresher) Verify(jwt jose.JWT) (err error) {
+	_, err = VerifyClientClaims(jwt, c.Issuer)
+	return
+}
+
+func (c *ClientCredsTokenRefresher) Refresh() (jwt jose.JWT, err error) {
+	if err = c.OIDCClient.Healthy(); err != nil {
+		err = fmt.Errorf("unable to authenticate, unhealthy OIDC client: %v", err)
+		return
+	}
+
+	jwt, err = c.OIDCClient.ClientCredsToken([]string{"openid"})
+	if err != nil {
+		err = fmt.Errorf("unable to verify auth code with issuer: %v", err)
+		return
+	}
+
+	return
+}
+
+type AuthenticatedTransport struct {
+	TokenRefresher
+	http.RoundTripper
+
+	mu  sync.Mutex
+	jwt jose.JWT
+}
+
+func (t *AuthenticatedTransport) verifiedJWT() (jose.JWT, error) {
+	t.mu.Lock()
+	defer t.mu.Unlock()
+
+	if t.TokenRefresher.Verify(t.jwt) == nil {
+		return t.jwt, nil
+	}
+
+	jwt, err := t.TokenRefresher.Refresh()
+	if err != nil {
+		return jose.JWT{}, fmt.Errorf("unable to acquire valid JWT: %v", err)
+	}
+
+	t.jwt = jwt
+	return t.jwt, nil
+}
+
+func (t *AuthenticatedTransport) RoundTrip(r *http.Request) (*http.Response, error) {
+	jwt, err := t.verifiedJWT()
+	if err != nil {
+		return nil, err
+	}
+
+	req := phttp.CopyRequest(r)
+	req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", jwt.Encode()))
+	return t.RoundTripper.RoundTrip(req)
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/transport_test.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/transport_test.go
new file mode 100644
index 00000000..9d5c7eee
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/transport_test.go
@@ -0,0 +1,167 @@
+package oidc
+
+import (
+	"errors"
+	"net/http"
+	"reflect"
+	"testing"
+
+	phttp "github.com/coreos/go-oidc/http"
+	"github.com/coreos/go-oidc/jose"
+)
+
+type staticTokenRefresher struct {
+	verify  func(jose.JWT) error
+	refresh func() (jose.JWT, error)
+}
+
+func (s *staticTokenRefresher) Verify(jwt jose.JWT) error {
+	return s.verify(jwt)
+}
+
+func (s *staticTokenRefresher) Refresh() (jose.JWT, error) {
+	return s.refresh()
+}
+
+func TestAuthenticatedTransportVerifiedJWT(t *testing.T) {
+	tests := []struct {
+		refresher TokenRefresher
+		startJWT  jose.JWT
+		wantJWT   jose.JWT
+		wantError error
+	}{
+		// verification succeeds, so refresh is not called
+		{
+			refresher: &staticTokenRefresher{
+				verify:  func(jose.JWT) error { return nil },
+				refresh: func() (jose.JWT, error) { return jose.JWT{RawPayload: "2"}, nil },
+			},
+			startJWT: jose.JWT{RawPayload: "1"},
+			wantJWT:  jose.JWT{RawPayload: "1"},
+		},
+
+		// verification fails, refresh succeeds so cached JWT changes
+		{
+			refresher: &staticTokenRefresher{
+				verify:  func(jose.JWT) error { return errors.New("fail!") },
+				refresh: func() (jose.JWT, error) { return jose.JWT{RawPayload: "2"}, nil },
+			},
+			startJWT: jose.JWT{RawPayload: "1"},
+			wantJWT:  jose.JWT{RawPayload: "2"},
+		},
+
+		// verification succeeds, so failing refresh isn't attempted
+		{
+			refresher: &staticTokenRefresher{
+				verify:  func(jose.JWT) error { return nil },
+				refresh: func() (jose.JWT, error) { return jose.JWT{}, errors.New("fail!") },
+			},
+			startJWT: jose.JWT{RawPayload: "1"},
+			wantJWT:  jose.JWT{RawPayload: "1"},
+		},
+
+		// verification fails, but refresh fails, too
+		{
+			refresher: &staticTokenRefresher{
+				verify:  func(jose.JWT) error { return errors.New("fail!") },
+				refresh: func() (jose.JWT, error) { return jose.JWT{}, errors.New("fail!") },
+			},
+			startJWT:  jose.JWT{RawPayload: "1"},
+			wantJWT:   jose.JWT{},
+			wantError: errors.New("unable to acquire valid JWT: fail!"),
+		},
+	}
+
+	for i, tt := range tests {
+		at := &AuthenticatedTransport{
+			TokenRefresher: tt.refresher,
+			jwt:            tt.startJWT,
+		}
+
+		gotJWT, err := at.verifiedJWT()
+		if !reflect.DeepEqual(tt.wantError, err) {
+			t.Errorf("#%d: unexpected error: want=%#v got=%#v", i, tt.wantError, err)
+		}
+		if !reflect.DeepEqual(tt.wantJWT, gotJWT) {
+			t.Errorf("#%d: incorrect JWT returned from verifiedJWT: want=%#v got=%#v", i, tt.wantJWT, gotJWT)
+		}
+	}
+}
+
+func TestAuthenticatedTransportJWTCaching(t *testing.T) {
+	at := &AuthenticatedTransport{
+		TokenRefresher: &staticTokenRefresher{
+			verify:  func(jose.JWT) error { return errors.New("fail!") },
+			refresh: func() (jose.JWT, error) { return jose.JWT{RawPayload: "2"}, nil },
+		},
+		jwt: jose.JWT{RawPayload: "1"},
+	}
+
+	wantJWT := jose.JWT{RawPayload: "2"}
+	gotJWT, err := at.verifiedJWT()
+	if err != nil {
+		t.Fatalf("got non-nil error: %#v", err)
+	}
+	if !reflect.DeepEqual(wantJWT, gotJWT) {
+		t.Fatalf("incorrect JWT returned from verifiedJWT: want=%#v got=%#v", wantJWT, gotJWT)
+	}
+
+	at.TokenRefresher = &staticTokenRefresher{
+		verify:  func(jose.JWT) error { return nil },
+		refresh: func() (jose.JWT, error) { return jose.JWT{RawPayload: "3"}, nil },
+	}
+
+	// the previous JWT should still be cached on the AuthenticatedTransport since
+	// it is still valid, even though there's a new token ready to refresh
+	gotJWT, err = at.verifiedJWT()
+	if err != nil {
+		t.Fatalf("got non-nil error: %#v", err)
+	}
+	if !reflect.DeepEqual(wantJWT, gotJWT) {
+		t.Fatalf("incorrect JWT returned from verifiedJWT: want=%#v got=%#v", wantJWT, gotJWT)
+	}
+}
+
+func TestAuthenticatedTransportRoundTrip(t *testing.T) {
+	rr := &phttp.RequestRecorder{Response: &http.Response{StatusCode: http.StatusOK}}
+	at := &AuthenticatedTransport{
+		TokenRefresher: &staticTokenRefresher{
+			verify: func(jose.JWT) error { return nil },
+		},
+		RoundTripper: rr,
+		jwt:          jose.JWT{RawPayload: "1"},
+	}
+
+	req := http.Request{}
+	_, err := at.RoundTrip(&req)
+	if err != nil {
+		t.Errorf("unexpected error: %v", err)
+	}
+
+	if !reflect.DeepEqual(req, http.Request{}) {
+		t.Errorf("http.Request object was modified")
+	}
+
+	want := []string{"Bearer .1."}
+	got := rr.Request.Header["Authorization"]
+	if !reflect.DeepEqual(want, got) {
+		t.Errorf("incorrect Authorization header: want=%#v got=%#v", want, got)
+	}
+}
+
+func TestAuthenticatedTransportRoundTripRefreshFail(t *testing.T) {
+	rr := &phttp.RequestRecorder{Response: &http.Response{StatusCode: http.StatusOK}}
+	at := &AuthenticatedTransport{
+		TokenRefresher: &staticTokenRefresher{
+			verify:  func(jose.JWT) error { return errors.New("fail!") },
+			refresh: func() (jose.JWT, error) { return jose.JWT{}, errors.New("fail!") },
+		},
+		RoundTripper: rr,
+		jwt:          jose.JWT{RawPayload: "1"},
+	}
+
+	_, err := at.RoundTrip(&http.Request{})
+	if err == nil {
+		t.Errorf("expected non-nil error")
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/util.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/util.go
new file mode 100644
index 00000000..3bea8956
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/util.go
@@ -0,0 +1,109 @@
+package oidc
+
+import (
+	"crypto/rand"
+	"encoding/base64"
+	"errors"
+	"fmt"
+	"net"
+	"net/http"
+	"net/url"
+	"strings"
+	"time"
+
+	"github.com/coreos/go-oidc/jose"
+)
+
+// RequestTokenExtractor funcs extract a raw encoded token from a request.
+type RequestTokenExtractor func(r *http.Request) (string, error)
+
+// ExtractBearerToken is a RequestTokenExtractor which extracts a bearer token from a request's
+// Authorization header.
+func ExtractBearerToken(r *http.Request) (string, error) {
+	ah := r.Header.Get("Authorization")
+	if ah == "" {
+		return "", errors.New("missing Authorization header")
+	}
+
+	if len(ah) <= 6 || strings.ToUpper(ah[0:6]) != "BEARER" {
+		return "", errors.New("should be a bearer token")
+	}
+
+	val := ah[7:]
+	if len(val) == 0 {
+		return "", errors.New("bearer token is empty")
+	}
+
+	return val, nil
+}
+
+// CookieTokenExtractor returns a RequestTokenExtractor which extracts a token from the named cookie in a request.
+func CookieTokenExtractor(cookieName string) RequestTokenExtractor {
+	return func(r *http.Request) (string, error) {
+		ck, err := r.Cookie(cookieName)
+		if err != nil {
+			return "", fmt.Errorf("token cookie not found in request: %v", err)
+		}
+
+		if ck.Value == "" {
+			return "", errors.New("token cookie found but is empty")
+		}
+
+		return ck.Value, nil
+	}
+}
+
+func NewClaims(iss, sub, aud string, iat, exp time.Time) jose.Claims {
+	return jose.Claims{
+		// required
+		"iss": iss,
+		"sub": sub,
+		"aud": aud,
+		"iat": float64(iat.Unix()),
+		"exp": float64(exp.Unix()),
+	}
+}
+
+func GenClientID(hostport string) (string, error) {
+	b, err := randBytes(32)
+	if err != nil {
+		return "", err
+	}
+
+	var host string
+	if strings.Contains(hostport, ":") {
+		host, _, err = net.SplitHostPort(hostport)
+		if err != nil {
+			return "", err
+		}
+	} else {
+		host = hostport
+	}
+
+	return fmt.Sprintf("%s@%s", base64.URLEncoding.EncodeToString(b), host), nil
+}
+
+func randBytes(n int) ([]byte, error) {
+	b := make([]byte, n)
+	got, err := rand.Read(b)
+	if err != nil {
+		return nil, err
+	} else if n != got {
+		return nil, errors.New("unable to generate enough random data")
+	}
+	return b, nil
+}
+
+// urlEqual checks two urls for equality using only the host and path portions.
+func urlEqual(url1, url2 string) bool {
+	u1, err := url.Parse(url1)
+	if err != nil {
+		return false
+	}
+	u2, err := url.Parse(url2)
+	if err != nil {
+		return false
+	}
+
+	return strings.ToLower(u1.Host+u1.Path) == strings.ToLower(u2.Host+u2.Path)
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/util_test.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/util_test.go
new file mode 100644
index 00000000..b7e0af76
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/util_test.go
@@ -0,0 +1,95 @@
+package oidc
+
+import (
+	"fmt"
+	"net/http"
+	"reflect"
+	"testing"
+	"time"
+
+	"github.com/coreos/go-oidc/jose"
+)
+
+func TestCookieTokenExtractorInvalid(t *testing.T) {
+	ckName := "tokenCookie"
+	tests := []*http.Cookie{
+		&http.Cookie{},
+		&http.Cookie{Name: ckName},
+		&http.Cookie{Name: ckName, Value: ""},
+	}
+
+	for i, tt := range tests {
+		r, _ := http.NewRequest("", "", nil)
+		r.AddCookie(tt)
+		_, err := CookieTokenExtractor(ckName)(r)
+		if err == nil {
+			t.Errorf("case %d: want: error for invalid cookie token, got: no error.", i)
+		}
+	}
+}
+
+func TestCookieTokenExtractorValid(t *testing.T) {
+	validToken := "eyJ0eXAiOiJKV1QiLA0KICJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJqb2UiLA0KICJleHAiOjEzMDA4MTkzODAsDQogImh0dHA6Ly9leGFtcGxlLmNvbS9pc19yb290Ijp0cnVlfQ.dBjftJeZ4CVP-mB92K27uhbUJU1p1r_wW1gFWFOEjXk"
+	ckName := "tokenCookie"
+	tests := []*http.Cookie{
+		&http.Cookie{Name: ckName, Value: "some non-empty value"},
+		&http.Cookie{Name: ckName, Value: validToken},
+	}
+
+	for i, tt := range tests {
+		r, _ := http.NewRequest("", "", nil)
+		r.AddCookie(tt)
+		_, err := CookieTokenExtractor(ckName)(r)
+		if err != nil {
+			t.Errorf("case %d: want: valid cookie with no error, got: %v", i, err)
+		}
+	}
+}
+
+func TestExtractBearerTokenInvalid(t *testing.T) {
+	tests := []string{"", "x", "Bearer", "xxxxxxx", "Bearer "}
+
+	for i, tt := range tests {
+		r, _ := http.NewRequest("", "", nil)
+		r.Header.Add("Authorization", tt)
+		_, err := ExtractBearerToken(r)
+		if err == nil {
+			t.Errorf("case %d: want: invalid Authorization header, got: valid Authorization header.", i)
+		}
+	}
+}
+
+func TestExtractBearerTokenValid(t *testing.T) {
+	validToken := "eyJ0eXAiOiJKV1QiLA0KICJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJqb2UiLA0KICJleHAiOjEzMDA4MTkzODAsDQogImh0dHA6Ly9leGFtcGxlLmNvbS9pc19yb290Ijp0cnVlfQ.dBjftJeZ4CVP-mB92K27uhbUJU1p1r_wW1gFWFOEjXk"
+	tests := []string{
+		fmt.Sprintf("Bearer %s", validToken),
+	}
+
+	for i, tt := range tests {
+		r, _ := http.NewRequest("", "", nil)
+		r.Header.Add("Authorization", tt)
+		_, err := ExtractBearerToken(r)
+		if err != nil {
+			t.Errorf("case %d: want: valid Authorization header, got: invalid Authorization header: %v.", i, err)
+		}
+	}
+}
+
+func TestNewClaims(t *testing.T) {
+	issAt := time.Date(2, time.January, 1, 0, 0, 0, 0, time.UTC)
+	expAt := time.Date(2, time.January, 1, 1, 0, 0, 0, time.UTC)
+
+	want := jose.Claims{
+		"iss": "https://example.com",
+		"sub": "user-123",
+		"aud": "client-abc",
+		"iat": float64(issAt.Unix()),
+		"exp": float64(expAt.Unix()),
+	}
+
+	got := NewClaims("https://example.com", "user-123", "client-abc", issAt, expAt)
+
+	if !reflect.DeepEqual(want, got) {
+		t.Fatalf("want=%#v got=%#v", want, got)
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/verification.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/verification.go
new file mode 100644
index 00000000..26b35f1e
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/verification.go
@@ -0,0 +1,167 @@
+package oidc
+
+import (
+	"errors"
+	"fmt"
+	"time"
+
+	"github.com/jonboulle/clockwork"
+
+	"github.com/coreos/go-oidc/jose"
+	"github.com/coreos/go-oidc/key"
+)
+
+func VerifySignature(jwt jose.JWT, keys []key.PublicKey) (bool, error) {
+	jwtBytes := []byte(jwt.Data())
+	for _, k := range keys {
+		v, err := k.Verifier()
+		if err != nil {
+			return false, err
+		}
+		if v.Verify(jwt.Signature, jwtBytes) == nil {
+			return true, nil
+		}
+	}
+	return false, nil
+}
+
+// Verify claims in accordance with OIDC spec
+// http://openid.net/specs/openid-connect-basic-1_0.html#IDTokenValidation
+func VerifyClaims(jwt jose.JWT, issuer, clientID string) error {
+	now := time.Now().UTC()
+
+	claims, err := jwt.Claims()
+	if err != nil {
+		return err
+	}
+
+	ident, err := IdentityFromClaims(claims)
+	if err != nil {
+		return err
+	}
+
+	if ident.ExpiresAt.Before(now) {
+		return errors.New("token is expired")
+	}
+
+	// iss REQUIRED. Issuer Identifier for the Issuer of the response.
+	// The iss value is a case sensitive URL using the https scheme that contains scheme, host, and optionally, port number and path components and no query or fragment components.
+	if iss, exists := claims["iss"].(string); exists {
+		if !urlEqual(iss, issuer) {
+			return fmt.Errorf("invalid claim value: 'iss'. expected=%s, found=%s.", issuer, iss)
+		}
+	} else {
+		return errors.New("missing claim: 'iss'")
+	}
+
+	// iat REQUIRED. Time at which the JWT was issued.
+	// Its value is a JSON number representing the number of seconds from 1970-01-01T0:0:0Z as measured in UTC until the date/time.
+	if _, exists := claims["iat"].(float64); !exists {
+		return errors.New("missing claim: 'iat'")
+	}
+
+	// aud REQUIRED. Audience(s) that this ID Token is intended for.
+	// It MUST contain the OAuth 2.0 client_id of the Relying Party as an audience value. It MAY also contain identifiers for other audiences. In the general case, the aud value is an array of case sensitive strings. In the common special case when there is one audience, the aud value MAY be a single case sensitive string.
+	if aud, exists := claims["aud"].(string); exists {
+		if aud != clientID {
+			return errors.New("invalid claim value: 'aud'")
+		}
+	} else {
+		return errors.New("missing claim: 'aud'")
+	}
+
+	return nil
+}
+
+// VerifyClientClaims verifies all the required claims are valid for a "client credentials" JWT.
+// Returns the client ID if valid, or an error if invalid.
+func VerifyClientClaims(jwt jose.JWT, issuer string) (string, error) {
+	claims, err := jwt.Claims()
+	if err != nil {
+		return "", fmt.Errorf("failed to parse JWT claims: %v", err)
+	}
+
+	iss, ok, err := claims.StringClaim("iss")
+	if err != nil {
+		return "", fmt.Errorf("failed to parse 'iss' claim: %v", err)
+	} else if !ok {
+		return "", errors.New("missing required 'iss' claim")
+	} else if !urlEqual(iss, issuer) {
+		return "", fmt.Errorf("'iss' claim does not match expected issuer, iss=%s", iss)
+	}
+
+	sub, ok, err := claims.StringClaim("sub")
+	if err != nil {
+		return "", fmt.Errorf("failed to parse 'sub' claim: %v", err)
+	} else if !ok {
+		return "", errors.New("missing required 'sub' claim")
+	}
+
+	aud, ok, err := claims.StringClaim("aud")
+	if err != nil {
+		return "", fmt.Errorf("failed to parse 'aud' claim: %v", err)
+	} else if !ok {
+		return "", errors.New("missing required 'aud' claim")
+	}
+
+	if sub != aud {
+		return "", fmt.Errorf("invalid claims, 'aud' claim and 'sub' claim do not match, aud=%s, sub=%s", aud, sub)
+	}
+
+	now := time.Now().UTC()
+	exp, ok, err := claims.TimeClaim("exp")
+	if err != nil {
+		return "", fmt.Errorf("failed to parse 'exp' claim: %v", err)
+	} else if !ok {
+		return "", errors.New("missing required 'exp' claim")
+	} else if exp.Before(now) {
+		return "", fmt.Errorf("token already expired at: %v", exp)
+	}
+
+	return sub, nil
+}
+
+type JWTVerifier struct {
+	issuer   string
+	clientID string
+	syncFunc func() error
+	keysFunc func() []key.PublicKey
+	clock    clockwork.Clock
+}
+
+func NewJWTVerifier(issuer, clientID string, syncFunc func() error, keysFunc func() []key.PublicKey) JWTVerifier {
+	return JWTVerifier{
+		issuer:   issuer,
+		clientID: clientID,
+		syncFunc: syncFunc,
+		keysFunc: keysFunc,
+		clock:    clockwork.NewRealClock(),
+	}
+}
+
+func (v *JWTVerifier) Verify(jwt jose.JWT) error {
+	ok, err := VerifySignature(jwt, v.keysFunc())
+	if ok {
+		goto SignatureVerified
+	} else if err != nil {
+		return fmt.Errorf("oidc: JWT signature verification failed: %v", err)
+	}
+
+	if err = v.syncFunc(); err != nil {
+		return fmt.Errorf("oidc: failed syncing KeySet: %v", err)
+	}
+
+	ok, err = VerifySignature(jwt, v.keysFunc())
+	if err != nil {
+		return fmt.Errorf("oidc: JWT signature verification failed: %v", err)
+	} else if !ok {
+		return errors.New("oidc: unable to verify JWT signature: no matching keys")
+	}
+
+SignatureVerified:
+	if err := VerifyClaims(jwt, v.issuer, v.clientID); err != nil {
+		return fmt.Errorf("oidc: JWT claims invalid: %v", err)
+	}
+
+	return nil
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/verification_test.go b/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/verification_test.go
new file mode 100644
index 00000000..5fa69479
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/go-oidc/oidc/verification_test.go
@@ -0,0 +1,297 @@
+package oidc
+
+import (
+	"testing"
+	"time"
+
+	"github.com/coreos/go-oidc/jose"
+	"github.com/coreos/go-oidc/key"
+)
+
+func TestVerifyClientClaims(t *testing.T) {
+	validIss := "https://example.com"
+	validClientID := "valid-client"
+	now := time.Now()
+	tomorrow := now.Add(24 * time.Hour)
+	header := jose.JOSEHeader{
+		jose.HeaderKeyAlgorithm: "test-alg",
+		jose.HeaderKeyID:        "1",
+	}
+
+	tests := []struct {
+		claims jose.Claims
+		ok     bool
+	}{
+		// valid token
+		{
+			claims: jose.Claims{
+				"iss": validIss,
+				"sub": validClientID,
+				"aud": validClientID,
+				"iat": float64(now.Unix()),
+				"exp": float64(tomorrow.Unix()),
+			},
+			ok: true,
+		},
+		// missing 'iss' claim
+		{
+			claims: jose.Claims{
+				"sub": validClientID,
+				"aud": validClientID,
+				"iat": float64(now.Unix()),
+				"exp": float64(tomorrow.Unix()),
+			},
+			ok: false,
+		},
+		// invalid 'iss' claim
+		{
+			claims: jose.Claims{
+				"iss": "INVALID",
+				"sub": validClientID,
+				"aud": validClientID,
+				"iat": float64(now.Unix()),
+				"exp": float64(tomorrow.Unix()),
+			},
+			ok: false,
+		},
+		// missing 'sub' claim
+		{
+			claims: jose.Claims{
+				"iss": validIss,
+				"aud": validClientID,
+				"iat": float64(now.Unix()),
+				"exp": float64(tomorrow.Unix()),
+			},
+			ok: false,
+		},
+		// invalid 'sub' claim
+		{
+			claims: jose.Claims{
+				"iss": validIss,
+				"sub": "INVALID",
+				"aud": validClientID,
+				"iat": float64(now.Unix()),
+				"exp": float64(tomorrow.Unix()),
+			},
+			ok: false,
+		},
+		// missing 'aud' claim
+		{
+			claims: jose.Claims{
+				"iss": validIss,
+				"sub": validClientID,
+				"iat": float64(now.Unix()),
+				"exp": float64(tomorrow.Unix()),
+			},
+			ok: false,
+		},
+		// invalid 'aud' claim
+		{
+			claims: jose.Claims{
+				"iss": validIss,
+				"sub": validClientID,
+				"aud": "INVALID",
+				"iat": float64(now.Unix()),
+				"exp": float64(tomorrow.Unix()),
+			},
+			ok: false,
+		},
+		// expired
+		{
+			claims: jose.Claims{
+				"iss": validIss,
+				"sub": validClientID,
+				"aud": validClientID,
+				"iat": float64(now.Unix()),
+				"exp": float64(now.Unix()),
+			},
+			ok: false,
+		},
+	}
+
+	for i, tt := range tests {
+		jwt, err := jose.NewJWT(header, tt.claims)
+		if err != nil {
+			t.Fatalf("case %d: Failed to generate JWT, error=%v", i, err)
+		}
+
+		got, err := VerifyClientClaims(jwt, validIss)
+		if tt.ok {
+			if err != nil {
+				t.Errorf("case %d: unexpected error, err=%v", i, err)
+			}
+			if got != validClientID {
+				t.Errorf("case %d: incorrect client ID, want=%s, got=%s", i, validClientID, got)
+			}
+		} else if err == nil {
+			t.Errorf("case %d: expected error but err is nil", i)
+		}
+	}
+}
+
+func TestJWTVerifier(t *testing.T) {
+	iss := "http://example.com"
+	now := time.Now()
+	future12 := now.Add(12 * time.Hour)
+	past36 := now.Add(-36 * time.Hour)
+	past12 := now.Add(-12 * time.Hour)
+
+	priv1, err := key.GeneratePrivateKey()
+	if err != nil {
+		t.Fatalf("failed to generate private key, error=%v", err)
+	}
+	pk1 := *key.NewPublicKey(priv1.JWK())
+
+	priv2, err := key.GeneratePrivateKey()
+	if err != nil {
+		t.Fatalf("failed to generate private key, error=%v", err)
+	}
+	pk2 := *key.NewPublicKey(priv2.JWK())
+
+	jwtPK1, err := jose.NewSignedJWT(NewClaims(iss, "XXX", "XXX", past12, future12), priv1.Signer())
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	jwtPK1BadClaims, err := jose.NewSignedJWT(NewClaims(iss, "XXX", "YYY", past12, future12), priv1.Signer())
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	jwtExpired, err := jose.NewSignedJWT(NewClaims(iss, "XXX", "XXX", past36, past12), priv1.Signer())
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	jwtPK2, err := jose.NewSignedJWT(NewClaims(iss, "XXX", "XXX", past12, future12), priv2.Signer())
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	tests := []struct {
+		verifier JWTVerifier
+		jwt      jose.JWT
+		wantErr  bool
+	}{
+		// JWT signed with available key
+		{
+			verifier: JWTVerifier{
+				issuer:   "example.com",
+				clientID: "XXX",
+				syncFunc: func() error { return nil },
+				keysFunc: func() []key.PublicKey {
+					return []key.PublicKey{pk1}
+				},
+			},
+			jwt:     *jwtPK1,
+			wantErr: false,
+		},
+
+		// JWT signed with available key, with bad claims
+		{
+			verifier: JWTVerifier{
+				issuer:   "example.com",
+				clientID: "XXX",
+				syncFunc: func() error { return nil },
+				keysFunc: func() []key.PublicKey {
+					return []key.PublicKey{pk1}
+				},
+			},
+			jwt:     *jwtPK1BadClaims,
+			wantErr: true,
+		},
+
+		// expired JWT signed with available key
+		{
+			verifier: JWTVerifier{
+				issuer:   "example.com",
+				clientID: "XXX",
+				syncFunc: func() error { return nil },
+				keysFunc: func() []key.PublicKey {
+					return []key.PublicKey{pk1}
+				},
+			},
+			jwt:     *jwtExpired,
+			wantErr: true,
+		},
+
+		// JWT signed with unrecognized key, verifiable after sync
+		{
+			verifier: JWTVerifier{
+				issuer:   "example.com",
+				clientID: "XXX",
+				syncFunc: func() error { return nil },
+				keysFunc: func() func() []key.PublicKey {
+					var i int
+					return func() []key.PublicKey {
+						defer func() { i++ }()
+						return [][]key.PublicKey{
+							[]key.PublicKey{pk1},
+							[]key.PublicKey{pk2},
+						}[i]
+					}
+				}(),
+			},
+			jwt:     *jwtPK2,
+			wantErr: false,
+		},
+
+		// JWT signed with unrecognized key, not verifiable after sync
+		{
+			verifier: JWTVerifier{
+				issuer:   "example.com",
+				clientID: "XXX",
+				syncFunc: func() error { return nil },
+				keysFunc: func() []key.PublicKey {
+					return []key.PublicKey{pk1}
+				},
+			},
+			jwt:     *jwtPK2,
+			wantErr: true,
+		},
+
+		// verifier gets no keys from keysFunc, still not verifiable after sync
+		{
+			verifier: JWTVerifier{
+				issuer:   "example.com",
+				clientID: "XXX",
+				syncFunc: func() error { return nil },
+				keysFunc: func() []key.PublicKey {
+					return []key.PublicKey{}
+				},
+			},
+			jwt:     *jwtPK1,
+			wantErr: true,
+		},
+
+		// verifier gets no keys from keysFunc, verifiable after sync
+		{
+			verifier: JWTVerifier{
+				issuer:   "example.com",
+				clientID: "XXX",
+				syncFunc: func() error { return nil },
+				keysFunc: func() func() []key.PublicKey {
+					var i int
+					return func() []key.PublicKey {
+						defer func() { i++ }()
+						return [][]key.PublicKey{
+							[]key.PublicKey{},
+							[]key.PublicKey{pk2},
+						}[i]
+					}
+				}(),
+			},
+			jwt:     *jwtPK2,
+			wantErr: false,
+		},
+	}
+
+	for i, tt := range tests {
+		err := tt.verifier.Verify(tt.jwt)
+		if tt.wantErr && (err == nil) {
+			t.Errorf("case %d: wanted non-nil error", i)
+		} else if !tt.wantErr && (err != nil) {
+			t.Errorf("case %d: wanted nil error, got %v", i, err)
+		}
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/capnslog/README.md b/Godeps/_workspace/src/github.com/coreos/pkg/capnslog/README.md
new file mode 100644
index 00000000..1053dd00
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/pkg/capnslog/README.md
@@ -0,0 +1,38 @@
+# CoreOS Log
+
+There are far too many logging packages out there, with varying degrees of licenses, far too many features (colorization, all sorts of log frameworks) or are just a pain to use (lack of `Fatalln()`?)
+
+## Design Principles
+
+* `package main` is the place where logging gets turned on and routed
+
+A library should not touch log options, only generate log entries. Libraries are silent until main lets them speak.
+
+* All log options are runtime-configurable. 
+
+Still the job of `main` to expose these configurations. `main` may delegate this to, say, a configuration webhook, but does so explicitly. 
+
+* There is one log object per package. It is registered under its repository and package name.
+
+`main` activates logging for its repository and any dependency repositories it would also like to have output in its logstream. `main` also dictates at which level each subpackage logs.
+
+* There is *one* output stream, and it is an `io.Writer` composed with a formatter.
+
+Splitting streams is probably not the job of your program, but rather, your log aggregation framework. If you must split output streams, again, `main` configures this and you can write a very simple two-output struct that satisfies io.Writer.
+
+Fancy colorful formatting and JSON output are beyond the scope of a basic logging framework -- they're application/log-collector dependant. These are, at best, provided as options, but more likely, provided by your application.
+
+* Log objects are an interface
+
+An object knows best how to print itself. Log objects can collect more interesting metadata if they wish, however, because text isn't going away anytime soon, they must all be marshalable to text. The simplest log object is a string, which returns itself. If you wish to do more fancy tricks for printing your log objects, see also JSON output -- introspect and write a formatter which can handle your advanced log interface. Making strings is the only thing guaranteed.
+
+* Log levels have specific meanings:
+
+  * Critical: Unrecoverable. Must fail.
+  * Error: Data has been lost, a request has failed for a bad reason, or a required resource has been lost
+  * Warning: (Hopefully) Temporary conditions that may cause errors, but may work fine. A replica disappearing (that may reconnect) is a warning.
+  * Notice: Normal, but important (uncommon) log information.
+  * Info: Normal, working log information, everything is fine, but helpful notices for auditing or common operations.
+  * Debug: Everything is still fine, but even common operations may be logged, and less helpful but more quantity of notices.
+  * Trace: Anything goes, from logging every function call as part of a common operation, to tracing execution of a query.
+
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/capnslog/example/hello_dolly.go b/Godeps/_workspace/src/github.com/coreos/pkg/capnslog/example/hello_dolly.go
new file mode 100644
index 00000000..cd1b8f82
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/pkg/capnslog/example/hello_dolly.go
@@ -0,0 +1,59 @@
+// Copyright 2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"flag"
+	oldlog "log"
+	"os"
+
+	"github.com/coreos/pkg/capnslog"
+)
+
+var logLevel = capnslog.INFO
+var log = capnslog.NewPackageLogger("github.com/coreos/pkg/capnslog/cmd", "main")
+var dlog = capnslog.NewPackageLogger("github.com/coreos/pkg/capnslog/cmd", "dolly")
+
+func init() {
+	flag.Var(&logLevel, "log-level", "Global log level.")
+}
+
+func main() {
+	rl := capnslog.MustRepoLogger("github.com/coreos/pkg/capnslog/cmd")
+	capnslog.SetFormatter(capnslog.NewStringFormatter(os.Stderr))
+
+	// We can parse the log level configs from the command line
+	flag.Parse()
+	if flag.NArg() > 1 {
+		cfg, err := rl.ParseLogLevelConfig(flag.Arg(1))
+		if err != nil {
+			log.Fatal(err)
+		}
+		rl.SetLogLevel(cfg)
+		log.Infof("Setting output to %s", flag.Arg(1))
+	}
+
+	// Send some messages at different levels to the different packages
+	dlog.Infof("Hello Dolly")
+	dlog.Warningf("Well hello, Dolly")
+	log.Errorf("It's so nice to have you back where you belong")
+	dlog.Debugf("You're looking swell, Dolly")
+	dlog.Tracef("I can tell, Dolly")
+
+	// We also have control over the built-in "log" package.
+	capnslog.SetGlobalLogLevel(logLevel)
+	oldlog.Println("You're still glowin', you're still crowin', you're still lookin' strong")
+	log.Fatalf("Dolly'll never go away again")
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/capnslog/formatters.go b/Godeps/_workspace/src/github.com/coreos/pkg/capnslog/formatters.go
new file mode 100644
index 00000000..edbb351d
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/pkg/capnslog/formatters.go
@@ -0,0 +1,63 @@
+// Copyright 2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package capnslog
+
+import (
+	"bufio"
+	"fmt"
+	"io"
+	"strings"
+	"time"
+)
+
+type Formatter interface {
+	Format(pkg string, level LogLevel, depth int, entries ...interface{})
+	Flush()
+}
+
+func NewStringFormatter(w io.Writer) *StringFormatter {
+	return &StringFormatter{
+		w: bufio.NewWriter(w),
+	}
+}
+
+type StringFormatter struct {
+	w *bufio.Writer
+}
+
+func (s *StringFormatter) Format(pkg string, l LogLevel, i int, entries ...interface{}) {
+	now := time.Now()
+	y, m, d := now.Date()
+	h, min, sec := now.Clock()
+	s.w.WriteString(fmt.Sprintf("%d/%02d/%d %02d:%02d:%02d ", y, m, d, h, min, sec))
+	s.writeEntries(pkg, l, i, entries...)
+}
+
+func (s *StringFormatter) writeEntries(pkg string, _ LogLevel, _ int, entries ...interface{}) {
+	if pkg != "" {
+		s.w.WriteString(pkg + ": ")
+	}
+	str := fmt.Sprint(entries...)
+	endsInNL := strings.HasSuffix(str, "\n")
+	s.w.WriteString(str)
+	if !endsInNL {
+		s.w.WriteString("\n")
+	}
+	s.Flush()
+}
+
+func (s *StringFormatter) Flush() {
+	s.w.Flush()
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/capnslog/glog_formatter.go b/Godeps/_workspace/src/github.com/coreos/pkg/capnslog/glog_formatter.go
new file mode 100644
index 00000000..cae0749d
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/pkg/capnslog/glog_formatter.go
@@ -0,0 +1,95 @@
+// Copyright 2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package capnslog
+
+import (
+	"bufio"
+	"bytes"
+	"io"
+	"os"
+	"runtime"
+	"strconv"
+	"strings"
+	"time"
+)
+
+var pid = os.Getpid()
+
+type GlogFormatter struct {
+	StringFormatter
+}
+
+func NewGlogFormatter(w io.Writer) *GlogFormatter {
+	g := &GlogFormatter{}
+	g.w = bufio.NewWriter(w)
+	return g
+}
+
+func (g GlogFormatter) Format(pkg string, level LogLevel, depth int, entries ...interface{}) {
+	g.w.Write(GlogHeader(level, depth+1))
+	g.StringFormatter.Format(pkg, level, depth+1, entries...)
+}
+
+func GlogHeader(level LogLevel, depth int) []byte {
+	// Lmmdd hh:mm:ss.uuuuuu threadid file:line]
+	now := time.Now()
+	_, file, line, ok := runtime.Caller(depth) // It's always the same number of frames to the user's call.
+	if !ok {
+		file = "???"
+		line = 1
+	} else {
+		slash := strings.LastIndex(file, "/")
+		if slash >= 0 {
+			file = file[slash+1:]
+		}
+	}
+	if line < 0 {
+		line = 0 // not a real line number
+	}
+	buf := &bytes.Buffer{}
+	buf.Grow(30)
+	_, month, day := now.Date()
+	hour, minute, second := now.Clock()
+	buf.WriteString(level.Char())
+	twoDigits(buf, int(month))
+	twoDigits(buf, day)
+	buf.WriteByte(' ')
+	twoDigits(buf, hour)
+	buf.WriteByte(':')
+	twoDigits(buf, minute)
+	buf.WriteByte(':')
+	twoDigits(buf, second)
+	buf.WriteByte('.')
+	buf.WriteString(strconv.Itoa(now.Nanosecond() / 1000))
+	buf.WriteByte(' ')
+	buf.WriteString(strconv.Itoa(pid))
+	buf.WriteByte(' ')
+	buf.WriteString(file)
+	buf.WriteByte(':')
+	buf.WriteString(strconv.Itoa(line))
+	buf.WriteByte(']')
+	buf.WriteByte(' ')
+	return buf.Bytes()
+}
+
+const digits = "0123456789"
+
+func twoDigits(b *bytes.Buffer, d int) {
+	c2 := digits[d%10]
+	d /= 10
+	c1 := digits[d%10]
+	b.WriteByte(c1)
+	b.WriteByte(c2)
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/capnslog/log_hijack.go b/Godeps/_workspace/src/github.com/coreos/pkg/capnslog/log_hijack.go
new file mode 100644
index 00000000..1a7f3dc1
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/pkg/capnslog/log_hijack.go
@@ -0,0 +1,39 @@
+// Copyright 2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package capnslog
+
+import (
+	"log"
+)
+
+func init() {
+	pkg := NewPackageLogger("log", "")
+	w := packageWriter{pkg}
+	log.SetFlags(0)
+	log.SetPrefix("")
+	log.SetOutput(w)
+}
+
+type packageWriter struct {
+	pl *PackageLogger
+}
+
+func (p packageWriter) Write(b []byte) (int, error) {
+	if p.pl.level < INFO {
+		return 0, nil
+	}
+	p.pl.internalLog(calldepth+2, INFO, string(b))
+	return len(b), nil
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/capnslog/logmap.go b/Godeps/_workspace/src/github.com/coreos/pkg/capnslog/logmap.go
new file mode 100644
index 00000000..84954488
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/pkg/capnslog/logmap.go
@@ -0,0 +1,240 @@
+// Copyright 2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package capnslog
+
+import (
+	"errors"
+	"strings"
+	"sync"
+)
+
+// LogLevel is the set of all log levels.
+type LogLevel int8
+
+const (
+	// CRITICAL is the lowest log level; only errors which will end the program will be propagated.
+	CRITICAL LogLevel = iota - 1
+	// ERROR is for errors that are not fatal but lead to troubling behavior.
+	ERROR
+	// WARNING is for errors which are not fatal and not errors, but are unusual. Often sourced from misconfigurations.
+	WARNING
+	// NOTICE is for normal but significant conditions.
+	NOTICE
+	// INFO is a log level for common, everyday log updates.
+	INFO
+	// DEBUG is the default hidden level for more verbose updates about internal processes.
+	DEBUG
+	// TRACE is for (potentially) call by call tracing of programs.
+	TRACE
+)
+
+// Char returns a single-character representation of the log level.
+func (l LogLevel) Char() string {
+	switch l {
+	case CRITICAL:
+		return "C"
+	case ERROR:
+		return "E"
+	case WARNING:
+		return "W"
+	case NOTICE:
+		return "N"
+	case INFO:
+		return "I"
+	case DEBUG:
+		return "D"
+	case TRACE:
+		return "T"
+	default:
+		panic("Unhandled loglevel")
+	}
+}
+
+// String returns a multi-character representation of the log level.
+func (l LogLevel) String() string {
+	switch l {
+	case CRITICAL:
+		return "CRITICAL"
+	case ERROR:
+		return "ERROR"
+	case WARNING:
+		return "WARNING"
+	case NOTICE:
+		return "NOTICE"
+	case INFO:
+		return "INFO"
+	case DEBUG:
+		return "DEBUG"
+	case TRACE:
+		return "TRACE"
+	default:
+		panic("Unhandled loglevel")
+	}
+}
+
+// Update using the given string value. Fulfills the flag.Value interface.
+func (l *LogLevel) Set(s string) error {
+	value, err := ParseLevel(s)
+	if err != nil {
+		return err
+	}
+
+	*l = value
+	return nil
+}
+
+// ParseLevel translates some potential loglevel strings into their corresponding levels.
+func ParseLevel(s string) (LogLevel, error) {
+	switch s {
+	case "CRITICAL", "C":
+		return CRITICAL, nil
+	case "ERROR", "0", "E":
+		return ERROR, nil
+	case "WARNING", "1", "W":
+		return WARNING, nil
+	case "NOTICE", "2", "N":
+		return NOTICE, nil
+	case "INFO", "3", "I":
+		return INFO, nil
+	case "DEBUG", "4", "D":
+		return DEBUG, nil
+	case "TRACE", "5", "T":
+		return TRACE, nil
+	}
+	return CRITICAL, errors.New("couldn't parse log level " + s)
+}
+
+type RepoLogger map[string]*PackageLogger
+
+type loggerStruct struct {
+	sync.Mutex
+	repoMap   map[string]RepoLogger
+	formatter Formatter
+}
+
+// logger is the global logger
+var logger = new(loggerStruct)
+
+// SetGlobalLogLevel sets the log level for all packages in all repositories
+// registered with capnslog.
+func SetGlobalLogLevel(l LogLevel) {
+	logger.Lock()
+	defer logger.Unlock()
+	for _, r := range logger.repoMap {
+		r.setRepoLogLevelInternal(l)
+	}
+}
+
+// GetRepoLogger may return the handle to the repository's set of packages' loggers.
+func GetRepoLogger(repo string) (RepoLogger, error) {
+	logger.Lock()
+	defer logger.Unlock()
+	r, ok := logger.repoMap[repo]
+	if !ok {
+		return nil, errors.New("no packages registered for repo " + repo)
+	}
+	return r, nil
+}
+
+// MustRepoLogger returns the handle to the repository's packages' loggers.
+func MustRepoLogger(repo string) RepoLogger {
+	r, err := GetRepoLogger(repo)
+	if err != nil {
+		panic(err)
+	}
+	return r
+}
+
+// SetRepoLogLevel sets the log level for all packages in the repository.
+func (r RepoLogger) SetRepoLogLevel(l LogLevel) {
+	logger.Lock()
+	defer logger.Unlock()
+	r.setRepoLogLevelInternal(l)
+}
+
+func (r RepoLogger) setRepoLogLevelInternal(l LogLevel) {
+	for _, v := range r {
+		v.level = l
+	}
+}
+
+// ParseLogLevelConfig parses a comma-separated string of "package=loglevel", in
+// order, and returns a map of the results, for use in SetLogLevel.
+func (r RepoLogger) ParseLogLevelConfig(conf string) (map[string]LogLevel, error) {
+	setlist := strings.Split(conf, ",")
+	out := make(map[string]LogLevel)
+	for _, setstring := range setlist {
+		setting := strings.Split(setstring, "=")
+		if len(setting) != 2 {
+			return nil, errors.New("oddly structured `pkg=level` option: " + setstring)
+		}
+		l, err := ParseLevel(setting[1])
+		if err != nil {
+			return nil, err
+		}
+		out[setting[0]] = l
+	}
+	return out, nil
+}
+
+// SetLogLevel takes a map of package names within a repository to their desired
+// loglevel, and sets the levels appropriately. Unknown packages are ignored.
+// "*" is a special package name that corresponds to all packages, and will be
+// processed first.
+func (r RepoLogger) SetLogLevel(m map[string]LogLevel) {
+	logger.Lock()
+	defer logger.Unlock()
+	if l, ok := m["*"]; ok {
+		r.setRepoLogLevelInternal(l)
+	}
+	for k, v := range m {
+		l, ok := r[k]
+		if !ok {
+			continue
+		}
+		l.level = v
+	}
+}
+
+// SetFormatter sets the formatting function for all logs.
+func SetFormatter(f Formatter) {
+	logger.Lock()
+	defer logger.Unlock()
+	logger.formatter = f
+}
+
+// NewPackageLogger creates a package logger object.
+// This should be defined as a global var in your package, referencing your repo.
+func NewPackageLogger(repo string, pkg string) (p *PackageLogger) {
+	logger.Lock()
+	defer logger.Unlock()
+	if logger.repoMap == nil {
+		logger.repoMap = make(map[string]RepoLogger)
+	}
+	r, rok := logger.repoMap[repo]
+	if !rok {
+		logger.repoMap[repo] = make(RepoLogger)
+		r = logger.repoMap[repo]
+	}
+	p, pok := r[pkg]
+	if !pok {
+		r[pkg] = &PackageLogger{
+			pkg:   pkg,
+			level: INFO,
+		}
+		p = r[pkg]
+	}
+	return
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/capnslog/pkg_logger.go b/Godeps/_workspace/src/github.com/coreos/pkg/capnslog/pkg_logger.go
new file mode 100644
index 00000000..0aa79d9a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/pkg/capnslog/pkg_logger.go
@@ -0,0 +1,158 @@
+// Copyright 2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package capnslog
+
+import (
+	"fmt"
+	"os"
+)
+
+type PackageLogger struct {
+	pkg   string
+	level LogLevel
+}
+
+const calldepth = 3
+
+func (p *PackageLogger) internalLog(depth int, inLevel LogLevel, entries ...interface{}) {
+	if inLevel != CRITICAL && p.level < inLevel {
+		return
+	}
+	logger.Lock()
+	defer logger.Unlock()
+	if logger.formatter != nil {
+		logger.formatter.Format(p.pkg, inLevel, depth+1, entries...)
+	}
+}
+
+func (p *PackageLogger) LevelAt(l LogLevel) bool {
+	return p.level >= l
+}
+
+// Log a formatted string at any level between ERROR and TRACE
+func (p *PackageLogger) Logf(l LogLevel, format string, args ...interface{}) {
+	p.internalLog(calldepth, l, fmt.Sprintf(format, args...))
+}
+
+// Log a message at any level between ERROR and TRACE
+func (p *PackageLogger) Log(l LogLevel, args ...interface{}) {
+	p.internalLog(calldepth, l, fmt.Sprint(args...))
+}
+
+// log stdlib compatibility
+
+func (p *PackageLogger) Println(args ...interface{}) {
+	p.internalLog(calldepth, INFO, fmt.Sprintln(args...))
+}
+
+func (p *PackageLogger) Printf(format string, args ...interface{}) {
+	p.internalLog(calldepth, INFO, fmt.Sprintf(format, args...))
+}
+
+func (p *PackageLogger) Print(args ...interface{}) {
+	p.internalLog(calldepth, INFO, fmt.Sprint(args...))
+}
+
+// Panic and fatal
+
+func (p *PackageLogger) Panicf(format string, args ...interface{}) {
+	s := fmt.Sprintf(format, args...)
+	p.internalLog(calldepth, CRITICAL, s)
+	panic(s)
+}
+
+func (p *PackageLogger) Panic(args ...interface{}) {
+	s := fmt.Sprint(args...)
+	p.internalLog(calldepth, CRITICAL, s)
+	panic(s)
+}
+
+func (p *PackageLogger) Fatalf(format string, args ...interface{}) {
+	s := fmt.Sprintf(format, args...)
+	p.internalLog(calldepth, CRITICAL, s)
+	os.Exit(1)
+}
+
+func (p *PackageLogger) Fatal(args ...interface{}) {
+	s := fmt.Sprint(args...)
+	p.internalLog(calldepth, CRITICAL, s)
+	os.Exit(1)
+}
+
+// Error Functions
+
+func (p *PackageLogger) Errorf(format string, args ...interface{}) {
+	p.internalLog(calldepth, ERROR, fmt.Sprintf(format, args...))
+}
+
+func (p *PackageLogger) Error(entries ...interface{}) {
+	p.internalLog(calldepth, ERROR, entries...)
+}
+
+// Warning Functions
+
+func (p *PackageLogger) Warningf(format string, args ...interface{}) {
+	p.internalLog(calldepth, WARNING, fmt.Sprintf(format, args...))
+}
+
+func (p *PackageLogger) Warning(entries ...interface{}) {
+	p.internalLog(calldepth, WARNING, entries...)
+}
+
+// Notice Functions
+
+func (p *PackageLogger) Noticef(format string, args ...interface{}) {
+	p.internalLog(calldepth, NOTICE, fmt.Sprintf(format, args...))
+}
+
+func (p *PackageLogger) Notice(entries ...interface{}) {
+	p.internalLog(calldepth, NOTICE, entries...)
+}
+
+// Info Functions
+
+func (p *PackageLogger) Infof(format string, args ...interface{}) {
+	p.internalLog(calldepth, INFO, fmt.Sprintf(format, args...))
+}
+
+func (p *PackageLogger) Info(entries ...interface{}) {
+	p.internalLog(calldepth, INFO, entries...)
+}
+
+// Debug Functions
+
+func (p *PackageLogger) Debugf(format string, args ...interface{}) {
+	p.internalLog(calldepth, DEBUG, fmt.Sprintf(format, args...))
+}
+
+func (p *PackageLogger) Debug(entries ...interface{}) {
+	p.internalLog(calldepth, DEBUG, entries...)
+}
+
+// Trace Functions
+
+func (p *PackageLogger) Tracef(format string, args ...interface{}) {
+	p.internalLog(calldepth, TRACE, fmt.Sprintf(format, args...))
+}
+
+func (p *PackageLogger) Trace(entries ...interface{}) {
+	p.internalLog(calldepth, TRACE, entries...)
+}
+
+func (p *PackageLogger) Flush() {
+	logger.Lock()
+	defer logger.Unlock()
+	logger.formatter.Flush()
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/capnslog/syslog_formatter.go b/Godeps/_workspace/src/github.com/coreos/pkg/capnslog/syslog_formatter.go
new file mode 100644
index 00000000..4be5a1f2
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/pkg/capnslog/syslog_formatter.go
@@ -0,0 +1,65 @@
+// Copyright 2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// +build !windows
+
+package capnslog
+
+import (
+	"fmt"
+	"log/syslog"
+)
+
+func NewSyslogFormatter(w *syslog.Writer) Formatter {
+	return &syslogFormatter{w}
+}
+
+func NewDefaultSyslogFormatter(tag string) (Formatter, error) {
+	w, err := syslog.New(syslog.LOG_DEBUG, tag)
+	if err != nil {
+		return nil, err
+	}
+	return NewSyslogFormatter(w), nil
+}
+
+type syslogFormatter struct {
+	w *syslog.Writer
+}
+
+func (s *syslogFormatter) Format(pkg string, l LogLevel, _ int, entries ...interface{}) {
+	for _, entry := range entries {
+		str := fmt.Sprint(entry)
+		switch l {
+		case CRITICAL:
+			s.w.Crit(str)
+		case ERROR:
+			s.w.Err(str)
+		case WARNING:
+			s.w.Warning(str)
+		case NOTICE:
+			s.w.Notice(str)
+		case INFO:
+			s.w.Info(str)
+		case DEBUG:
+			s.w.Debug(str)
+		case TRACE:
+			s.w.Debug(str)
+		default:
+			panic("Unhandled loglevel")
+		}
+	}
+}
+
+func (s *syslogFormatter) Flush() {
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/flagutil/env.go b/Godeps/_workspace/src/github.com/coreos/pkg/flagutil/env.go
new file mode 100644
index 00000000..5afa1d0a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/pkg/flagutil/env.go
@@ -0,0 +1,33 @@
+package flagutil
+
+import (
+	"flag"
+	"fmt"
+	"os"
+	"strings"
+)
+
+// SetFlagsFromEnv parses all registered flags in the given flagset,
+// and if they are not already set it attempts to set their values from
+// environment variables. Environment variables take the name of the flag but
+// are UPPERCASE, and any dashes are replaced by underscores. Environment
+// variables additionally are prefixed by the given string followed by
+// and underscore. For example, if prefix=PREFIX: some-flag => PREFIX_SOME_FLAG
+func SetFlagsFromEnv(fs *flag.FlagSet, prefix string) (err error) {
+	alreadySet := make(map[string]bool)
+	fs.Visit(func(f *flag.Flag) {
+		alreadySet[f.Name] = true
+	})
+	fs.VisitAll(func(f *flag.Flag) {
+		if !alreadySet[f.Name] {
+			key := prefix + "_" + strings.ToUpper(strings.Replace(f.Name, "-", "_", -1))
+			val := os.Getenv(key)
+			if val != "" {
+				if serr := fs.Set(f.Name, val); serr != nil {
+					err = fmt.Errorf("invalid value %q for %s: %v", val, key, serr)
+				}
+			}
+		}
+	})
+	return err
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/flagutil/env_test.go b/Godeps/_workspace/src/github.com/coreos/pkg/flagutil/env_test.go
new file mode 100644
index 00000000..49ba0b2e
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/pkg/flagutil/env_test.go
@@ -0,0 +1,64 @@
+package flagutil
+
+import (
+	"flag"
+	"os"
+	"testing"
+)
+
+func TestSetFlagsFromEnv(t *testing.T) {
+	fs := flag.NewFlagSet("testing", flag.ExitOnError)
+	fs.String("a", "", "")
+	fs.String("b", "", "")
+	fs.String("c", "", "")
+	fs.Parse([]string{})
+
+	os.Clearenv()
+	// flags should be settable using env vars
+	os.Setenv("MYPROJ_A", "foo")
+	// and command-line flags
+	if err := fs.Set("b", "bar"); err != nil {
+		t.Fatal(err)
+	}
+	// command-line flags take precedence over env vars
+	os.Setenv("MYPROJ_C", "woof")
+	if err := fs.Set("c", "quack"); err != nil {
+		t.Fatal(err)
+	}
+
+	// first verify that flags are as expected before reading the env
+	for f, want := range map[string]string{
+		"a": "",
+		"b": "bar",
+		"c": "quack",
+	} {
+		if got := fs.Lookup(f).Value.String(); got != want {
+			t.Fatalf("flag %q=%q, want %q", f, got, want)
+		}
+	}
+
+	// now read the env and verify flags were updated as expected
+	err := SetFlagsFromEnv(fs, "MYPROJ")
+	if err != nil {
+		t.Errorf("err=%v, want nil", err)
+	}
+	for f, want := range map[string]string{
+		"a": "foo",
+		"b": "bar",
+		"c": "quack",
+	} {
+		if got := fs.Lookup(f).Value.String(); got != want {
+			t.Errorf("flag %q=%q, want %q", f, got, want)
+		}
+	}
+}
+
+func TestSetFlagsFromEnvBad(t *testing.T) {
+	// now verify that an error is propagated
+	fs := flag.NewFlagSet("testing", flag.ExitOnError)
+	fs.Int("x", 0, "")
+	os.Setenv("MYPROJ_X", "not_a_number")
+	if err := SetFlagsFromEnv(fs, "MYPROJ"); err == nil {
+		t.Errorf("err=nil, want != nil")
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/flagutil/types.go b/Godeps/_workspace/src/github.com/coreos/pkg/flagutil/types.go
new file mode 100644
index 00000000..a159e836
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/pkg/flagutil/types.go
@@ -0,0 +1,44 @@
+package flagutil
+
+import (
+	"errors"
+	"fmt"
+	"net"
+	"strings"
+)
+
+// IPv4Flag parses a string into a net.IP after asserting that it
+// is an IPv4 address. This type implements the flag.Value interface.
+type IPv4Flag struct {
+	val net.IP
+}
+
+func (f *IPv4Flag) IP() net.IP {
+	return f.val
+}
+
+func (f *IPv4Flag) Set(v string) error {
+	ip := net.ParseIP(v)
+	if ip == nil || ip.To4() == nil {
+		return errors.New("not an IPv4 address")
+	}
+	f.val = ip
+	return nil
+}
+
+func (f *IPv4Flag) String() string {
+	return f.val.String()
+}
+
+// StringSliceFlag parses a comma-delimited list of strings into
+// a []string. This type implements the flag.Value interface.
+type StringSliceFlag []string
+
+func (ss *StringSliceFlag) String() string {
+	return fmt.Sprintf("%+v", *ss)
+}
+
+func (ss *StringSliceFlag) Set(v string) error {
+	*ss = strings.Split(v, ",")
+	return nil
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/flagutil/types_test.go b/Godeps/_workspace/src/github.com/coreos/pkg/flagutil/types_test.go
new file mode 100644
index 00000000..8d6f8cab
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/pkg/flagutil/types_test.go
@@ -0,0 +1,57 @@
+package flagutil
+
+import (
+	"reflect"
+	"testing"
+)
+
+func TestIPv4FlagSetInvalidArgument(t *testing.T) {
+	tests := []string{
+		"",
+		"foo",
+		"::",
+		"127.0.0.1:4328",
+	}
+
+	for i, tt := range tests {
+		var f IPv4Flag
+		if err := f.Set(tt); err == nil {
+			t.Errorf("case %d: expected non-nil error", i)
+		}
+	}
+}
+
+func TestIPv4FlagSetValidArgument(t *testing.T) {
+	tests := []string{
+		"127.0.0.1",
+		"0.0.0.0",
+	}
+
+	for i, tt := range tests {
+		var f IPv4Flag
+		if err := f.Set(tt); err != nil {
+			t.Errorf("case %d: err=%v", i, err)
+		}
+	}
+}
+
+func TestStringSliceFlag(t *testing.T) {
+	tests := []struct {
+		input string
+		want  []string
+	}{
+		{input: "", want: []string{""}},
+		{input: "foo", want: []string{"foo"}},
+		{input: "foo,bar", want: []string{"foo", "bar"}},
+	}
+
+	for i, tt := range tests {
+		var f StringSliceFlag
+		if err := f.Set(tt.input); err != nil {
+			t.Errorf("case %d: err=%v", i, err)
+		}
+		if !reflect.DeepEqual(tt.want, []string(f)) {
+			t.Errorf("case %d: want=%v got=%v", i, tt.want, f)
+		}
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/health/README.md b/Godeps/_workspace/src/github.com/coreos/pkg/health/README.md
new file mode 100644
index 00000000..5ec34c21
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/pkg/health/README.md
@@ -0,0 +1,11 @@
+health
+====
+
+A simple framework for implementing an HTTP health check endpoint on servers.
+
+Users implement their `health.Checkable` types, and create a `health.Checker`, from which they can get an `http.HandlerFunc` using `health.Checker.MakeHealthHandlerFunc`.
+
+### Documentation
+
+For more details, visit the docs on [gopkgdoc](http://godoc.org/github.com/coreos/pkg/health)
+
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/health/health.go b/Godeps/_workspace/src/github.com/coreos/pkg/health/health.go
new file mode 100644
index 00000000..a1c3610f
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/pkg/health/health.go
@@ -0,0 +1,127 @@
+package health
+
+import (
+	"expvar"
+	"fmt"
+	"log"
+	"net/http"
+
+	"github.com/coreos/pkg/httputil"
+)
+
+// Checkables should return nil when the thing they are checking is healthy, and an error otherwise.
+type Checkable interface {
+	Healthy() error
+}
+
+// Checker provides a way to make an endpoint which can be probed for system health.
+type Checker struct {
+	// Checks are the Checkables to be checked when probing.
+	Checks []Checkable
+
+	// Unhealthyhandler is called when one or more of the checks are unhealthy.
+	// If not provided DefaultUnhealthyHandler is called.
+	UnhealthyHandler UnhealthyHandler
+
+	// HealthyHandler is called when all checks are healthy.
+	// If not provided, DefaultHealthyHandler is called.
+	HealthyHandler http.HandlerFunc
+}
+
+func (c Checker) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	unhealthyHandler := c.UnhealthyHandler
+	if unhealthyHandler == nil {
+		unhealthyHandler = DefaultUnhealthyHandler
+	}
+
+	successHandler := c.HealthyHandler
+	if successHandler == nil {
+		successHandler = DefaultHealthyHandler
+	}
+
+	if r.Method != "GET" {
+		w.Header().Set("Allow", "GET")
+		w.WriteHeader(http.StatusMethodNotAllowed)
+		return
+	}
+
+	if err := Check(c.Checks); err != nil {
+		unhealthyHandler(w, r, err)
+		return
+	}
+
+	successHandler(w, r)
+}
+
+type UnhealthyHandler func(w http.ResponseWriter, r *http.Request, err error)
+
+type StatusResponse struct {
+	Status  string                 `json:"status"`
+	Details *StatusResponseDetails `json:"details,omitempty"`
+}
+
+type StatusResponseDetails struct {
+	Code    int    `json:"code,omitempty"`
+	Message string `json:"message,omitempty"`
+}
+
+func Check(checks []Checkable) (err error) {
+	errs := []error{}
+	for _, c := range checks {
+		if e := c.Healthy(); e != nil {
+			errs = append(errs, e)
+		}
+	}
+
+	switch len(errs) {
+	case 0:
+		err = nil
+	case 1:
+		err = errs[0]
+	default:
+		err = fmt.Errorf("multiple health check failure: %v", errs)
+	}
+
+	return
+}
+
+func DefaultHealthyHandler(w http.ResponseWriter, r *http.Request) {
+	err := httputil.WriteJSONResponse(w, http.StatusOK, StatusResponse{
+		Status: "ok",
+	})
+	if err != nil {
+		// TODO(bobbyrullo): replace with logging from new logging pkg,
+		// once it lands.
+		log.Printf("Failed to write JSON response: %v", err)
+	}
+}
+
+func DefaultUnhealthyHandler(w http.ResponseWriter, r *http.Request, err error) {
+	writeErr := httputil.WriteJSONResponse(w, http.StatusInternalServerError, StatusResponse{
+		Status: "error",
+		Details: &StatusResponseDetails{
+			Code:    http.StatusInternalServerError,
+			Message: err.Error(),
+		},
+	})
+	if writeErr != nil {
+		// TODO(bobbyrullo): replace with logging from new logging pkg,
+		// once it lands.
+		log.Printf("Failed to write JSON response: %v", err)
+	}
+}
+
+// ExpvarHandler is copied from https://golang.org/src/expvar/expvar.go, where it's sadly unexported.
+func ExpvarHandler(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Content-Type", "application/json; charset=utf-8")
+	fmt.Fprintf(w, "{\n")
+	first := true
+	expvar.Do(func(kv expvar.KeyValue) {
+		if !first {
+			fmt.Fprintf(w, ",\n")
+		}
+		first = false
+		fmt.Fprintf(w, "%q: %s", kv.Key, kv.Value)
+	})
+	fmt.Fprintf(w, "\n}\n")
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/health/health_test.go b/Godeps/_workspace/src/github.com/coreos/pkg/health/health_test.go
new file mode 100644
index 00000000..99428eb7
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/pkg/health/health_test.go
@@ -0,0 +1,198 @@
+package health
+
+import (
+	"encoding/json"
+	"errors"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/coreos/pkg/httputil"
+)
+
+type boolChecker bool
+
+func (b boolChecker) Healthy() error {
+	if b {
+		return nil
+	}
+	return errors.New("Unhealthy")
+}
+
+func errString(err error) string {
+	if err == nil {
+		return ""
+	}
+	return err.Error()
+}
+
+func TestCheck(t *testing.T) {
+	for i, test := range []struct {
+		checks   []Checkable
+		expected string
+	}{
+		{[]Checkable{}, ""},
+
+		{[]Checkable{boolChecker(true)}, ""},
+
+		{[]Checkable{boolChecker(true), boolChecker(true)}, ""},
+
+		{[]Checkable{boolChecker(true), boolChecker(false)}, "Unhealthy"},
+
+		{[]Checkable{boolChecker(true), boolChecker(false), boolChecker(false)}, "multiple health check failure: [Unhealthy Unhealthy]"},
+	} {
+		err := Check(test.checks)
+
+		if errString(err) != test.expected {
+			t.Errorf("case %d: want %v, got %v", i, test.expected, errString(err))
+		}
+	}
+}
+
+func TestHandlerFunc(t *testing.T) {
+	for i, test := range []struct {
+		checker         Checker
+		method          string
+		expectedStatus  string
+		expectedCode    int
+		expectedMessage string
+	}{
+		{
+			Checker{
+				Checks: []Checkable{
+					boolChecker(true),
+				},
+			},
+			"GET",
+			"ok",
+			http.StatusOK,
+			"",
+		},
+
+		// Wrong method.
+		{
+			Checker{
+				Checks: []Checkable{
+					boolChecker(true),
+				},
+			},
+			"POST",
+			"",
+			http.StatusMethodNotAllowed,
+			"GET only acceptable method",
+		},
+
+		// Health check fails.
+		{
+			Checker{
+				Checks: []Checkable{
+					boolChecker(false),
+				},
+			},
+			"GET",
+			"error",
+			http.StatusInternalServerError,
+			"Unhealthy",
+		},
+
+		// Health check fails, with overridden ErrorHandler.
+		{
+			Checker{
+				Checks: []Checkable{
+					boolChecker(false),
+				},
+				UnhealthyHandler: func(w http.ResponseWriter, r *http.Request, err error) {
+					httputil.WriteJSONResponse(w,
+						http.StatusInternalServerError, StatusResponse{
+							Status: "error",
+							Details: &StatusResponseDetails{
+								Code:    http.StatusInternalServerError,
+								Message: "Override!",
+							},
+						})
+				},
+			},
+			"GET",
+			"error",
+			http.StatusInternalServerError,
+			"Override!",
+		},
+
+		// Health check succeeds, with overridden SuccessHandler.
+		{
+			Checker{
+				Checks: []Checkable{
+					boolChecker(true),
+				},
+				HealthyHandler: func(w http.ResponseWriter, r *http.Request) {
+					httputil.WriteJSONResponse(w,
+						http.StatusOK, StatusResponse{
+							Status: "okey-dokey",
+						})
+				},
+			},
+			"GET",
+			"okey-dokey",
+			http.StatusOK,
+			"",
+		},
+	} {
+		w := httptest.NewRecorder()
+		r := &http.Request{}
+		r.Method = test.method
+		test.checker.ServeHTTP(w, r)
+		if w.Code != test.expectedCode {
+			t.Errorf("case %d: w.code == %v, want %v", i, w.Code, test.expectedCode)
+		}
+
+		if test.expectedStatus == "" {
+			// This is to handle the wrong-method case, when the
+			// body of the response is empty.
+			continue
+		}
+
+		statusMap := make(map[string]interface{})
+		err := json.Unmarshal(w.Body.Bytes(), &statusMap)
+		if err != nil {
+			t.Fatalf("case %d: failed to Unmarshal response body: %v", i, err)
+		}
+
+		status, ok := statusMap["status"].(string)
+		if !ok {
+			t.Errorf("case %d: status not present or not a string in json: %q", i, w.Body.Bytes())
+		}
+		if status != test.expectedStatus {
+			t.Errorf("case %d: status == %v, want %v", i, status, test.expectedStatus)
+		}
+
+		detailMap, ok := statusMap["details"].(map[string]interface{})
+		if test.expectedMessage != "" {
+			if !ok {
+				t.Fatalf("case %d: could not find/unmarshal detailMap", i)
+			}
+			message, ok := detailMap["message"].(string)
+			if !ok {
+				t.Fatalf("case %d: message not present or not a string in json: %q",
+					i, w.Body.Bytes())
+			}
+			if message != test.expectedMessage {
+				t.Errorf("case %d: message == %v, want %v", i, message, test.expectedMessage)
+			}
+
+			code, ok := detailMap["code"].(float64)
+			if !ok {
+				t.Fatalf("case %d: code not present or not an int in json: %q",
+					i, w.Body.Bytes())
+			}
+			if int(code) != test.expectedCode {
+				t.Errorf("case %d: code == %v, want %v", i, code, test.expectedCode)
+			}
+
+		} else {
+			if ok {
+				t.Errorf("case %d: unwanted detailMap present: %q", i, detailMap)
+			}
+		}
+
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/httputil/README.md b/Godeps/_workspace/src/github.com/coreos/pkg/httputil/README.md
new file mode 100644
index 00000000..44fa751c
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/pkg/httputil/README.md
@@ -0,0 +1,13 @@
+httputil
+====
+
+Common code for dealing with HTTP.
+
+Includes:
+
+* Code for returning JSON responses.
+
+### Documentation
+
+Visit the docs on [gopkgdoc](http://godoc.org/github.com/coreos/pkg/httputil)
+
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/httputil/json.go b/Godeps/_workspace/src/github.com/coreos/pkg/httputil/json.go
new file mode 100644
index 00000000..0b092350
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/pkg/httputil/json.go
@@ -0,0 +1,27 @@
+package httputil
+
+import (
+	"encoding/json"
+	"net/http"
+)
+
+const (
+	JSONContentType = "application/json"
+)
+
+func WriteJSONResponse(w http.ResponseWriter, code int, resp interface{}) error {
+	enc, err := json.Marshal(resp)
+	if err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		return err
+	}
+
+	w.Header().Set("Content-Type", JSONContentType)
+	w.WriteHeader(code)
+
+	_, err = w.Write(enc)
+	if err != nil {
+		return err
+	}
+	return nil
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/httputil/json_test.go b/Godeps/_workspace/src/github.com/coreos/pkg/httputil/json_test.go
new file mode 100644
index 00000000..92108927
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/pkg/httputil/json_test.go
@@ -0,0 +1,56 @@
+package httputil
+
+import (
+	"net/http/httptest"
+	"testing"
+)
+
+func TestWriteJSONResponse(t *testing.T) {
+	for i, test := range []struct {
+		code         int
+		resp         interface{}
+		expectedJSON string
+		expectErr    bool
+	}{
+		{
+			200,
+			struct {
+				A string
+				B string
+			}{A: "foo", B: "bar"},
+			`{"A":"foo","B":"bar"}`,
+			false,
+		},
+		{
+			500,
+			// Something that json.Marshal cannot serialize.
+			make(chan int),
+			"",
+			true,
+		},
+	} {
+		w := httptest.NewRecorder()
+		err := WriteJSONResponse(w, test.code, test.resp)
+
+		if w.Code != test.code {
+			t.Errorf("case %d: w.code == %v, want %v", i, w.Code, test.code)
+		}
+
+		if (err != nil) != test.expectErr {
+			t.Errorf("case %d: (err != nil) == %v, want %v. err: %v", i, err != nil, test.expectErr, err)
+		}
+
+		if string(w.Body.Bytes()) != test.expectedJSON {
+			t.Errorf("case %d: w.Body.Bytes()) == %q, want %q", i,
+				string(w.Body.Bytes()), test.expectedJSON)
+		}
+
+		if !test.expectErr {
+			contentType := w.Header()["Content-Type"][0]
+			if contentType != JSONContentType {
+				t.Errorf("case %d: contentType == %v, want %v", i, contentType, JSONContentType)
+			}
+		}
+	}
+
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/timeutil/backoff.go b/Godeps/_workspace/src/github.com/coreos/pkg/timeutil/backoff.go
new file mode 100644
index 00000000..b34fb496
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/pkg/timeutil/backoff.go
@@ -0,0 +1,15 @@
+package timeutil
+
+import (
+	"time"
+)
+
+func ExpBackoff(prev, max time.Duration) time.Duration {
+	if prev == 0 {
+		return time.Second
+	}
+	if prev > max/2 {
+		return max
+	}
+	return 2 * prev
+}
diff --git a/Godeps/_workspace/src/github.com/coreos/pkg/timeutil/backoff_test.go b/Godeps/_workspace/src/github.com/coreos/pkg/timeutil/backoff_test.go
new file mode 100644
index 00000000..d8392bc5
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/coreos/pkg/timeutil/backoff_test.go
@@ -0,0 +1,52 @@
+package timeutil
+
+import (
+	"testing"
+	"time"
+)
+
+func TestExpBackoff(t *testing.T) {
+	tests := []struct {
+		prev time.Duration
+		max  time.Duration
+		want time.Duration
+	}{
+		{
+			prev: time.Duration(0),
+			max:  time.Minute,
+			want: time.Second,
+		},
+		{
+			prev: time.Second,
+			max:  time.Minute,
+			want: 2 * time.Second,
+		},
+		{
+			prev: 16 * time.Second,
+			max:  time.Minute,
+			want: 32 * time.Second,
+		},
+		{
+			prev: 32 * time.Second,
+			max:  time.Minute,
+			want: time.Minute,
+		},
+		{
+			prev: time.Minute,
+			max:  time.Minute,
+			want: time.Minute,
+		},
+		{
+			prev: 2 * time.Minute,
+			max:  time.Minute,
+			want: time.Minute,
+		},
+	}
+
+	for i, tt := range tests {
+		got := ExpBackoff(tt.prev, tt.max)
+		if tt.want != got {
+			t.Errorf("case %d: want=%v got=%v", i, tt.want, got)
+		}
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/gorilla/handlers/.travis.yml b/Godeps/_workspace/src/github.com/gorilla/handlers/.travis.yml
new file mode 100644
index 00000000..354b7f8b
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/gorilla/handlers/.travis.yml
@@ -0,0 +1,8 @@
+language: go
+
+go:
+  - 1.1
+  - 1.2
+  - 1.3
+  - 1.4
+  - tip
diff --git a/Godeps/_workspace/src/github.com/gorilla/handlers/LICENSE b/Godeps/_workspace/src/github.com/gorilla/handlers/LICENSE
new file mode 100644
index 00000000..66ea3c8a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/gorilla/handlers/LICENSE
@@ -0,0 +1,22 @@
+Copyright (c) 2013 The Gorilla Handlers Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+  Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/gorilla/handlers/README.md b/Godeps/_workspace/src/github.com/gorilla/handlers/README.md
new file mode 100644
index 00000000..a340abe0
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/gorilla/handlers/README.md
@@ -0,0 +1,52 @@
+gorilla/handlers
+================
+[![GoDoc](https://godoc.org/github.com/gorilla/handlers?status.svg)](https://godoc.org/github.com/gorilla/handlers) [![Build Status](https://travis-ci.org/gorilla/handlers.svg?branch=master)](https://travis-ci.org/gorilla/handlers)
+
+Package handlers is a collection of handlers (aka "HTTP middleware") for use
+with Go's `net/http` package (or any framework supporting `http.Handler`), including:
+
+* `LoggingHandler` for logging HTTP requests in the Apache [Common Log
+  Format](http://httpd.apache.org/docs/2.2/logs.html#common).
+* `CombinedLoggingHandler` for logging HTTP requests in the Apache [Combined Log
+  Format](http://httpd.apache.org/docs/2.2/logs.html#combined) commonly used by
+  both Apache and nginx.
+* `CompressHandler` for gzipping responses.
+* `ContentTypeHandler` for validating requests against a list of accepted
+  content types.
+* `MethodHandler` for matching HTTP methods against handlers in a
+  `map[string]http.Handler`
+* `ProxyHeaders` for populating `r.RemoteAddr` and `r.URL.Scheme` based on the
+  `X-Forwarded-For`, `X-Real-IP`, `X-Forwarded-Proto` and RFC7239 `Forwarded`
+  headers when running a Go server behind a HTTP reverse proxy.
+* `CanonicalHost` for re-directing to the preferred host when handling multiple 
+  domains (i.e. multiple CNAME aliases).
+
+Other handlers are documented [on the Gorilla
+website](http://www.gorillatoolkit.org/pkg/handlers).
+
+## Example
+
+A simple example using `handlers.LoggingHandler` and `handlers.CompressHandler`:
+
+```go
+import (
+    "net/http"
+    "github.com/gorilla/handlers"
+)
+
+func main() {
+    r := http.NewServeMux()
+
+    // Only log requests to our admin dashboard to stdout
+    r.Handle("/admin", handlers.LoggingHandler(os.Stdout, http.HandlerFunc(ShowAdminDashboard)))
+    r.HandleFunc("/", ShowIndex)
+
+    // Wrap our server with our gzip handler to gzip compress all responses.
+    http.ListenAndServe(":8000", handlers.CompressHandler(r))
+}
+```
+
+## License
+
+BSD licensed. See the included LICENSE file for details.
+
diff --git a/Godeps/_workspace/src/github.com/gorilla/handlers/canonical.go b/Godeps/_workspace/src/github.com/gorilla/handlers/canonical.go
new file mode 100644
index 00000000..3961695c
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/gorilla/handlers/canonical.go
@@ -0,0 +1,71 @@
+package handlers
+
+import (
+	"net/http"
+	"net/url"
+	"strings"
+)
+
+type canonical struct {
+	h      http.Handler
+	domain string
+	code   int
+}
+
+// CanonicalHost is HTTP middleware that re-directs requests to the canonical
+// domain. It accepts a domain and a status code (e.g. 301 or 302) and
+// re-directs clients to this domain. The existing request path is maintained.
+//
+// Note: If the provided domain is considered invalid by url.Parse or otherwise
+// returns an empty scheme or host, clients are not re-directed.
+// not re-directed.
+//
+// Example:
+//
+//  r := mux.NewRouter()
+//  canonical := handlers.CanonicalHost("http://www.gorillatoolkit.org", 302)
+//  r.HandleFunc("/route", YourHandler)
+//
+//  log.Fatal(http.ListenAndServe(":7000", canonical(r)))
+//
+func CanonicalHost(domain string, code int) func(h http.Handler) http.Handler {
+	fn := func(h http.Handler) http.Handler {
+		return canonical{h, domain, code}
+	}
+
+	return fn
+}
+
+func (c canonical) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	dest, err := url.Parse(c.domain)
+	if err != nil {
+		// Call the next handler if the provided domain fails to parse.
+		c.h.ServeHTTP(w, r)
+		return
+	}
+
+	if dest.Scheme == "" || dest.Host == "" {
+		// Call the next handler if the scheme or host are empty.
+		// Note that url.Parse won't fail on in this case.
+		c.h.ServeHTTP(w, r)
+		return
+	}
+
+	if !strings.EqualFold(cleanHost(r.Host), dest.Host) {
+		// Re-build the destination URL
+		dest := dest.Scheme + "://" + dest.Host + r.URL.Path
+		http.Redirect(w, r, dest, c.code)
+	}
+
+	c.h.ServeHTTP(w, r)
+}
+
+// cleanHost cleans invalid Host headers by stripping anything after '/' or ' '.
+// This is backported from Go 1.5 (in response to issue #11206) and attempts to
+// mitigate malformed Host headers that do not match the format in RFC7230.
+func cleanHost(in string) string {
+	if i := strings.IndexAny(in, " /"); i != -1 {
+		return in[:i]
+	}
+	return in
+}
diff --git a/Godeps/_workspace/src/github.com/gorilla/handlers/canonical_test.go b/Godeps/_workspace/src/github.com/gorilla/handlers/canonical_test.go
new file mode 100644
index 00000000..50cbf3db
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/gorilla/handlers/canonical_test.go
@@ -0,0 +1,73 @@
+package handlers
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"testing"
+)
+
+func TestCleanHost(t *testing.T) {
+	tests := []struct {
+		in, want string
+	}{
+		{"www.google.com", "www.google.com"},
+		{"www.google.com foo", "www.google.com"},
+		{"www.google.com/foo", "www.google.com"},
+		{" first character is a space", ""},
+	}
+	for _, tt := range tests {
+		got := cleanHost(tt.in)
+		if tt.want != got {
+			t.Errorf("cleanHost(%q) = %q, want %q", tt.in, got, tt.want)
+		}
+	}
+}
+
+func TestCanonicalHost(t *testing.T) {
+	gorilla := "http://www.gorillatoolkit.org"
+
+	rr := httptest.NewRecorder()
+	r := newRequest("GET", "http://www.example.com/")
+
+	testHandler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {})
+
+	// Test a re-direct: should return a 302 Found.
+	CanonicalHost(gorilla, http.StatusFound)(testHandler).ServeHTTP(rr, r)
+
+	if rr.Code != http.StatusFound {
+		t.Fatalf("bad status: got %v want %v", rr.Code, http.StatusFound)
+	}
+
+	if rr.Header().Get("Location") != gorilla+r.URL.Path {
+		t.Fatalf("bad re-direct: got %q want %q", rr.Header().Get("Location"), gorilla+r.URL.Path)
+	}
+
+}
+
+func TestBadDomain(t *testing.T) {
+	rr := httptest.NewRecorder()
+	r := newRequest("GET", "http://www.example.com/")
+
+	testHandler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {})
+
+	// Test a bad domain - should return 200 OK.
+	CanonicalHost("%", http.StatusFound)(testHandler).ServeHTTP(rr, r)
+
+	if rr.Code != http.StatusOK {
+		t.Fatalf("bad status: got %v want %v", rr.Code, http.StatusOK)
+	}
+}
+
+func TestEmptyHost(t *testing.T) {
+	rr := httptest.NewRecorder()
+	r := newRequest("GET", "http://www.example.com/")
+
+	testHandler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {})
+
+	// Test a domain that returns an empty url.Host from url.Parse.
+	CanonicalHost("hello.com", http.StatusFound)(testHandler).ServeHTTP(rr, r)
+
+	if rr.Code != http.StatusOK {
+		t.Fatalf("bad status: got %v want %v", rr.Code, http.StatusOK)
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/gorilla/handlers/compress.go b/Godeps/_workspace/src/github.com/gorilla/handlers/compress.go
new file mode 100644
index 00000000..3d90e191
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/gorilla/handlers/compress.go
@@ -0,0 +1,84 @@
+// Copyright 2013 The Gorilla Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package handlers
+
+import (
+	"compress/flate"
+	"compress/gzip"
+	"io"
+	"net/http"
+	"strings"
+)
+
+type compressResponseWriter struct {
+	io.Writer
+	http.ResponseWriter
+	http.Hijacker
+}
+
+func (w *compressResponseWriter) Header() http.Header {
+	return w.ResponseWriter.Header()
+}
+
+func (w *compressResponseWriter) Write(b []byte) (int, error) {
+	h := w.ResponseWriter.Header()
+	if h.Get("Content-Type") == "" {
+		h.Set("Content-Type", http.DetectContentType(b))
+	}
+
+	return w.Writer.Write(b)
+}
+
+// CompressHandler gzip compresses HTTP responses for clients that support it
+// via the 'Accept-Encoding' header.
+func CompressHandler(h http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+	L:
+		for _, enc := range strings.Split(r.Header.Get("Accept-Encoding"), ",") {
+			switch strings.TrimSpace(enc) {
+			case "gzip":
+				w.Header().Set("Content-Encoding", "gzip")
+				w.Header().Add("Vary", "Accept-Encoding")
+
+				gw := gzip.NewWriter(w)
+				defer gw.Close()
+
+				h, hok := w.(http.Hijacker)
+				if !hok { /* w is not Hijacker... oh well... */
+					h = nil
+				}
+
+				w = &compressResponseWriter{
+					Writer:         gw,
+					ResponseWriter: w,
+					Hijacker:       h,
+				}
+
+				break L
+			case "deflate":
+				w.Header().Set("Content-Encoding", "deflate")
+				w.Header().Add("Vary", "Accept-Encoding")
+
+				fw, _ := flate.NewWriter(w, flate.DefaultCompression)
+				defer fw.Close()
+
+				h, hok := w.(http.Hijacker)
+				if !hok { /* w is not Hijacker... oh well... */
+					h = nil
+				}
+
+				w = &compressResponseWriter{
+					Writer:         fw,
+					ResponseWriter: w,
+					Hijacker:       h,
+				}
+
+				break L
+			}
+		}
+
+		h.ServeHTTP(w, r)
+	})
+}
diff --git a/Godeps/_workspace/src/github.com/gorilla/handlers/compress_test.go b/Godeps/_workspace/src/github.com/gorilla/handlers/compress_test.go
new file mode 100644
index 00000000..2661b399
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/gorilla/handlers/compress_test.go
@@ -0,0 +1,65 @@
+// Copyright 2013 The Gorilla Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package handlers
+
+import (
+	"io"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+)
+
+func compressedRequest(w *httptest.ResponseRecorder, compression string) {
+	CompressHandler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		for i := 0; i < 1024; i++ {
+			io.WriteString(w, "Gorilla!\n")
+		}
+	})).ServeHTTP(w, &http.Request{
+		Method: "GET",
+		Header: http.Header{
+			"Accept-Encoding": []string{compression},
+		},
+	})
+
+}
+
+func TestCompressHandlerGzip(t *testing.T) {
+	w := httptest.NewRecorder()
+	compressedRequest(w, "gzip")
+	if w.HeaderMap.Get("Content-Encoding") != "gzip" {
+		t.Fatalf("wrong content encoding, got %d want %d", w.HeaderMap.Get("Content-Encoding"), "gzip")
+	}
+	if w.HeaderMap.Get("Content-Type") != "text/plain; charset=utf-8" {
+		t.Fatalf("wrong content type, got %s want %s", w.HeaderMap.Get("Content-Type"), "text/plain; charset=utf-8")
+	}
+	if w.Body.Len() != 72 {
+		t.Fatalf("wrong len, got %d want %d", w.Body.Len(), 72)
+	}
+}
+
+func TestCompressHandlerDeflate(t *testing.T) {
+	w := httptest.NewRecorder()
+	compressedRequest(w, "deflate")
+	if w.HeaderMap.Get("Content-Encoding") != "deflate" {
+		t.Fatalf("wrong content encoding, got %d want %d", w.HeaderMap.Get("Content-Encoding"), "deflate")
+	}
+	if w.HeaderMap.Get("Content-Type") != "text/plain; charset=utf-8" {
+		t.Fatalf("wrong content type, got %s want %s", w.HeaderMap.Get("Content-Type"), "text/plain; charset=utf-8")
+	}
+	if w.Body.Len() != 54 {
+		t.Fatalf("wrong len, got %d want %d", w.Body.Len(), 54)
+	}
+}
+
+func TestCompressHandlerGzipDeflate(t *testing.T) {
+	w := httptest.NewRecorder()
+	compressedRequest(w, "gzip, deflate ")
+	if w.HeaderMap.Get("Content-Encoding") != "gzip" {
+		t.Fatalf("wrong content encoding, got %s want %s", w.HeaderMap.Get("Content-Encoding"), "gzip")
+	}
+	if w.HeaderMap.Get("Content-Type") != "text/plain; charset=utf-8" {
+		t.Fatalf("wrong content type, got %s want %s", w.HeaderMap.Get("Content-Type"), "text/plain; charset=utf-8")
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/gorilla/handlers/doc.go b/Godeps/_workspace/src/github.com/gorilla/handlers/doc.go
new file mode 100644
index 00000000..944e5a8a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/gorilla/handlers/doc.go
@@ -0,0 +1,9 @@
+/*
+Package handlers is a collection of handlers (aka "HTTP middleware") for use
+with Go's net/http package (or any framework supporting http.Handler).
+
+The package includes handlers for logging in standardised formats, compressing
+HTTP responses, validating content types and other useful tools for manipulating
+requests and responses.
+*/
+package handlers
diff --git a/Godeps/_workspace/src/github.com/gorilla/handlers/handlers.go b/Godeps/_workspace/src/github.com/gorilla/handlers/handlers.go
new file mode 100644
index 00000000..c3c20e5b
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/gorilla/handlers/handlers.go
@@ -0,0 +1,378 @@
+// Copyright 2013 The Gorilla Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package handlers
+
+import (
+	"bufio"
+	"fmt"
+	"io"
+	"net"
+	"net/http"
+	"net/url"
+	"sort"
+	"strconv"
+	"strings"
+	"time"
+	"unicode/utf8"
+)
+
+// MethodHandler is an http.Handler that dispatches to a handler whose key in the MethodHandler's
+// map matches the name of the HTTP request's method, eg: GET
+//
+// If the request's method is OPTIONS and OPTIONS is not a key in the map then the handler
+// responds with a status of 200 and sets the Allow header to a comma-separated list of
+// available methods.
+//
+// If the request's method doesn't match any of its keys the handler responds with
+// a status of 405, Method not allowed and sets the Allow header to a comma-separated list
+// of available methods.
+type MethodHandler map[string]http.Handler
+
+func (h MethodHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+	if handler, ok := h[req.Method]; ok {
+		handler.ServeHTTP(w, req)
+	} else {
+		allow := []string{}
+		for k := range h {
+			allow = append(allow, k)
+		}
+		sort.Strings(allow)
+		w.Header().Set("Allow", strings.Join(allow, ", "))
+		if req.Method == "OPTIONS" {
+			w.WriteHeader(http.StatusOK)
+		} else {
+			http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
+		}
+	}
+}
+
+// loggingHandler is the http.Handler implementation for LoggingHandlerTo and its friends
+type loggingHandler struct {
+	writer  io.Writer
+	handler http.Handler
+}
+
+// combinedLoggingHandler is the http.Handler implementation for LoggingHandlerTo and its friends
+type combinedLoggingHandler struct {
+	writer  io.Writer
+	handler http.Handler
+}
+
+func (h loggingHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+	t := time.Now()
+	logger := makeLogger(w)
+	url := *req.URL
+	h.handler.ServeHTTP(logger, req)
+	writeLog(h.writer, req, url, t, logger.Status(), logger.Size())
+}
+
+func (h combinedLoggingHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+	t := time.Now()
+	logger := makeLogger(w)
+	url := *req.URL
+	h.handler.ServeHTTP(logger, req)
+	writeCombinedLog(h.writer, req, url, t, logger.Status(), logger.Size())
+}
+
+func makeLogger(w http.ResponseWriter) loggingResponseWriter {
+	var logger loggingResponseWriter = &responseLogger{w: w}
+	if _, ok := w.(http.Hijacker); ok {
+		logger = &hijackLogger{responseLogger{w: w}}
+	}
+	h, ok1 := logger.(http.Hijacker)
+	c, ok2 := w.(http.CloseNotifier)
+	if ok1 && ok2 {
+		return hijackCloseNotifier{logger, h, c}
+	}
+	if ok2 {
+		return &closeNotifyWriter{logger, c}
+	}
+	return logger
+}
+
+type loggingResponseWriter interface {
+	http.ResponseWriter
+	http.Flusher
+	Status() int
+	Size() int
+}
+
+// responseLogger is wrapper of http.ResponseWriter that keeps track of its HTTP status
+// code and body size
+type responseLogger struct {
+	w      http.ResponseWriter
+	status int
+	size   int
+}
+
+func (l *responseLogger) Header() http.Header {
+	return l.w.Header()
+}
+
+func (l *responseLogger) Write(b []byte) (int, error) {
+	if l.status == 0 {
+		// The status will be StatusOK if WriteHeader has not been called yet
+		l.status = http.StatusOK
+	}
+	size, err := l.w.Write(b)
+	l.size += size
+	return size, err
+}
+
+func (l *responseLogger) WriteHeader(s int) {
+	l.w.WriteHeader(s)
+	l.status = s
+}
+
+func (l *responseLogger) Status() int {
+	return l.status
+}
+
+func (l *responseLogger) Size() int {
+	return l.size
+}
+
+func (l *responseLogger) Flush() {
+	f, ok := l.w.(http.Flusher)
+	if ok {
+		f.Flush()
+	}
+}
+
+type hijackLogger struct {
+	responseLogger
+}
+
+func (l *hijackLogger) Hijack() (net.Conn, *bufio.ReadWriter, error) {
+	h := l.responseLogger.w.(http.Hijacker)
+	conn, rw, err := h.Hijack()
+	if err == nil && l.responseLogger.status == 0 {
+		// The status will be StatusSwitchingProtocols if there was no error and WriteHeader has not been called yet
+		l.responseLogger.status = http.StatusSwitchingProtocols
+	}
+	return conn, rw, err
+}
+
+type closeNotifyWriter struct {
+	loggingResponseWriter
+	http.CloseNotifier
+}
+
+type hijackCloseNotifier struct {
+	loggingResponseWriter
+	http.Hijacker
+	http.CloseNotifier
+}
+
+const lowerhex = "0123456789abcdef"
+
+func appendQuoted(buf []byte, s string) []byte {
+	var runeTmp [utf8.UTFMax]byte
+	for width := 0; len(s) > 0; s = s[width:] {
+		r := rune(s[0])
+		width = 1
+		if r >= utf8.RuneSelf {
+			r, width = utf8.DecodeRuneInString(s)
+		}
+		if width == 1 && r == utf8.RuneError {
+			buf = append(buf, `\x`...)
+			buf = append(buf, lowerhex[s[0]>>4])
+			buf = append(buf, lowerhex[s[0]&0xF])
+			continue
+		}
+		if r == rune('"') || r == '\\' { // always backslashed
+			buf = append(buf, '\\')
+			buf = append(buf, byte(r))
+			continue
+		}
+		if strconv.IsPrint(r) {
+			n := utf8.EncodeRune(runeTmp[:], r)
+			buf = append(buf, runeTmp[:n]...)
+			continue
+		}
+		switch r {
+		case '\a':
+			buf = append(buf, `\a`...)
+		case '\b':
+			buf = append(buf, `\b`...)
+		case '\f':
+			buf = append(buf, `\f`...)
+		case '\n':
+			buf = append(buf, `\n`...)
+		case '\r':
+			buf = append(buf, `\r`...)
+		case '\t':
+			buf = append(buf, `\t`...)
+		case '\v':
+			buf = append(buf, `\v`...)
+		default:
+			switch {
+			case r < ' ':
+				buf = append(buf, `\x`...)
+				buf = append(buf, lowerhex[s[0]>>4])
+				buf = append(buf, lowerhex[s[0]&0xF])
+			case r > utf8.MaxRune:
+				r = 0xFFFD
+				fallthrough
+			case r < 0x10000:
+				buf = append(buf, `\u`...)
+				for s := 12; s >= 0; s -= 4 {
+					buf = append(buf, lowerhex[r>>uint(s)&0xF])
+				}
+			default:
+				buf = append(buf, `\U`...)
+				for s := 28; s >= 0; s -= 4 {
+					buf = append(buf, lowerhex[r>>uint(s)&0xF])
+				}
+			}
+		}
+	}
+	return buf
+
+}
+
+// buildCommonLogLine builds a log entry for req in Apache Common Log Format.
+// ts is the timestamp with which the entry should be logged.
+// status and size are used to provide the response HTTP status and size.
+func buildCommonLogLine(req *http.Request, url url.URL, ts time.Time, status int, size int) []byte {
+	username := "-"
+	if url.User != nil {
+		if name := url.User.Username(); name != "" {
+			username = name
+		}
+	}
+
+	host, _, err := net.SplitHostPort(req.RemoteAddr)
+
+	if err != nil {
+		host = req.RemoteAddr
+	}
+
+	uri := url.RequestURI()
+
+	buf := make([]byte, 0, 3*(len(host)+len(username)+len(req.Method)+len(uri)+len(req.Proto)+50)/2)
+	buf = append(buf, host...)
+	buf = append(buf, " - "...)
+	buf = append(buf, username...)
+	buf = append(buf, " ["...)
+	buf = append(buf, ts.Format("02/Jan/2006:15:04:05 -0700")...)
+	buf = append(buf, `] "`...)
+	buf = append(buf, req.Method...)
+	buf = append(buf, " "...)
+	buf = appendQuoted(buf, uri)
+	buf = append(buf, " "...)
+	buf = append(buf, req.Proto...)
+	buf = append(buf, `" `...)
+	buf = append(buf, strconv.Itoa(status)...)
+	buf = append(buf, " "...)
+	buf = append(buf, strconv.Itoa(size)...)
+	return buf
+}
+
+// writeLog writes a log entry for req to w in Apache Common Log Format.
+// ts is the timestamp with which the entry should be logged.
+// status and size are used to provide the response HTTP status and size.
+func writeLog(w io.Writer, req *http.Request, url url.URL, ts time.Time, status, size int) {
+	buf := buildCommonLogLine(req, url, ts, status, size)
+	buf = append(buf, '\n')
+	w.Write(buf)
+}
+
+// writeCombinedLog writes a log entry for req to w in Apache Combined Log Format.
+// ts is the timestamp with which the entry should be logged.
+// status and size are used to provide the response HTTP status and size.
+func writeCombinedLog(w io.Writer, req *http.Request, url url.URL, ts time.Time, status, size int) {
+	buf := buildCommonLogLine(req, url, ts, status, size)
+	buf = append(buf, ` "`...)
+	buf = appendQuoted(buf, req.Referer())
+	buf = append(buf, `" "`...)
+	buf = appendQuoted(buf, req.UserAgent())
+	buf = append(buf, '"', '\n')
+	w.Write(buf)
+}
+
+// CombinedLoggingHandler return a http.Handler that wraps h and logs requests to out in
+// Apache Combined Log Format.
+//
+// See http://httpd.apache.org/docs/2.2/logs.html#combined for a description of this format.
+//
+// LoggingHandler always sets the ident field of the log to -
+func CombinedLoggingHandler(out io.Writer, h http.Handler) http.Handler {
+	return combinedLoggingHandler{out, h}
+}
+
+// LoggingHandler return a http.Handler that wraps h and logs requests to out in
+// Apache Common Log Format (CLF).
+//
+// See http://httpd.apache.org/docs/2.2/logs.html#common for a description of this format.
+//
+// LoggingHandler always sets the ident field of the log to -
+func LoggingHandler(out io.Writer, h http.Handler) http.Handler {
+	return loggingHandler{out, h}
+}
+
+// isContentType validates the Content-Type header
+// is contentType. That is, its type and subtype match.
+func isContentType(h http.Header, contentType string) bool {
+	ct := h.Get("Content-Type")
+	if i := strings.IndexRune(ct, ';'); i != -1 {
+		ct = ct[0:i]
+	}
+	return ct == contentType
+}
+
+// ContentTypeHandler wraps and returns a http.Handler, validating the request content type
+// is acompatible with the contentTypes list.
+// It writes a HTTP 415 error if that fails.
+//
+// Only PUT, POST, and PATCH requests are considered.
+func ContentTypeHandler(h http.Handler, contentTypes ...string) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if !(r.Method == "PUT" || r.Method == "POST" || r.Method == "PATCH") {
+			h.ServeHTTP(w, r)
+			return
+		}
+
+		for _, ct := range contentTypes {
+			if isContentType(r.Header, ct) {
+				h.ServeHTTP(w, r)
+				return
+			}
+		}
+		http.Error(w, fmt.Sprintf("Unsupported content type %q; expected one of %q", r.Header.Get("Content-Type"), contentTypes), http.StatusUnsupportedMediaType)
+	})
+}
+
+const (
+	// HTTPMethodOverrideHeader is a commonly used
+	// http header to override a request method.
+	HTTPMethodOverrideHeader = "X-HTTP-Method-Override"
+	// HTTPMethodOverrideFormKey is a commonly used
+	// HTML form key to override a request method.
+	HTTPMethodOverrideFormKey = "_method"
+)
+
+// HTTPMethodOverrideHandler wraps and returns a http.Handler which checks for the X-HTTP-Method-Override header
+// or the _method form key, and overrides (if valid) request.Method with its value.
+//
+// This is especially useful for http clients that don't support many http verbs.
+// It isn't secure to override e.g a GET to a POST, so only POST requests are considered.
+// Likewise, the override method can only be a "write" method: PUT, PATCH or DELETE.
+//
+// Form method takes precedence over header method.
+func HTTPMethodOverrideHandler(h http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.Method == "POST" {
+			om := r.FormValue(HTTPMethodOverrideFormKey)
+			if om == "" {
+				om = r.Header.Get(HTTPMethodOverrideHeader)
+			}
+			if om == "PUT" || om == "PATCH" || om == "DELETE" {
+				r.Method = om
+			}
+		}
+		h.ServeHTTP(w, r)
+	})
+}
diff --git a/Godeps/_workspace/src/github.com/gorilla/handlers/handlers_test.go b/Godeps/_workspace/src/github.com/gorilla/handlers/handlers_test.go
new file mode 100644
index 00000000..94eeb035
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/gorilla/handlers/handlers_test.go
@@ -0,0 +1,305 @@
+// Copyright 2013 The Gorilla Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package handlers
+
+import (
+	"bytes"
+	"net"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"strings"
+	"testing"
+	"time"
+)
+
+const (
+	ok         = "ok\n"
+	notAllowed = "Method not allowed\n"
+)
+
+var okHandler = http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+	w.Write([]byte(ok))
+})
+
+func newRequest(method, url string) *http.Request {
+	req, err := http.NewRequest(method, url, nil)
+	if err != nil {
+		panic(err)
+	}
+	return req
+}
+
+func TestMethodHandler(t *testing.T) {
+	tests := []struct {
+		req     *http.Request
+		handler http.Handler
+		code    int
+		allow   string // Contents of the Allow header
+		body    string
+	}{
+		// No handlers
+		{newRequest("GET", "/foo"), MethodHandler{}, http.StatusMethodNotAllowed, "", notAllowed},
+		{newRequest("OPTIONS", "/foo"), MethodHandler{}, http.StatusOK, "", ""},
+
+		// A single handler
+		{newRequest("GET", "/foo"), MethodHandler{"GET": okHandler}, http.StatusOK, "", ok},
+		{newRequest("POST", "/foo"), MethodHandler{"GET": okHandler}, http.StatusMethodNotAllowed, "GET", notAllowed},
+
+		// Multiple handlers
+		{newRequest("GET", "/foo"), MethodHandler{"GET": okHandler, "POST": okHandler}, http.StatusOK, "", ok},
+		{newRequest("POST", "/foo"), MethodHandler{"GET": okHandler, "POST": okHandler}, http.StatusOK, "", ok},
+		{newRequest("DELETE", "/foo"), MethodHandler{"GET": okHandler, "POST": okHandler}, http.StatusMethodNotAllowed, "GET, POST", notAllowed},
+		{newRequest("OPTIONS", "/foo"), MethodHandler{"GET": okHandler, "POST": okHandler}, http.StatusOK, "GET, POST", ""},
+
+		// Override OPTIONS
+		{newRequest("OPTIONS", "/foo"), MethodHandler{"OPTIONS": okHandler}, http.StatusOK, "", ok},
+	}
+
+	for i, test := range tests {
+		rec := httptest.NewRecorder()
+		test.handler.ServeHTTP(rec, test.req)
+		if rec.Code != test.code {
+			t.Fatalf("%d: wrong code, got %d want %d", i, rec.Code, test.code)
+		}
+		if allow := rec.HeaderMap.Get("Allow"); allow != test.allow {
+			t.Fatalf("%d: wrong Allow, got %s want %s", i, allow, test.allow)
+		}
+		if body := rec.Body.String(); body != test.body {
+			t.Fatalf("%d: wrong body, got %q want %q", i, body, test.body)
+		}
+	}
+}
+
+func TestWriteLog(t *testing.T) {
+	loc, err := time.LoadLocation("Europe/Warsaw")
+	if err != nil {
+		panic(err)
+	}
+	ts := time.Date(1983, 05, 26, 3, 30, 45, 0, loc)
+
+	// A typical request with an OK response
+	req := newRequest("GET", "http://example.com")
+	req.RemoteAddr = "192.168.100.5"
+
+	buf := new(bytes.Buffer)
+	writeLog(buf, req, *req.URL, ts, http.StatusOK, 100)
+	log := buf.String()
+
+	expected := "192.168.100.5 - - [26/May/1983:03:30:45 +0200] \"GET / HTTP/1.1\" 200 100\n"
+	if log != expected {
+		t.Fatalf("wrong log, got %q want %q", log, expected)
+	}
+
+	// Request with an unauthorized user
+	req = newRequest("GET", "http://example.com")
+	req.RemoteAddr = "192.168.100.5"
+	req.URL.User = url.User("kamil")
+
+	buf.Reset()
+	writeLog(buf, req, *req.URL, ts, http.StatusUnauthorized, 500)
+	log = buf.String()
+
+	expected = "192.168.100.5 - kamil [26/May/1983:03:30:45 +0200] \"GET / HTTP/1.1\" 401 500\n"
+	if log != expected {
+		t.Fatalf("wrong log, got %q want %q", log, expected)
+	}
+
+	// Request with url encoded parameters
+	req = newRequest("GET", "http://example.com/test?abc=hello%20world&a=b%3F")
+	req.RemoteAddr = "192.168.100.5"
+
+	buf.Reset()
+	writeLog(buf, req, *req.URL, ts, http.StatusOK, 100)
+	log = buf.String()
+
+	expected = "192.168.100.5 - - [26/May/1983:03:30:45 +0200] \"GET /test?abc=hello%20world&a=b%3F HTTP/1.1\" 200 100\n"
+	if log != expected {
+		t.Fatalf("wrong log, got %q want %q", log, expected)
+	}
+}
+
+func TestWriteCombinedLog(t *testing.T) {
+	loc, err := time.LoadLocation("Europe/Warsaw")
+	if err != nil {
+		panic(err)
+	}
+	ts := time.Date(1983, 05, 26, 3, 30, 45, 0, loc)
+
+	// A typical request with an OK response
+	req := newRequest("GET", "http://example.com")
+	req.RemoteAddr = "192.168.100.5"
+	req.Header.Set("Referer", "http://example.com")
+	req.Header.Set(
+		"User-Agent",
+		"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_2) AppleWebKit/537.33 "+
+			"(KHTML, like Gecko) Chrome/27.0.1430.0 Safari/537.33",
+	)
+
+	buf := new(bytes.Buffer)
+	writeCombinedLog(buf, req, *req.URL, ts, http.StatusOK, 100)
+	log := buf.String()
+
+	expected := "192.168.100.5 - - [26/May/1983:03:30:45 +0200] \"GET / HTTP/1.1\" 200 100 \"http://example.com\" " +
+		"\"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_2) " +
+		"AppleWebKit/537.33 (KHTML, like Gecko) Chrome/27.0.1430.0 Safari/537.33\"\n"
+	if log != expected {
+		t.Fatalf("wrong log, got %q want %q", log, expected)
+	}
+
+	// Request with an unauthorized user
+	req.URL.User = url.User("kamil")
+
+	buf.Reset()
+	writeCombinedLog(buf, req, *req.URL, ts, http.StatusUnauthorized, 500)
+	log = buf.String()
+
+	expected = "192.168.100.5 - kamil [26/May/1983:03:30:45 +0200] \"GET / HTTP/1.1\" 401 500 \"http://example.com\" " +
+		"\"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_2) " +
+		"AppleWebKit/537.33 (KHTML, like Gecko) Chrome/27.0.1430.0 Safari/537.33\"\n"
+	if log != expected {
+		t.Fatalf("wrong log, got %q want %q", log, expected)
+	}
+
+	// Test with remote ipv6 address
+	req.RemoteAddr = "::1"
+
+	buf.Reset()
+	writeCombinedLog(buf, req, *req.URL, ts, http.StatusOK, 100)
+	log = buf.String()
+
+	expected = "::1 - kamil [26/May/1983:03:30:45 +0200] \"GET / HTTP/1.1\" 200 100 \"http://example.com\" " +
+		"\"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_2) " +
+		"AppleWebKit/537.33 (KHTML, like Gecko) Chrome/27.0.1430.0 Safari/537.33\"\n"
+	if log != expected {
+		t.Fatalf("wrong log, got %q want %q", log, expected)
+	}
+
+	// Test remote ipv6 addr, with port
+	req.RemoteAddr = net.JoinHostPort("::1", "65000")
+
+	buf.Reset()
+	writeCombinedLog(buf, req, *req.URL, ts, http.StatusOK, 100)
+	log = buf.String()
+
+	expected = "::1 - kamil [26/May/1983:03:30:45 +0200] \"GET / HTTP/1.1\" 200 100 \"http://example.com\" " +
+		"\"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_2) " +
+		"AppleWebKit/537.33 (KHTML, like Gecko) Chrome/27.0.1430.0 Safari/537.33\"\n"
+	if log != expected {
+		t.Fatalf("wrong log, got %q want %q", log, expected)
+	}
+}
+
+func TestLogPathRewrites(t *testing.T) {
+	var buf bytes.Buffer
+
+	handler := http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+		req.URL.Path = "/" // simulate http.StripPrefix and friends
+		w.WriteHeader(200)
+	})
+	logger := LoggingHandler(&buf, handler)
+
+	logger.ServeHTTP(httptest.NewRecorder(), newRequest("GET", "/subdir/asdf"))
+
+	if !strings.Contains(buf.String(), "GET /subdir/asdf HTTP") {
+		t.Fatalf("Got log %#v, wanted substring %#v", buf.String(), "GET /subdir/asdf HTTP")
+	}
+}
+
+func BenchmarkWriteLog(b *testing.B) {
+	loc, err := time.LoadLocation("Europe/Warsaw")
+	if err != nil {
+		b.Fatalf(err.Error())
+	}
+	ts := time.Date(1983, 05, 26, 3, 30, 45, 0, loc)
+
+	req := newRequest("GET", "http://example.com")
+	req.RemoteAddr = "192.168.100.5"
+
+	b.ResetTimer()
+
+	buf := &bytes.Buffer{}
+	for i := 0; i < b.N; i++ {
+		buf.Reset()
+		writeLog(buf, req, *req.URL, ts, http.StatusUnauthorized, 500)
+	}
+}
+
+func TestContentTypeHandler(t *testing.T) {
+	tests := []struct {
+		Method            string
+		AllowContentTypes []string
+		ContentType       string
+		Code              int
+	}{
+		{"POST", []string{"application/json"}, "application/json", http.StatusOK},
+		{"POST", []string{"application/json", "application/xml"}, "application/json", http.StatusOK},
+		{"POST", []string{"application/json"}, "application/json; charset=utf-8", http.StatusOK},
+		{"POST", []string{"application/json"}, "application/json+xxx", http.StatusUnsupportedMediaType},
+		{"POST", []string{"application/json"}, "text/plain", http.StatusUnsupportedMediaType},
+		{"GET", []string{"application/json"}, "", http.StatusOK},
+		{"GET", []string{}, "", http.StatusOK},
+	}
+	for _, test := range tests {
+		r, err := http.NewRequest(test.Method, "/", nil)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+
+		h := ContentTypeHandler(okHandler, test.AllowContentTypes...)
+		r.Header.Set("Content-Type", test.ContentType)
+		w := httptest.NewRecorder()
+		h.ServeHTTP(w, r)
+		if w.Code != test.Code {
+			t.Errorf("expected %d, got %d", test.Code, w.Code)
+		}
+	}
+}
+
+func TestHTTPMethodOverride(t *testing.T) {
+	var tests = []struct {
+		Method         string
+		OverrideMethod string
+		ExpectedMethod string
+	}{
+		{"POST", "PUT", "PUT"},
+		{"POST", "PATCH", "PATCH"},
+		{"POST", "DELETE", "DELETE"},
+		{"PUT", "DELETE", "PUT"},
+		{"GET", "GET", "GET"},
+		{"HEAD", "HEAD", "HEAD"},
+		{"GET", "PUT", "GET"},
+		{"HEAD", "DELETE", "HEAD"},
+	}
+
+	for _, test := range tests {
+		h := HTTPMethodOverrideHandler(okHandler)
+		reqs := make([]*http.Request, 0, 2)
+
+		rHeader, err := http.NewRequest(test.Method, "/", nil)
+		if err != nil {
+			t.Error(err)
+		}
+		rHeader.Header.Set(HTTPMethodOverrideHeader, test.OverrideMethod)
+		reqs = append(reqs, rHeader)
+
+		f := url.Values{HTTPMethodOverrideFormKey: []string{test.OverrideMethod}}
+		rForm, err := http.NewRequest(test.Method, "/", strings.NewReader(f.Encode()))
+		if err != nil {
+			t.Error(err)
+		}
+		rForm.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+		reqs = append(reqs, rForm)
+
+		for _, r := range reqs {
+			w := httptest.NewRecorder()
+			h.ServeHTTP(w, r)
+			if r.Method != test.ExpectedMethod {
+				t.Errorf("Expected %s, got %s", test.ExpectedMethod, r.Method)
+			}
+		}
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/gorilla/handlers/proxy_headers.go b/Godeps/_workspace/src/github.com/gorilla/handlers/proxy_headers.go
new file mode 100644
index 00000000..268de9c6
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/gorilla/handlers/proxy_headers.go
@@ -0,0 +1,113 @@
+package handlers
+
+import (
+	"net/http"
+	"regexp"
+	"strings"
+)
+
+var (
+	// De-facto standard header keys.
+	xForwardedFor   = http.CanonicalHeaderKey("X-Forwarded-For")
+	xRealIP         = http.CanonicalHeaderKey("X-Real-IP")
+	xForwardedProto = http.CanonicalHeaderKey("X-Forwarded-Scheme")
+)
+
+var (
+	// RFC7239 defines a new "Forwarded: " header designed to replace the
+	// existing use of X-Forwarded-* headers.
+	// e.g. Forwarded: for=192.0.2.60;proto=https;by=203.0.113.43
+	forwarded = http.CanonicalHeaderKey("Forwarded")
+	// Allows for a sub-match of the first value after 'for=' to the next
+	// comma, semi-colon or space. The match is case-insensitive.
+	forRegex = regexp.MustCompile(`(?i)(?:for=)([^(;|,| )]+)`)
+	// Allows for a sub-match for the first instance of scheme (http|https)
+	// prefixed by 'proto='. The match is case-insensitive.
+	protoRegex = regexp.MustCompile(`(?i)(?:proto=)(https|http)`)
+)
+
+// ProxyHeaders inspects common reverse proxy headers and sets the corresponding
+// fields in the HTTP request struct. These are X-Forwarded-For and X-Real-IP
+// for the remote (client) IP address, X-Forwarded-Proto for the scheme
+// (http|https) and the RFC7239 Forwarded header, which may include both client
+// IPs and schemes.
+//
+// NOTE: This middleware should only be used when behind a reverse
+// proxy like nginx, HAProxy or Apache. Reverse proxies that don't (or are
+// configured not to) strip these headers from client requests, or where these
+// headers are accepted "as is" from a remote client (e.g. when Go is not behind
+// a proxy), can manifest as a vulnerability if your application uses these
+// headers for validating the 'trustworthiness' of a request.
+func ProxyHeaders(h http.Handler) http.Handler {
+	fn := func(w http.ResponseWriter, r *http.Request) {
+		// Set the remote IP with the value passed from the proxy.
+		if fwd := getIP(r); fwd != "" {
+			r.RemoteAddr = fwd
+		}
+
+		// Set the scheme (proto) with the value passed from the proxy.
+		if scheme := getScheme(r); scheme != "" {
+			r.URL.Scheme = scheme
+		}
+
+		// Call the next handler in the chain.
+		h.ServeHTTP(w, r)
+	}
+
+	return http.HandlerFunc(fn)
+}
+
+// getIP retrieves the IP from the X-Forwarded-For, X-Real-IP and RFC7239
+// Forwarded headers (in that order).
+func getIP(r *http.Request) string {
+	var addr string
+
+	if fwd := r.Header.Get(xForwardedFor); fwd != "" {
+		// Only grab the first (client) address. Note that '192.168.0.1,
+		// 10.1.1.1' is a valid key for X-Forwarded-For where addresses after
+		// the first may represent forwarding proxies earlier in the chain.
+		s := strings.Index(fwd, ", ")
+		if s == -1 {
+			s = len(fwd)
+		}
+		addr = fwd[:s]
+	} else if fwd := r.Header.Get(xRealIP); fwd != "" {
+		// X-Real-IP should only contain one IP address (the client making the
+		// request).
+		addr = fwd
+	} else if fwd := r.Header.Get(forwarded); fwd != "" {
+		// match should contain at least two elements if the protocol was
+		// specified in the Forwarded header. The first element will always be
+		// the 'for=' capture, which we ignore. In the case of multiple IP
+		// addresses (for=8.8.8.8, 8.8.4.4,172.16.1.20 is valid) we only
+		// extract the first, which should be the client IP.
+		if match := forRegex.FindStringSubmatch(fwd); len(match) > 1 {
+			// IPv6 addresses in Forwarded headers are quoted-strings. We strip
+			// these quotes.
+			addr = strings.Trim(match[1], `"`)
+		}
+	}
+
+	return addr
+}
+
+// getScheme retrieves the scheme from the X-Forwarded-Proto and RFC7239
+// Forwarded headers (in that order).
+func getScheme(r *http.Request) string {
+	var scheme string
+
+	// Retrieve the scheme from X-Forwarded-Proto.
+	if proto := r.Header.Get(xForwardedProto); proto != "" {
+		scheme = strings.ToLower(proto)
+	} else if proto := r.Header.Get(forwarded); proto != "" {
+		// match should contain at least two elements if the protocol was
+		// specified in the Forwarded header. The first element will always be
+		// the 'proto=' capture, which we ignore. In the case of multiple proto
+		// parameters (invalid) we only extract the first.
+		if match := protoRegex.FindStringSubmatch(proto); len(match) > 1 {
+			scheme = strings.ToLower(match[1])
+		}
+	}
+
+	return scheme
+}
diff --git a/Godeps/_workspace/src/github.com/gorilla/handlers/proxy_headers_test.go b/Godeps/_workspace/src/github.com/gorilla/handlers/proxy_headers_test.go
new file mode 100644
index 00000000..85282ef7
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/gorilla/handlers/proxy_headers_test.go
@@ -0,0 +1,100 @@
+package handlers
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"testing"
+)
+
+type headerTable struct {
+	key      string // header key
+	val      string // header val
+	expected string // expected result
+}
+
+func TestGetIP(t *testing.T) {
+	headers := []headerTable{
+		{xForwardedFor, "8.8.8.8", "8.8.8.8"},                                         // Single address
+		{xForwardedFor, "8.8.8.8, 8.8.4.4", "8.8.8.8"},                                // Multiple
+		{xForwardedFor, "[2001:db8:cafe::17]:4711", "[2001:db8:cafe::17]:4711"},       // IPv6 address
+		{xForwardedFor, "", ""},                                                       // None
+		{xRealIP, "8.8.8.8", "8.8.8.8"},                                               // Single address
+		{xRealIP, "8.8.8.8, 8.8.4.4", "8.8.8.8, 8.8.4.4"},                             // Multiple
+		{xRealIP, "[2001:db8:cafe::17]:4711", "[2001:db8:cafe::17]:4711"},             // IPv6 address
+		{xRealIP, "", ""},                                                             // None
+		{forwarded, `for="_gazonk"`, "_gazonk"},                                       // Hostname
+		{forwarded, `For="[2001:db8:cafe::17]:4711`, `[2001:db8:cafe::17]:4711`},      // IPv6 address
+		{forwarded, `for=192.0.2.60;proto=http;by=203.0.113.43`, `192.0.2.60`},        // Multiple params
+		{forwarded, `for=192.0.2.43, for=198.51.100.17`, "192.0.2.43"},                // Multiple params
+		{forwarded, `for="workstation.local",for=198.51.100.17`, "workstation.local"}, // Hostname
+	}
+
+	for _, v := range headers {
+		req := &http.Request{
+			Header: http.Header{
+				v.key: []string{v.val},
+			}}
+		res := getIP(req)
+		if res != v.expected {
+			t.Fatalf("wrong header for %s: got %s want %s", v.key, res,
+				v.expected)
+		}
+	}
+}
+
+func TestGetScheme(t *testing.T) {
+	headers := []headerTable{
+		{xForwardedProto, "https", "https"},
+		{xForwardedProto, "http", "http"},
+		{xForwardedProto, "HTTP", "http"},
+		{forwarded, `For="[2001:db8:cafe::17]:4711`, ""},                      // No proto
+		{forwarded, `for=192.0.2.43, for=198.51.100.17;proto=https`, "https"}, // Multiple params before proto
+		{forwarded, `for=172.32.10.15; proto=https;by=127.0.0.1`, "https"},    // Space before proto
+		{forwarded, `for=192.0.2.60;proto=http;by=203.0.113.43`, "http"},      // Multiple params
+	}
+
+	for _, v := range headers {
+		req := &http.Request{
+			Header: http.Header{
+				v.key: []string{v.val},
+			},
+		}
+		res := getScheme(req)
+		if res != v.expected {
+			t.Fatalf("wrong header for %s: got %s want %s", v.key, res,
+				v.expected)
+		}
+	}
+}
+
+// Test the middleware end-to-end
+func TestProxyHeaders(t *testing.T) {
+	rr := httptest.NewRecorder()
+	r := newRequest("GET", "/")
+
+	r.Header.Set(xForwardedFor, "8.8.8.8")
+	r.Header.Set(xForwardedProto, "https")
+
+	var addr string
+	var proto string
+	ProxyHeaders(http.HandlerFunc(
+		func(w http.ResponseWriter, r *http.Request) {
+			addr = r.RemoteAddr
+			proto = r.URL.Scheme
+		})).ServeHTTP(rr, r)
+
+	if rr.Code != http.StatusOK {
+		t.Fatalf("bad status: got %d want %d", rr.Code, http.StatusOK)
+	}
+
+	if addr != r.Header.Get(xForwardedFor) {
+		t.Fatalf("wrong address: got %s want %s", addr,
+			r.Header.Get(xForwardedFor))
+	}
+
+	if proto != r.Header.Get(xForwardedProto) {
+		t.Fatalf("wrong address: got %s want %s", proto,
+			r.Header.Get(xForwardedProto))
+	}
+
+}
diff --git a/Godeps/_workspace/src/github.com/jonboulle/clockwork/.gitignore b/Godeps/_workspace/src/github.com/jonboulle/clockwork/.gitignore
new file mode 100644
index 00000000..010c242b
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/jonboulle/clockwork/.gitignore
@@ -0,0 +1,25 @@
+# Compiled Object files, Static and Dynamic libs (Shared Objects)
+*.o
+*.a
+*.so
+
+# Folders
+_obj
+_test
+
+# Architecture specific extensions/prefixes
+*.[568vq]
+[568vq].out
+
+*.cgo1.go
+*.cgo2.c
+_cgo_defun.c
+_cgo_gotypes.go
+_cgo_export.*
+
+_testmain.go
+
+*.exe
+*.test
+
+*.swp
diff --git a/Godeps/_workspace/src/github.com/jonboulle/clockwork/.travis.yml b/Godeps/_workspace/src/github.com/jonboulle/clockwork/.travis.yml
new file mode 100644
index 00000000..6a363c70
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/jonboulle/clockwork/.travis.yml
@@ -0,0 +1,3 @@
+language: go
+go:
+  - 1.3
diff --git a/Godeps/_workspace/src/github.com/jonboulle/clockwork/LICENSE b/Godeps/_workspace/src/github.com/jonboulle/clockwork/LICENSE
new file mode 100644
index 00000000..5c304d1a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/jonboulle/clockwork/LICENSE
@@ -0,0 +1,201 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/Godeps/_workspace/src/github.com/jonboulle/clockwork/README.md b/Godeps/_workspace/src/github.com/jonboulle/clockwork/README.md
new file mode 100644
index 00000000..d43a6c79
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/jonboulle/clockwork/README.md
@@ -0,0 +1,61 @@
+clockwork
+=========
+
+[![Build Status](https://travis-ci.org/jonboulle/clockwork.png?branch=master)](https://travis-ci.org/jonboulle/clockwork)
+[![godoc](https://godoc.org/github.com/jonboulle/clockwork?status.svg)](http://godoc.org/github.com/jonboulle/clockwork) 
+
+a simple fake clock for golang
+
+# Usage
+
+Replace uses of the `time` package with the `clockwork.Clock` interface instead.
+
+For example, instead of using `time.Sleep` directly:
+
+```
+func my_func() {
+	time.Sleep(3 * time.Second)
+	do_something()
+}
+```
+
+inject a clock and use its `Sleep` method instead:
+
+```
+func my_func(clock clockwork.Clock) {
+	clock.Sleep(3 * time.Second)
+	do_something()
+}
+```
+
+Now you can easily test `my_func` with a `FakeClock`:
+
+```
+func TestMyFunc(t *testing.T) {
+	c := clockwork.NewFakeClock()
+
+	// Start our sleepy function
+	my_func(c)
+
+	// Ensure we wait until my_func is sleeping
+	c.BlockUntil(1)
+
+	assert_state()
+
+	// Advance the FakeClock forward in time
+	c.Advance(3)
+
+	assert_state()
+}
+```
+
+and in production builds, simply inject the real clock instead:
+```
+my_func(clockwork.NewRealClock())
+```
+
+See [example_test.go](example_test.go) for a full example.
+
+# Credits
+
+clockwork is inspired by @wickman's [threaded fake clock](https://gist.github.com/wickman/3840816), and the [Golang playground](http://blog.golang.org/playground#Faking time)
diff --git a/Godeps/_workspace/src/github.com/jonboulle/clockwork/clockwork.go b/Godeps/_workspace/src/github.com/jonboulle/clockwork/clockwork.go
new file mode 100644
index 00000000..1f1045bc
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/jonboulle/clockwork/clockwork.go
@@ -0,0 +1,164 @@
+package clockwork
+
+import (
+	"sync"
+	"time"
+)
+
+// Clock provides an interface that packages can use instead of directly
+// using the time module, so that chronology-related behavior can be tested
+type Clock interface {
+	After(d time.Duration) <-chan time.Time
+	Sleep(d time.Duration)
+	Now() time.Time
+}
+
+// FakeClock provides an interface for a clock which can be
+// manually advanced through time
+type FakeClock interface {
+	Clock
+	// Advance advances the FakeClock to a new point in time, ensuring any existing
+	// sleepers are notified appropriately before returning
+	Advance(d time.Duration)
+	// BlockUntil will block until the FakeClock has the given number of
+	// sleepers (callers of Sleep or After)
+	BlockUntil(n int)
+}
+
+// NewRealClock returns a Clock which simply delegates calls to the actual time
+// package; it should be used by packages in production.
+func NewRealClock() Clock {
+	return &realClock{}
+}
+
+// NewFakeClock returns a FakeClock implementation which can be
+// manually advanced through time for testing.
+func NewFakeClock() FakeClock {
+	return &fakeClock{
+		l: sync.RWMutex{},
+
+		// use a fixture that does not fulfill Time.IsZero()
+		time: time.Date(1900, time.January, 1, 0, 0, 0, 0, time.UTC),
+	}
+}
+
+type realClock struct{}
+
+func (rc *realClock) After(d time.Duration) <-chan time.Time {
+	return time.After(d)
+}
+
+func (rc *realClock) Sleep(d time.Duration) {
+	time.Sleep(d)
+}
+
+func (rc *realClock) Now() time.Time {
+	return time.Now()
+}
+
+type fakeClock struct {
+	sleepers []*sleeper
+	blockers []*blocker
+	time     time.Time
+
+	l sync.RWMutex
+}
+
+// sleeper represents a caller of After or Sleep
+type sleeper struct {
+	until time.Time
+	done  chan time.Time
+}
+
+// blocker represents a caller of BlockUntil
+type blocker struct {
+	count int
+	ch    chan struct{}
+}
+
+// After mimics time.After; it waits for the given duration to elapse on the
+// fakeClock, then sends the current time on the returned channel.
+func (fc *fakeClock) After(d time.Duration) <-chan time.Time {
+	fc.l.Lock()
+	defer fc.l.Unlock()
+	now := fc.time
+	done := make(chan time.Time, 1)
+	if d.Nanoseconds() == 0 {
+		// special case - trigger immediately
+		done <- now
+	} else {
+		// otherwise, add to the set of sleepers
+		s := &sleeper{
+			until: now.Add(d),
+			done:  done,
+		}
+		fc.sleepers = append(fc.sleepers, s)
+		// and notify any blockers
+		fc.blockers = notifyBlockers(fc.blockers, len(fc.sleepers))
+	}
+	return done
+}
+
+// notifyBlockers notifies all the blockers waiting until the
+// given number of sleepers are waiting on the fakeClock. It
+// returns an updated slice of blockers (i.e. those still waiting)
+func notifyBlockers(blockers []*blocker, count int) (newBlockers []*blocker) {
+	for _, b := range blockers {
+		if b.count == count {
+			close(b.ch)
+		} else {
+			newBlockers = append(newBlockers, b)
+		}
+	}
+	return
+}
+
+// Sleep blocks until the given duration has passed on the fakeClock
+func (fc *fakeClock) Sleep(d time.Duration) {
+	<-fc.After(d)
+}
+
+// Time returns the current time of the fakeClock
+func (fc *fakeClock) Now() time.Time {
+	fc.l.Lock()
+	defer fc.l.Unlock()
+	return fc.time
+}
+
+// Advance advances fakeClock to a new point in time, ensuring channels from any
+// previous invocations of After are notified appropriately before returning
+func (fc *fakeClock) Advance(d time.Duration) {
+	fc.l.Lock()
+	defer fc.l.Unlock()
+	end := fc.time.Add(d)
+	var newSleepers []*sleeper
+	for _, s := range fc.sleepers {
+		if end.Sub(s.until) >= 0 {
+			s.done <- end
+		} else {
+			newSleepers = append(newSleepers, s)
+		}
+	}
+	fc.sleepers = newSleepers
+	fc.blockers = notifyBlockers(fc.blockers, len(fc.sleepers))
+	fc.time = end
+}
+
+// BlockUntil will block until the fakeClock has the given number of sleepers
+// (callers of Sleep or After)
+func (fc *fakeClock) BlockUntil(n int) {
+	fc.l.Lock()
+	// Fast path: current number of sleepers is what we're looking for
+	if len(fc.sleepers) == n {
+		fc.l.Unlock()
+		return
+	}
+	// Otherwise, set up a new blocker
+	b := &blocker{
+		count: n,
+		ch:    make(chan struct{}),
+	}
+	fc.blockers = append(fc.blockers, b)
+	fc.l.Unlock()
+	<-b.ch
+}
diff --git a/Godeps/_workspace/src/github.com/jonboulle/clockwork/clockwork_test.go b/Godeps/_workspace/src/github.com/jonboulle/clockwork/clockwork_test.go
new file mode 100644
index 00000000..dcf49002
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/jonboulle/clockwork/clockwork_test.go
@@ -0,0 +1,120 @@
+package clockwork
+
+import (
+	"reflect"
+	"testing"
+	"time"
+)
+
+func TestFakeClockAfter(t *testing.T) {
+	fc := &fakeClock{}
+
+	zero := fc.After(0)
+	select {
+	case <-zero:
+	default:
+		t.Errorf("zero did not return!")
+	}
+	one := fc.After(1)
+	two := fc.After(2)
+	six := fc.After(6)
+	ten := fc.After(10)
+	fc.Advance(1)
+	select {
+	case <-one:
+	default:
+		t.Errorf("one did not return!")
+	}
+	select {
+	case <-two:
+		t.Errorf("two returned prematurely!")
+	case <-six:
+		t.Errorf("six returned prematurely!")
+	case <-ten:
+		t.Errorf("ten returned prematurely!")
+	default:
+	}
+	fc.Advance(1)
+	select {
+	case <-two:
+	default:
+		t.Errorf("two did not return!")
+	}
+	select {
+	case <-six:
+		t.Errorf("six returned prematurely!")
+	case <-ten:
+		t.Errorf("ten returned prematurely!")
+	default:
+	}
+	fc.Advance(1)
+	select {
+	case <-six:
+		t.Errorf("six returned prematurely!")
+	case <-ten:
+		t.Errorf("ten returned prematurely!")
+	default:
+	}
+	fc.Advance(3)
+	select {
+	case <-six:
+	default:
+		t.Errorf("six did not return!")
+	}
+	select {
+	case <-ten:
+		t.Errorf("ten returned prematurely!")
+	default:
+	}
+	fc.Advance(100)
+	select {
+	case <-ten:
+	default:
+		t.Errorf("ten did not return!")
+	}
+}
+
+func TestNotifyBlockers(t *testing.T) {
+	b1 := &blocker{1, make(chan struct{})}
+	b2 := &blocker{2, make(chan struct{})}
+	b3 := &blocker{5, make(chan struct{})}
+	b4 := &blocker{10, make(chan struct{})}
+	b5 := &blocker{10, make(chan struct{})}
+	bs := []*blocker{b1, b2, b3, b4, b5}
+	bs1 := notifyBlockers(bs, 2)
+	if n := len(bs1); n != 4 {
+		t.Fatalf("got %d blockers, want %d", n, 4)
+	}
+	select {
+	case <-b2.ch:
+	case <-time.After(time.Second):
+		t.Fatalf("timed out waiting for channel close!")
+	}
+	bs2 := notifyBlockers(bs1, 10)
+	if n := len(bs2); n != 2 {
+		t.Fatalf("got %d blockers, want %d", n, 2)
+	}
+	select {
+	case <-b4.ch:
+	case <-time.After(time.Second):
+		t.Fatalf("timed out waiting for channel close!")
+	}
+	select {
+	case <-b5.ch:
+	case <-time.After(time.Second):
+		t.Fatalf("timed out waiting for channel close!")
+	}
+}
+
+func TestNewFakeClock(t *testing.T) {
+	fc := NewFakeClock()
+	now := fc.Now()
+	if now.IsZero() {
+		t.Fatalf("fakeClock.Now() fulfills IsZero")
+	}
+
+	now2 := fc.Now()
+	if !reflect.DeepEqual(now, now2) {
+		t.Fatalf("fakeClock.Now() returned different value: want=%#v got=%#v", now, now2)
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/jonboulle/clockwork/example_test.go b/Godeps/_workspace/src/github.com/jonboulle/clockwork/example_test.go
new file mode 100644
index 00000000..6a41bd86
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/jonboulle/clockwork/example_test.go
@@ -0,0 +1,49 @@
+package clockwork
+
+import (
+	"sync"
+	"testing"
+	"time"
+)
+
+// my_func is an example of a time-dependent function, using an
+// injected clock
+func my_func(clock Clock, i *int) {
+	clock.Sleep(3 * time.Second)
+	*i += 1
+}
+
+// assert_state is an example of a state assertion in a test
+func assert_state(t *testing.T, i, j int) {
+	if i != j {
+		t.Fatalf("i %d, j %d", i, j)
+	}
+}
+
+// TestMyFunc tests my_func's behaviour with a FakeClock
+func TestMyFunc(t *testing.T) {
+	var i int
+	c := NewFakeClock()
+
+	var wg sync.WaitGroup
+	wg.Add(1)
+	go func() {
+		my_func(c, &i)
+		wg.Done()
+	}()
+
+	// Wait until my_func is actually sleeping on the clock
+	c.BlockUntil(1)
+
+	// Assert the initial state
+	assert_state(t, i, 0)
+
+	// Now advance the clock forward in time
+	c.Advance(1 * time.Hour)
+
+	// Wait until the function completes
+	wg.Wait()
+
+	// Assert the final state
+	assert_state(t, i, 1)
+}
diff --git a/Godeps/_workspace/src/github.com/julienschmidt/httprouter/.travis.yml b/Godeps/_workspace/src/github.com/julienschmidt/httprouter/.travis.yml
new file mode 100644
index 00000000..a4d6cc53
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/julienschmidt/httprouter/.travis.yml
@@ -0,0 +1,8 @@
+sudo: false
+language: go
+go:
+  - 1.1
+  - 1.2
+  - 1.3
+  - 1.4
+  - tip
diff --git a/Godeps/_workspace/src/github.com/julienschmidt/httprouter/LICENSE b/Godeps/_workspace/src/github.com/julienschmidt/httprouter/LICENSE
new file mode 100644
index 00000000..b829abc8
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/julienschmidt/httprouter/LICENSE
@@ -0,0 +1,24 @@
+Copyright (c) 2013 Julien Schmidt. All rights reserved.
+
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * The names of the contributors may not be used to endorse or promote
+      products derived from this software without specific prior written
+      permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL JULIEN SCHMIDT BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/julienschmidt/httprouter/README.md b/Godeps/_workspace/src/github.com/julienschmidt/httprouter/README.md
new file mode 100644
index 00000000..9875c700
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/julienschmidt/httprouter/README.md
@@ -0,0 +1,323 @@
+# HttpRouter [![Build Status](https://travis-ci.org/julienschmidt/httprouter.png?branch=master)](https://travis-ci.org/julienschmidt/httprouter) [![Coverage](http://gocover.io/_badge/github.com/julienschmidt/httprouter?0)](http://gocover.io/github.com/julienschmidt/httprouter) [![GoDoc](http://godoc.org/github.com/julienschmidt/httprouter?status.png)](http://godoc.org/github.com/julienschmidt/httprouter)
+
+HttpRouter is a lightweight high performance HTTP request router
+(also called *multiplexer* or just *mux* for short) for [Go](http://golang.org/).
+
+In contrast to the [default mux](http://golang.org/pkg/net/http/#ServeMux) of Go's net/http package, this router supports
+variables in the routing pattern and matches against the request method.
+It also scales better.
+
+The router is optimized for high performance and a small memory footprint.
+It scales well even with very long paths and a large number of routes.
+A compressing dynamic trie (radix tree) structure is used for efficient matching.
+
+## Features
+**Only explicit matches:** With other routers, like [http.ServeMux](http://golang.org/pkg/net/http/#ServeMux),
+a requested URL path could match multiple patterns. Therefore they have some
+awkward pattern priority rules, like *longest match* or *first registered,
+first matched*. By design of this router, a request can only match exactly one
+or no route. As a result, there are also no unintended matches, which makes it
+great for SEO and improves the user experience.
+
+**Stop caring about trailing slashes:** Choose the URL style you like, the
+router automatically redirects the client if a trailing slash is missing or if
+there is one extra. Of course it only does so, if the new path has a handler.
+If you don't like it, you can [turn off this behavior](http://godoc.org/github.com/julienschmidt/httprouter#Router.RedirectTrailingSlash).
+
+**Path auto-correction:** Besides detecting the missing or additional trailing
+slash at no extra cost, the router can also fix wrong cases and remove
+superfluous path elements (like `../` or `//`).
+Is [CAPTAIN CAPS LOCK](http://www.urbandictionary.com/define.php?term=Captain+Caps+Lock) one of your users?
+HttpRouter can help him by making a case-insensitive look-up and redirecting him
+to the correct URL.
+
+**Parameters in your routing pattern:** Stop parsing the requested URL path,
+just give the path segment a name and the router delivers the dynamic value to
+you. Because of the design of the router, path parameters are very cheap.
+
+**Zero Garbage:** The matching and dispatching process generates zero bytes of
+garbage. In fact, the only heap allocations that are made, is by building the
+slice of the key-value pairs for path parameters. If the request path contains
+no parameters, not a single heap allocation is necessary.
+
+**Best Performance:** [Benchmarks speak for themselves](https://github.com/julienschmidt/go-http-routing-benchmark).
+See below for technical details of the implementation.
+
+**No more server crashes:** You can set a [Panic handler](http://godoc.org/github.com/julienschmidt/httprouter#Router.PanicHandler) to deal with panics
+occurring during handling a HTTP request. The router then recovers and lets the
+PanicHandler log what happened and deliver a nice error page.
+
+Of course you can also set **custom [NotFound](http://godoc.org/github.com/julienschmidt/httprouter#Router.NotFound) and  [MethodNotAllowed](http://godoc.org/github.com/julienschmidt/httprouter#Router.MethodNotAllowed) handlers** and [**serve static files**](http://godoc.org/github.com/julienschmidt/httprouter#Router.ServeFiles).
+
+## Usage
+This is just a quick introduction, view the [GoDoc](http://godoc.org/github.com/julienschmidt/httprouter) for details.
+
+Let's start with a trivial example:
+```go
+package main
+
+import (
+    "fmt"
+    "github.com/julienschmidt/httprouter"
+    "net/http"
+    "log"
+)
+
+func Index(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
+    fmt.Fprint(w, "Welcome!\n")
+}
+
+func Hello(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+    fmt.Fprintf(w, "hello, %s!\n", ps.ByName("name"))
+}
+
+func main() {
+    router := httprouter.New()
+    router.GET("/", Index)
+    router.GET("/hello/:name", Hello)
+
+    log.Fatal(http.ListenAndServe(":8080", router))
+}
+```
+
+### Named parameters
+As you can see, `:name` is a *named parameter*.
+The values are accessible via `httprouter.Params`, which is just a slice of `httprouter.Param`s.
+You can get the value of a parameter either by its index in the slice, or by using the `ByName(name)` method:
+`:name` can be retrived by `ByName("name")`.
+
+Named parameters only match a single path segment:
+```
+Pattern: /user/:user
+
+ /user/gordon              match
+ /user/you                 match
+ /user/gordon/profile      no match
+ /user/                    no match
+```
+
+**Note:** Since this router has only explicit matches, you can not register static routes and parameters for the same path segment. For example you can not register the patterns `/user/new` and `/user/:user` for the same request method at the same time. The routing of different request methods is independent from each other.
+
+### Catch-All parameters
+The second type are *catch-all* parameters and have the form `*name`.
+Like the name suggests, they match everything.
+Therefore they must always be at the **end** of the pattern:
+```
+Pattern: /src/*filepath
+
+ /src/                     match
+ /src/somefile.go          match
+ /src/subdir/somefile.go   match
+```
+
+## How does it work?
+The router relies on a tree structure which makes heavy use of *common prefixes*,
+it is basically a *compact* [*prefix tree*](http://en.wikipedia.org/wiki/Trie)
+(or just [*Radix tree*](http://en.wikipedia.org/wiki/Radix_tree)).
+Nodes with a common prefix also share a common parent. Here is a short example
+what the routing tree for the `GET` request method could look like:
+
+```
+Priority   Path             Handle
+9          \                *<1>
+3          ├s               nil
+2          |├earch\         *<2>
+1          |└upport\        *<3>
+2          ├blog\           *<4>
+1          |    └:post      nil
+1          |         └\     *<5>
+2          ├about-us\       *<6>
+1          |        └team\  *<7>
+1          └contact\        *<8>
+```
+Every `*<num>` represents the memory address of a handler function (a pointer).
+If you follow a path trough the tree from the root to the leaf, you get the
+complete route path, e.g `\blog\:post\`, where `:post` is just a placeholder
+([*parameter*](#named-parameters)) for an actual post name. Unlike hash-maps, a
+tree structure also allows us to use dynamic parts like the `:post` parameter,
+since we actually match against the routing patterns instead of just comparing
+hashes. [As benchmarks show](https://github.com/julienschmidt/go-http-routing-benchmark),
+this works very well and efficient.
+
+Since URL paths have a hierarchical structure and make use only of a limited set
+of characters (byte values), it is very likely that there are a lot of common
+prefixes. This allows us to easily reduce the routing into ever smaller problems.
+Moreover the router manages a separate tree for every request method.
+For one thing it is more space efficient than holding a method->handle map in
+every single node, for another thing is also allows us to greatly reduce the
+routing problem before even starting the look-up in the prefix-tree.
+
+For even better scalability, the child nodes on each tree level are ordered by
+priority, where the priority is just the number of handles registered in sub
+nodes (children, grandchildren, and so on..).
+This helps in two ways:
+
+1. Nodes which are part of the most routing paths are evaluated first. This
+helps to make as much routes as possible to be reachable as fast as possible.
+2. It is some sort of cost compensation. The longest reachable path (highest
+cost) can always be evaluated first. The following scheme visualizes the tree
+structure. Nodes are evaluated from top to bottom and from left to right.
+
+```
+├------------
+├---------
+├-----
+├----
+├--
+├--
+└-
+```
+
+
+## Why doesn't this work with http.Handler?
+**It does!** The router itself implements the http.Handler interface.
+Moreover the router provides convenient [adapters for http.Handler](http://godoc.org/github.com/julienschmidt/httprouter#Router.Handler)s and [http.HandlerFunc](http://godoc.org/github.com/julienschmidt/httprouter#Router.HandlerFunc)s
+which allows them to be used as a [httprouter.Handle](http://godoc.org/github.com/julienschmidt/httprouter#Router.Handle) when registering a route.
+The only disadvantage is, that no parameter values can be retrieved when a
+http.Handler or http.HandlerFunc is used, since there is no efficient way to
+pass the values with the existing function parameters.
+Therefore [httprouter.Handle](http://godoc.org/github.com/julienschmidt/httprouter#Router.Handle) has a third function parameter.
+
+Just try it out for yourself, the usage of HttpRouter is very straightforward. The package is compact and minimalistic, but also probably one of the easiest routers to set up.
+
+
+## Where can I find Middleware *X*?
+This package just provides a very efficient request router with a few extra
+features. The router is just a [http.Handler](http://golang.org/pkg/net/http/#Handler),
+you can chain any http.Handler compatible middleware before the router,
+for example the [Gorilla handlers](http://www.gorillatoolkit.org/pkg/handlers).
+Or you could [just write your own](http://justinas.org/writing-http-middleware-in-go/),
+it's very easy!
+
+Alternatively, you could try [a web framework based on HttpRouter](#web-frameworks-based-on-httprouter).
+
+### Multi-domain / Sub-domains
+Here is a quick example: Does your server serve multiple domains / hosts?
+You want to use sub-domains?
+Define a router per host!
+```go
+// We need an object that implements the http.Handler interface.
+// Therefore we need a type for which we implement the ServeHTTP method.
+// We just use a map here, in which we map host names (with port) to http.Handlers
+type HostSwitch map[string]http.Handler
+
+// Implement the ServerHTTP method on our new type
+func (hs HostSwitch) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	// Check if a http.Handler is registered for the given host.
+	// If yes, use it to handle the request.
+	if handler := hs[r.Host]; handler != nil {
+		handler.ServeHTTP(w, r)
+	} else {
+		// Handle host names for wich no handler is registered
+		http.Error(w, "Forbidden", 403) // Or Redirect?
+	}
+}
+
+func main() {
+	// Initialize a router as usual
+	router := httprouter.New()
+	router.GET("/", Index)
+	router.GET("/hello/:name", Hello)
+
+	// Make a new HostSwitch and insert the router (our http handler)
+	// for example.com and port 12345
+	hs := make(HostSwitch)
+	hs["example.com:12345"] = router
+
+	// Use the HostSwitch to listen and serve on port 12345
+	log.Fatal(http.ListenAndServe(":12345", hs))
+}
+```
+
+### Basic Authentication
+Another quick example: Basic Authentification (RFC 2617) for handles:
+
+```go
+package main
+
+import (
+    "bytes"
+    "encoding/base64"
+    "fmt"
+    "github.com/julienschmidt/httprouter"
+    "net/http"
+    "log"
+    "strings"
+)
+
+func BasicAuth(h httprouter.Handle, user, pass []byte) httprouter.Handle {
+	return func(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+		const basicAuthPrefix string = "Basic "
+
+		// Get the Basic Authentication credentials
+		auth := r.Header.Get("Authorization")
+		if strings.HasPrefix(auth, basicAuthPrefix) {
+			// Check credentials
+			payload, err := base64.StdEncoding.DecodeString(auth[len(basicAuthPrefix):])
+			if err == nil {
+				pair := bytes.SplitN(payload, []byte(":"), 2)
+				if len(pair) == 2 &&
+					bytes.Equal(pair[0], user) &&
+					bytes.Equal(pair[1], pass) {
+
+					// Delegate request to the given handle
+					h(w, r, ps)
+					return
+				}
+			}
+		}
+
+		// Request Basic Authentication otherwise
+		w.Header().Set("WWW-Authenticate", "Basic realm=Restricted")
+		http.Error(w, http.StatusText(http.StatusUnauthorized), http.StatusUnauthorized)
+	}
+}
+
+func Index(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
+    fmt.Fprint(w, "Not protected!\n")
+}
+
+func Protected(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
+    fmt.Fprint(w, "Protected!\n")
+}
+
+func main() {
+    user := []byte("gordon")
+    pass := []byte("secret!")
+    
+    router := httprouter.New()
+    router.GET("/", Index)
+    router.GET("/protected/", BasicAuth(Protected, user, pass))
+
+    log.Fatal(http.ListenAndServe(":8080", router))
+}
+```
+
+## Chaining with the NotFound handler
+
+**NOTE: It might be required to set [Router.HandleMethodNotAllowed](http://godoc.org/github.com/julienschmidt/httprouter#Router.HandleMethodNotAllowed) to `false` to avoid problems.**
+
+You can use another [http.HandlerFunc](http://golang.org/pkg/net/http/#HandlerFunc), for example another router, to handle requests which could not be matched by this router by using the [Router.NotFound](http://godoc.org/github.com/julienschmidt/httprouter#Router.NotFound) handler. This allows chaining.
+
+### Static files
+The `NotFound` handler can for example be used to serve static files from the root path `/` (like an index.html file along with other assets):
+```go
+// Serve static files from the ./public directory
+router.NotFound = http.FileServer(http.Dir("public")).ServeHTTP
+```
+
+But this approach sidesteps the strict core rules of this router to avoid routing problems. A cleaner approach is to use a distinct sub-path for serving files, like `/static/*filepath` or `/files/*filepath`.
+
+## Web Frameworks based on HttpRouter
+If the HttpRouter is a bit too minimalistic for you, you might try one of the following more high-level 3rd-party web frameworks building upon the HttpRouter package:
+* [Ace](https://github.com/plimble/ace): Blazing fast Go Web Framework
+* [api2go](https://github.com/univedo/api2go): A JSON API Implementation for Go
+* [Gin](https://github.com/gin-gonic/gin): Features a martini-like API with much better performance
+* [Goat](https://github.com/bahlo/goat): A minimalistic REST API server in Go
+* [Hikaru](https://github.com/najeira/hikaru): Supports standalone and Google AppEngine
+* [Hitch](https://github.com/nbio/hitch): Hitch ties httprouter, [httpcontext](https://github.com/nbio/httpcontext), and middleware up in a bow
+* [kami](https://github.com/guregu/kami): A tiny web framework using x/net/context
+* [Medeina](https://github.com/imdario/medeina): Inspired by Ruby's Roda and Cuba
+* [Neko](https://github.com/rocwong/neko): A lightweight web application framework for Golang
+* [Roxanna](https://github.com/iamthemuffinman/Roxanna): An amalgamation of httprouter, better logging, and hot reload
+* [siesta](https://github.com/VividCortex/siesta): Composable HTTP handlers with contexts
diff --git a/Godeps/_workspace/src/github.com/julienschmidt/httprouter/path.go b/Godeps/_workspace/src/github.com/julienschmidt/httprouter/path.go
new file mode 100644
index 00000000..486134db
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/julienschmidt/httprouter/path.go
@@ -0,0 +1,123 @@
+// Copyright 2013 Julien Schmidt. All rights reserved.
+// Based on the path package, Copyright 2009 The Go Authors.
+// Use of this source code is governed by a BSD-style license that can be found
+// in the LICENSE file.
+
+package httprouter
+
+// CleanPath is the URL version of path.Clean, it returns a canonical URL path
+// for p, eliminating . and .. elements.
+//
+// The following rules are applied iteratively until no further processing can
+// be done:
+//	1. Replace multiple slashes with a single slash.
+//	2. Eliminate each . path name element (the current directory).
+//	3. Eliminate each inner .. path name element (the parent directory)
+//	   along with the non-.. element that precedes it.
+//	4. Eliminate .. elements that begin a rooted path:
+//	   that is, replace "/.." by "/" at the beginning of a path.
+//
+// If the result of this process is an empty string, "/" is returned
+func CleanPath(p string) string {
+	// Turn empty string into "/"
+	if p == "" {
+		return "/"
+	}
+
+	n := len(p)
+	var buf []byte
+
+	// Invariants:
+	//      reading from path; r is index of next byte to process.
+	//      writing to buf; w is index of next byte to write.
+
+	// path must start with '/'
+	r := 1
+	w := 1
+
+	if p[0] != '/' {
+		r = 0
+		buf = make([]byte, n+1)
+		buf[0] = '/'
+	}
+
+	trailing := n > 2 && p[n-1] == '/'
+
+	// A bit more clunky without a 'lazybuf' like the path package, but the loop
+	// gets completely inlined (bufApp). So in contrast to the path package this
+	// loop has no expensive function calls (except 1x make)
+
+	for r < n {
+		switch {
+		case p[r] == '/':
+			// empty path element, trailing slash is added after the end
+			r++
+
+		case p[r] == '.' && r+1 == n:
+			trailing = true
+			r++
+
+		case p[r] == '.' && p[r+1] == '/':
+			// . element
+			r++
+
+		case p[r] == '.' && p[r+1] == '.' && (r+2 == n || p[r+2] == '/'):
+			// .. element: remove to last /
+			r += 2
+
+			if w > 1 {
+				// can backtrack
+				w--
+
+				if buf == nil {
+					for w > 1 && p[w] != '/' {
+						w--
+					}
+				} else {
+					for w > 1 && buf[w] != '/' {
+						w--
+					}
+				}
+			}
+
+		default:
+			// real path element.
+			// add slash if needed
+			if w > 1 {
+				bufApp(&buf, p, w, '/')
+				w++
+			}
+
+			// copy element
+			for r < n && p[r] != '/' {
+				bufApp(&buf, p, w, p[r])
+				w++
+				r++
+			}
+		}
+	}
+
+	// re-append trailing slash
+	if trailing && w > 1 {
+		bufApp(&buf, p, w, '/')
+		w++
+	}
+
+	if buf == nil {
+		return p[:w]
+	}
+	return string(buf[:w])
+}
+
+// internal helper to lazily create a buffer if necessary
+func bufApp(buf *[]byte, s string, w int, c byte) {
+	if *buf == nil {
+		if s[w] == c {
+			return
+		}
+
+		*buf = make([]byte, len(s))
+		copy(*buf, s[:w])
+	}
+	(*buf)[w] = c
+}
diff --git a/Godeps/_workspace/src/github.com/julienschmidt/httprouter/path_test.go b/Godeps/_workspace/src/github.com/julienschmidt/httprouter/path_test.go
new file mode 100644
index 00000000..c4ceda5d
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/julienschmidt/httprouter/path_test.go
@@ -0,0 +1,92 @@
+// Copyright 2013 Julien Schmidt. All rights reserved.
+// Based on the path package, Copyright 2009 The Go Authors.
+// Use of this source code is governed by a BSD-style license that can be found
+// in the LICENSE file.
+
+package httprouter
+
+import (
+	"runtime"
+	"testing"
+)
+
+var cleanTests = []struct {
+	path, result string
+}{
+	// Already clean
+	{"/", "/"},
+	{"/abc", "/abc"},
+	{"/a/b/c", "/a/b/c"},
+	{"/abc/", "/abc/"},
+	{"/a/b/c/", "/a/b/c/"},
+
+	// missing root
+	{"", "/"},
+	{"abc", "/abc"},
+	{"abc/def", "/abc/def"},
+	{"a/b/c", "/a/b/c"},
+
+	// Remove doubled slash
+	{"//", "/"},
+	{"/abc//", "/abc/"},
+	{"/abc/def//", "/abc/def/"},
+	{"/a/b/c//", "/a/b/c/"},
+	{"/abc//def//ghi", "/abc/def/ghi"},
+	{"//abc", "/abc"},
+	{"///abc", "/abc"},
+	{"//abc//", "/abc/"},
+
+	// Remove . elements
+	{".", "/"},
+	{"./", "/"},
+	{"/abc/./def", "/abc/def"},
+	{"/./abc/def", "/abc/def"},
+	{"/abc/.", "/abc/"},
+
+	// Remove .. elements
+	{"..", "/"},
+	{"../", "/"},
+	{"../../", "/"},
+	{"../..", "/"},
+	{"../../abc", "/abc"},
+	{"/abc/def/ghi/../jkl", "/abc/def/jkl"},
+	{"/abc/def/../ghi/../jkl", "/abc/jkl"},
+	{"/abc/def/..", "/abc"},
+	{"/abc/def/../..", "/"},
+	{"/abc/def/../../..", "/"},
+	{"/abc/def/../../..", "/"},
+	{"/abc/def/../../../ghi/jkl/../../../mno", "/mno"},
+
+	// Combinations
+	{"abc/./../def", "/def"},
+	{"abc//./../def", "/def"},
+	{"abc/../../././../def", "/def"},
+}
+
+func TestPathClean(t *testing.T) {
+	for _, test := range cleanTests {
+		if s := CleanPath(test.path); s != test.result {
+			t.Errorf("CleanPath(%q) = %q, want %q", test.path, s, test.result)
+		}
+		if s := CleanPath(test.result); s != test.result {
+			t.Errorf("CleanPath(%q) = %q, want %q", test.result, s, test.result)
+		}
+	}
+}
+
+func TestPathCleanMallocs(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping malloc count in short mode")
+	}
+	if runtime.GOMAXPROCS(0) > 1 {
+		t.Log("skipping AllocsPerRun checks; GOMAXPROCS>1")
+		return
+	}
+
+	for _, test := range cleanTests {
+		allocs := testing.AllocsPerRun(100, func() { CleanPath(test.result) })
+		if allocs > 0 {
+			t.Errorf("CleanPath(%q): %v allocs, want zero", test.result, allocs)
+		}
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/julienschmidt/httprouter/router.go b/Godeps/_workspace/src/github.com/julienschmidt/httprouter/router.go
new file mode 100644
index 00000000..155b871c
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/julienschmidt/httprouter/router.go
@@ -0,0 +1,363 @@
+// Copyright 2013 Julien Schmidt. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be found
+// in the LICENSE file.
+
+// Package httprouter is a trie based high performance HTTP request router.
+//
+// A trivial example is:
+//
+//  package main
+//
+//  import (
+//      "fmt"
+//      "github.com/julienschmidt/httprouter"
+//      "net/http"
+//      "log"
+//  )
+//
+//  func Index(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
+//      fmt.Fprint(w, "Welcome!\n")
+//  }
+//
+//  func Hello(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+//      fmt.Fprintf(w, "hello, %s!\n", ps.ByName("name"))
+//  }
+//
+//  func main() {
+//      router := httprouter.New()
+//      router.GET("/", Index)
+//      router.GET("/hello/:name", Hello)
+//
+//      log.Fatal(http.ListenAndServe(":8080", router))
+//  }
+//
+// The router matches incoming requests by the request method and the path.
+// If a handle is registered for this path and method, the router delegates the
+// request to that function.
+// For the methods GET, POST, PUT, PATCH and DELETE shortcut functions exist to
+// register handles, for all other methods router.Handle can be used.
+//
+// The registered path, against which the router matches incoming requests, can
+// contain two types of parameters:
+//  Syntax    Type
+//  :name     named parameter
+//  *name     catch-all parameter
+//
+// Named parameters are dynamic path segments. They match anything until the
+// next '/' or the path end:
+//  Path: /blog/:category/:post
+//
+//  Requests:
+//   /blog/go/request-routers            match: category="go", post="request-routers"
+//   /blog/go/request-routers/           no match, but the router would redirect
+//   /blog/go/                           no match
+//   /blog/go/request-routers/comments   no match
+//
+// Catch-all parameters match anything until the path end, including the
+// directory index (the '/' before the catch-all). Since they match anything
+// until the end, catch-all paramerters must always be the final path element.
+//  Path: /files/*filepath
+//
+//  Requests:
+//   /files/                             match: filepath="/"
+//   /files/LICENSE                      match: filepath="/LICENSE"
+//   /files/templates/article.html       match: filepath="/templates/article.html"
+//   /files                              no match, but the router would redirect
+//
+// The value of parameters is saved as a slice of the Param struct, consisting
+// each of a key and a value. The slice is passed to the Handle func as a third
+// parameter.
+// There are two ways to retrieve the value of a parameter:
+//  // by the name of the parameter
+//  user := ps.ByName("user") // defined by :user or *user
+//
+//  // by the index of the parameter. This way you can also get the name (key)
+//  thirdKey   := ps[2].Key   // the name of the 3rd parameter
+//  thirdValue := ps[2].Value // the value of the 3rd parameter
+package httprouter
+
+import (
+	"net/http"
+)
+
+// Handle is a function that can be registered to a route to handle HTTP
+// requests. Like http.HandlerFunc, but has a third parameter for the values of
+// wildcards (variables).
+type Handle func(http.ResponseWriter, *http.Request, Params)
+
+// Param is a single URL parameter, consisting of a key and a value.
+type Param struct {
+	Key   string
+	Value string
+}
+
+// Params is a Param-slice, as returned by the router.
+// The slice is ordered, the first URL parameter is also the first slice value.
+// It is therefore safe to read values by the index.
+type Params []Param
+
+// ByName returns the value of the first Param which key matches the given name.
+// If no matching Param is found, an empty string is returned.
+func (ps Params) ByName(name string) string {
+	for i := range ps {
+		if ps[i].Key == name {
+			return ps[i].Value
+		}
+	}
+	return ""
+}
+
+// Router is a http.Handler which can be used to dispatch requests to different
+// handler functions via configurable routes
+type Router struct {
+	trees map[string]*node
+
+	// Enables automatic redirection if the current route can't be matched but a
+	// handler for the path with (without) the trailing slash exists.
+	// For example if /foo/ is requested but a route only exists for /foo, the
+	// client is redirected to /foo with http status code 301 for GET requests
+	// and 307 for all other request methods.
+	RedirectTrailingSlash bool
+
+	// If enabled, the router tries to fix the current request path, if no
+	// handle is registered for it.
+	// First superfluous path elements like ../ or // are removed.
+	// Afterwards the router does a case-insensitive lookup of the cleaned path.
+	// If a handle can be found for this route, the router makes a redirection
+	// to the corrected path with status code 301 for GET requests and 307 for
+	// all other request methods.
+	// For example /FOO and /..//Foo could be redirected to /foo.
+	// RedirectTrailingSlash is independent of this option.
+	RedirectFixedPath bool
+
+	// If enabled, the router checks if another method is allowed for the
+	// current route, if the current request can not be routed.
+	// If this is the case, the request is answered with 'Method Not Allowed'
+	// and HTTP status code 405.
+	// If no other Method is allowed, the request is delegated to the NotFound
+	// handler.
+	HandleMethodNotAllowed bool
+
+	// Configurable http.HandlerFunc which is called when no matching route is
+	// found. If it is not set, http.NotFound is used.
+	NotFound http.HandlerFunc
+
+	// Configurable http.HandlerFunc which is called when a request
+	// cannot be routed and HandleMethodNotAllowed is true.
+	// If it is not set, http.Error with http.StatusMethodNotAllowed is used.
+	MethodNotAllowed http.HandlerFunc
+
+	// Function to handle panics recovered from http handlers.
+	// It should be used to generate a error page and return the http error code
+	// 500 (Internal Server Error).
+	// The handler can be used to keep your server from crashing because of
+	// unrecovered panics.
+	PanicHandler func(http.ResponseWriter, *http.Request, interface{})
+}
+
+// Make sure the Router conforms with the http.Handler interface
+var _ http.Handler = New()
+
+// New returns a new initialized Router.
+// Path auto-correction, including trailing slashes, is enabled by default.
+func New() *Router {
+	return &Router{
+		RedirectTrailingSlash:  true,
+		RedirectFixedPath:      true,
+		HandleMethodNotAllowed: true,
+	}
+}
+
+// GET is a shortcut for router.Handle("GET", path, handle)
+func (r *Router) GET(path string, handle Handle) {
+	r.Handle("GET", path, handle)
+}
+
+// HEAD is a shortcut for router.Handle("HEAD", path, handle)
+func (r *Router) HEAD(path string, handle Handle) {
+	r.Handle("HEAD", path, handle)
+}
+
+// OPTIONS is a shortcut for router.Handle("OPTIONS", path, handle)
+func (r *Router) OPTIONS(path string, handle Handle) {
+	r.Handle("OPTIONS", path, handle)
+}
+
+// POST is a shortcut for router.Handle("POST", path, handle)
+func (r *Router) POST(path string, handle Handle) {
+	r.Handle("POST", path, handle)
+}
+
+// PUT is a shortcut for router.Handle("PUT", path, handle)
+func (r *Router) PUT(path string, handle Handle) {
+	r.Handle("PUT", path, handle)
+}
+
+// PATCH is a shortcut for router.Handle("PATCH", path, handle)
+func (r *Router) PATCH(path string, handle Handle) {
+	r.Handle("PATCH", path, handle)
+}
+
+// DELETE is a shortcut for router.Handle("DELETE", path, handle)
+func (r *Router) DELETE(path string, handle Handle) {
+	r.Handle("DELETE", path, handle)
+}
+
+// Handle registers a new request handle with the given path and method.
+//
+// For GET, POST, PUT, PATCH and DELETE requests the respective shortcut
+// functions can be used.
+//
+// This function is intended for bulk loading and to allow the usage of less
+// frequently used, non-standardized or custom methods (e.g. for internal
+// communication with a proxy).
+func (r *Router) Handle(method, path string, handle Handle) {
+	if path[0] != '/' {
+		panic("path must begin with '/' in path '" + path + "'")
+	}
+
+	if r.trees == nil {
+		r.trees = make(map[string]*node)
+	}
+
+	root := r.trees[method]
+	if root == nil {
+		root = new(node)
+		r.trees[method] = root
+	}
+
+	root.addRoute(path, handle)
+}
+
+// Handler is an adapter which allows the usage of an http.Handler as a
+// request handle.
+func (r *Router) Handler(method, path string, handler http.Handler) {
+	r.Handle(method, path,
+		func(w http.ResponseWriter, req *http.Request, _ Params) {
+			handler.ServeHTTP(w, req)
+		},
+	)
+}
+
+// HandlerFunc is an adapter which allows the usage of an http.HandlerFunc as a
+// request handle.
+func (r *Router) HandlerFunc(method, path string, handler http.HandlerFunc) {
+	r.Handler(method, path, handler)
+}
+
+// ServeFiles serves files from the given file system root.
+// The path must end with "/*filepath", files are then served from the local
+// path /defined/root/dir/*filepath.
+// For example if root is "/etc" and *filepath is "passwd", the local file
+// "/etc/passwd" would be served.
+// Internally a http.FileServer is used, therefore http.NotFound is used instead
+// of the Router's NotFound handler.
+// To use the operating system's file system implementation,
+// use http.Dir:
+//     router.ServeFiles("/src/*filepath", http.Dir("/var/www"))
+func (r *Router) ServeFiles(path string, root http.FileSystem) {
+	if len(path) < 10 || path[len(path)-10:] != "/*filepath" {
+		panic("path must end with /*filepath in path '" + path + "'")
+	}
+
+	fileServer := http.FileServer(root)
+
+	r.GET(path, func(w http.ResponseWriter, req *http.Request, ps Params) {
+		req.URL.Path = ps.ByName("filepath")
+		fileServer.ServeHTTP(w, req)
+	})
+}
+
+func (r *Router) recv(w http.ResponseWriter, req *http.Request) {
+	if rcv := recover(); rcv != nil {
+		r.PanicHandler(w, req, rcv)
+	}
+}
+
+// Lookup allows the manual lookup of a method + path combo.
+// This is e.g. useful to build a framework around this router.
+// If the path was found, it returns the handle function and the path parameter
+// values. Otherwise the third return value indicates whether a redirection to
+// the same path with an extra / without the trailing slash should be performed.
+func (r *Router) Lookup(method, path string) (Handle, Params, bool) {
+	if root := r.trees[method]; root != nil {
+		return root.getValue(path)
+	}
+	return nil, nil, false
+}
+
+// ServeHTTP makes the router implement the http.Handler interface.
+func (r *Router) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+	if r.PanicHandler != nil {
+		defer r.recv(w, req)
+	}
+
+	if root := r.trees[req.Method]; root != nil {
+		path := req.URL.Path
+
+		if handle, ps, tsr := root.getValue(path); handle != nil {
+			handle(w, req, ps)
+			return
+		} else if req.Method != "CONNECT" && path != "/" {
+			code := 301 // Permanent redirect, request with GET method
+			if req.Method != "GET" {
+				// Temporary redirect, request with same method
+				// As of Go 1.3, Go does not support status code 308.
+				code = 307
+			}
+
+			if tsr && r.RedirectTrailingSlash {
+				if len(path) > 1 && path[len(path)-1] == '/' {
+					req.URL.Path = path[:len(path)-1]
+				} else {
+					req.URL.Path = path + "/"
+				}
+				http.Redirect(w, req, req.URL.String(), code)
+				return
+			}
+
+			// Try to fix the request path
+			if r.RedirectFixedPath {
+				fixedPath, found := root.findCaseInsensitivePath(
+					CleanPath(path),
+					r.RedirectTrailingSlash,
+				)
+				if found {
+					req.URL.Path = string(fixedPath)
+					http.Redirect(w, req, req.URL.String(), code)
+					return
+				}
+			}
+		}
+	}
+
+	// Handle 405
+	if r.HandleMethodNotAllowed {
+		for method := range r.trees {
+			// Skip the requested method - we already tried this one
+			if method == req.Method {
+				continue
+			}
+
+			handle, _, _ := r.trees[method].getValue(req.URL.Path)
+			if handle != nil {
+				if r.MethodNotAllowed != nil {
+					r.MethodNotAllowed(w, req)
+				} else {
+					http.Error(w,
+						http.StatusText(http.StatusMethodNotAllowed),
+						http.StatusMethodNotAllowed,
+					)
+				}
+				return
+			}
+		}
+	}
+
+	// Handle 404
+	if r.NotFound != nil {
+		r.NotFound(w, req)
+	} else {
+		http.NotFound(w, req)
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/julienschmidt/httprouter/router_test.go b/Godeps/_workspace/src/github.com/julienschmidt/httprouter/router_test.go
new file mode 100644
index 00000000..9dc62965
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/julienschmidt/httprouter/router_test.go
@@ -0,0 +1,378 @@
+// Copyright 2013 Julien Schmidt. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be found
+// in the LICENSE file.
+
+package httprouter
+
+import (
+	"errors"
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"reflect"
+	"testing"
+)
+
+type mockResponseWriter struct{}
+
+func (m *mockResponseWriter) Header() (h http.Header) {
+	return http.Header{}
+}
+
+func (m *mockResponseWriter) Write(p []byte) (n int, err error) {
+	return len(p), nil
+}
+
+func (m *mockResponseWriter) WriteString(s string) (n int, err error) {
+	return len(s), nil
+}
+
+func (m *mockResponseWriter) WriteHeader(int) {}
+
+func TestParams(t *testing.T) {
+	ps := Params{
+		Param{"param1", "value1"},
+		Param{"param2", "value2"},
+		Param{"param3", "value3"},
+	}
+	for i := range ps {
+		if val := ps.ByName(ps[i].Key); val != ps[i].Value {
+			t.Errorf("Wrong value for %s: Got %s; Want %s", ps[i].Key, val, ps[i].Value)
+		}
+	}
+	if val := ps.ByName("noKey"); val != "" {
+		t.Errorf("Expected empty string for not found key; got: %s", val)
+	}
+}
+
+func TestRouter(t *testing.T) {
+	router := New()
+
+	routed := false
+	router.Handle("GET", "/user/:name", func(w http.ResponseWriter, r *http.Request, ps Params) {
+		routed = true
+		want := Params{Param{"name", "gopher"}}
+		if !reflect.DeepEqual(ps, want) {
+			t.Fatalf("wrong wildcard values: want %v, got %v", want, ps)
+		}
+	})
+
+	w := new(mockResponseWriter)
+
+	req, _ := http.NewRequest("GET", "/user/gopher", nil)
+	router.ServeHTTP(w, req)
+
+	if !routed {
+		t.Fatal("routing failed")
+	}
+}
+
+type handlerStruct struct {
+	handeled *bool
+}
+
+func (h handlerStruct) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	*h.handeled = true
+}
+
+func TestRouterAPI(t *testing.T) {
+	var get, head, options, post, put, patch, delete, handler, handlerFunc bool
+
+	httpHandler := handlerStruct{&handler}
+
+	router := New()
+	router.GET("/GET", func(w http.ResponseWriter, r *http.Request, _ Params) {
+		get = true
+	})
+	router.HEAD("/GET", func(w http.ResponseWriter, r *http.Request, _ Params) {
+		head = true
+	})
+	router.OPTIONS("/GET", func(w http.ResponseWriter, r *http.Request, _ Params) {
+		options = true
+	})
+	router.POST("/POST", func(w http.ResponseWriter, r *http.Request, _ Params) {
+		post = true
+	})
+	router.PUT("/PUT", func(w http.ResponseWriter, r *http.Request, _ Params) {
+		put = true
+	})
+	router.PATCH("/PATCH", func(w http.ResponseWriter, r *http.Request, _ Params) {
+		patch = true
+	})
+	router.DELETE("/DELETE", func(w http.ResponseWriter, r *http.Request, _ Params) {
+		delete = true
+	})
+	router.Handler("GET", "/Handler", httpHandler)
+	router.HandlerFunc("GET", "/HandlerFunc", func(w http.ResponseWriter, r *http.Request) {
+		handlerFunc = true
+	})
+
+	w := new(mockResponseWriter)
+
+	r, _ := http.NewRequest("GET", "/GET", nil)
+	router.ServeHTTP(w, r)
+	if !get {
+		t.Error("routing GET failed")
+	}
+
+	r, _ = http.NewRequest("HEAD", "/GET", nil)
+	router.ServeHTTP(w, r)
+	if !head {
+		t.Error("routing HEAD failed")
+	}
+
+	r, _ = http.NewRequest("OPTIONS", "/GET", nil)
+	router.ServeHTTP(w, r)
+	if !options {
+		t.Error("routing OPTIONS failed")
+	}
+
+	r, _ = http.NewRequest("POST", "/POST", nil)
+	router.ServeHTTP(w, r)
+	if !post {
+		t.Error("routing POST failed")
+	}
+
+	r, _ = http.NewRequest("PUT", "/PUT", nil)
+	router.ServeHTTP(w, r)
+	if !put {
+		t.Error("routing PUT failed")
+	}
+
+	r, _ = http.NewRequest("PATCH", "/PATCH", nil)
+	router.ServeHTTP(w, r)
+	if !patch {
+		t.Error("routing PATCH failed")
+	}
+
+	r, _ = http.NewRequest("DELETE", "/DELETE", nil)
+	router.ServeHTTP(w, r)
+	if !delete {
+		t.Error("routing DELETE failed")
+	}
+
+	r, _ = http.NewRequest("GET", "/Handler", nil)
+	router.ServeHTTP(w, r)
+	if !handler {
+		t.Error("routing Handler failed")
+	}
+
+	r, _ = http.NewRequest("GET", "/HandlerFunc", nil)
+	router.ServeHTTP(w, r)
+	if !handlerFunc {
+		t.Error("routing HandlerFunc failed")
+	}
+}
+
+func TestRouterRoot(t *testing.T) {
+	router := New()
+	recv := catchPanic(func() {
+		router.GET("noSlashRoot", nil)
+	})
+	if recv == nil {
+		t.Fatal("registering path not beginning with '/' did not panic")
+	}
+}
+
+func TestRouterNotAllowed(t *testing.T) {
+	handlerFunc := func(_ http.ResponseWriter, _ *http.Request, _ Params) {}
+
+	router := New()
+	router.POST("/path", handlerFunc)
+
+	// Test not allowed
+	r, _ := http.NewRequest("GET", "/path", nil)
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, r)
+	if !(w.Code == http.StatusMethodNotAllowed) {
+		t.Errorf("NotAllowed handling failed: Code=%d, Header=%v", w.Code, w.Header())
+	}
+
+	w = httptest.NewRecorder()
+	responseText := "custom method"
+	router.MethodNotAllowed = func(w http.ResponseWriter, req *http.Request) {
+		w.WriteHeader(http.StatusTeapot)
+		w.Write([]byte(responseText))
+	}
+	router.ServeHTTP(w, r)
+	if got := w.Body.String(); !(got == responseText) {
+		t.Errorf("unexpected response got %q want %q", got, responseText)
+	}
+	if w.Code != http.StatusTeapot {
+		t.Errorf("unexpected response code %d want %d", w.Code, http.StatusTeapot)
+	}
+}
+
+func TestRouterNotFound(t *testing.T) {
+	handlerFunc := func(_ http.ResponseWriter, _ *http.Request, _ Params) {}
+
+	router := New()
+	router.GET("/path", handlerFunc)
+	router.GET("/dir/", handlerFunc)
+	router.GET("/", handlerFunc)
+
+	testRoutes := []struct {
+		route  string
+		code   int
+		header string
+	}{
+		{"/path/", 301, "map[Location:[/path]]"},   // TSR -/
+		{"/dir", 301, "map[Location:[/dir/]]"},     // TSR +/
+		{"", 301, "map[Location:[/]]"},             // TSR +/
+		{"/PATH", 301, "map[Location:[/path]]"},    // Fixed Case
+		{"/DIR/", 301, "map[Location:[/dir/]]"},    // Fixed Case
+		{"/PATH/", 301, "map[Location:[/path]]"},   // Fixed Case -/
+		{"/DIR", 301, "map[Location:[/dir/]]"},     // Fixed Case +/
+		{"/../path", 301, "map[Location:[/path]]"}, // CleanPath
+		{"/nope", 404, ""},                         // NotFound
+	}
+	for _, tr := range testRoutes {
+		r, _ := http.NewRequest("GET", tr.route, nil)
+		w := httptest.NewRecorder()
+		router.ServeHTTP(w, r)
+		if !(w.Code == tr.code && (w.Code == 404 || fmt.Sprint(w.Header()) == tr.header)) {
+			t.Errorf("NotFound handling route %s failed: Code=%d, Header=%v", tr.route, w.Code, w.Header())
+		}
+	}
+
+	// Test custom not found handler
+	var notFound bool
+	router.NotFound = func(rw http.ResponseWriter, r *http.Request) {
+		rw.WriteHeader(404)
+		notFound = true
+	}
+	r, _ := http.NewRequest("GET", "/nope", nil)
+	w := httptest.NewRecorder()
+	router.ServeHTTP(w, r)
+	if !(w.Code == 404 && notFound == true) {
+		t.Errorf("Custom NotFound handler failed: Code=%d, Header=%v", w.Code, w.Header())
+	}
+
+	// Test other method than GET (want 307 instead of 301)
+	router.PATCH("/path", handlerFunc)
+	r, _ = http.NewRequest("PATCH", "/path/", nil)
+	w = httptest.NewRecorder()
+	router.ServeHTTP(w, r)
+	if !(w.Code == 307 && fmt.Sprint(w.Header()) == "map[Location:[/path]]") {
+		t.Errorf("Custom NotFound handler failed: Code=%d, Header=%v", w.Code, w.Header())
+	}
+
+	// Test special case where no node for the prefix "/" exists
+	router = New()
+	router.GET("/a", handlerFunc)
+	r, _ = http.NewRequest("GET", "/", nil)
+	w = httptest.NewRecorder()
+	router.ServeHTTP(w, r)
+	if !(w.Code == 404) {
+		t.Errorf("NotFound handling route / failed: Code=%d", w.Code)
+	}
+}
+
+func TestRouterPanicHandler(t *testing.T) {
+	router := New()
+	panicHandled := false
+
+	router.PanicHandler = func(rw http.ResponseWriter, r *http.Request, p interface{}) {
+		panicHandled = true
+	}
+
+	router.Handle("PUT", "/user/:name", func(_ http.ResponseWriter, _ *http.Request, _ Params) {
+		panic("oops!")
+	})
+
+	w := new(mockResponseWriter)
+	req, _ := http.NewRequest("PUT", "/user/gopher", nil)
+
+	defer func() {
+		if rcv := recover(); rcv != nil {
+			t.Fatal("handling panic failed")
+		}
+	}()
+
+	router.ServeHTTP(w, req)
+
+	if !panicHandled {
+		t.Fatal("simulating failed")
+	}
+}
+
+func TestRouterLookup(t *testing.T) {
+	routed := false
+	wantHandle := func(_ http.ResponseWriter, _ *http.Request, _ Params) {
+		routed = true
+	}
+	wantParams := Params{Param{"name", "gopher"}}
+
+	router := New()
+
+	// try empty router first
+	handle, _, tsr := router.Lookup("GET", "/nope")
+	if handle != nil {
+		t.Fatalf("Got handle for unregistered pattern: %v", handle)
+	}
+	if tsr {
+		t.Error("Got wrong TSR recommendation!")
+	}
+
+	// insert route and try again
+	router.GET("/user/:name", wantHandle)
+
+	handle, params, tsr := router.Lookup("GET", "/user/gopher")
+	if handle == nil {
+		t.Fatal("Got no handle!")
+	} else {
+		handle(nil, nil, nil)
+		if !routed {
+			t.Fatal("Routing failed!")
+		}
+	}
+
+	if !reflect.DeepEqual(params, wantParams) {
+		t.Fatalf("Wrong parameter values: want %v, got %v", wantParams, params)
+	}
+
+	handle, _, tsr = router.Lookup("GET", "/user/gopher/")
+	if handle != nil {
+		t.Fatalf("Got handle for unregistered pattern: %v", handle)
+	}
+	if !tsr {
+		t.Error("Got no TSR recommendation!")
+	}
+
+	handle, _, tsr = router.Lookup("GET", "/nope")
+	if handle != nil {
+		t.Fatalf("Got handle for unregistered pattern: %v", handle)
+	}
+	if tsr {
+		t.Error("Got wrong TSR recommendation!")
+	}
+}
+
+type mockFileSystem struct {
+	opened bool
+}
+
+func (mfs *mockFileSystem) Open(name string) (http.File, error) {
+	mfs.opened = true
+	return nil, errors.New("this is just a mock")
+}
+
+func TestRouterServeFiles(t *testing.T) {
+	router := New()
+	mfs := &mockFileSystem{}
+
+	recv := catchPanic(func() {
+		router.ServeFiles("/noFilepath", mfs)
+	})
+	if recv == nil {
+		t.Fatal("registering path not ending with '*filepath' did not panic")
+	}
+
+	router.ServeFiles("/*filepath", mfs)
+	w := new(mockResponseWriter)
+	r, _ := http.NewRequest("GET", "/favicon.ico", nil)
+	router.ServeHTTP(w, r)
+	if !mfs.opened {
+		t.Error("serving file failed")
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/julienschmidt/httprouter/tree.go b/Godeps/_workspace/src/github.com/julienschmidt/httprouter/tree.go
new file mode 100644
index 00000000..a15bc2cb
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/julienschmidt/httprouter/tree.go
@@ -0,0 +1,555 @@
+// Copyright 2013 Julien Schmidt. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be found
+// in the LICENSE file.
+
+package httprouter
+
+import (
+	"strings"
+	"unicode"
+)
+
+func min(a, b int) int {
+	if a <= b {
+		return a
+	}
+	return b
+}
+
+func countParams(path string) uint8 {
+	var n uint
+	for i := 0; i < len(path); i++ {
+		if path[i] != ':' && path[i] != '*' {
+			continue
+		}
+		n++
+	}
+	if n >= 255 {
+		return 255
+	}
+	return uint8(n)
+}
+
+type nodeType uint8
+
+const (
+	static   nodeType = 0
+	param    nodeType = 1
+	catchAll nodeType = 2
+)
+
+type node struct {
+	path      string
+	wildChild bool
+	nType     nodeType
+	maxParams uint8
+	indices   string
+	children  []*node
+	handle    Handle
+	priority  uint32
+}
+
+// increments priority of the given child and reorders if necessary
+func (n *node) incrementChildPrio(pos int) int {
+	n.children[pos].priority++
+	prio := n.children[pos].priority
+
+	// adjust position (move to front)
+	newPos := pos
+	for newPos > 0 && n.children[newPos-1].priority < prio {
+		// swap node positions
+		tmpN := n.children[newPos-1]
+		n.children[newPos-1] = n.children[newPos]
+		n.children[newPos] = tmpN
+
+		newPos--
+	}
+
+	// build new index char string
+	if newPos != pos {
+		n.indices = n.indices[:newPos] + // unchanged prefix, might be empty
+			n.indices[pos:pos+1] + // the index char we move
+			n.indices[newPos:pos] + n.indices[pos+1:] // rest without char at 'pos'
+	}
+
+	return newPos
+}
+
+// addRoute adds a node with the given handle to the path.
+// Not concurrency-safe!
+func (n *node) addRoute(path string, handle Handle) {
+	fullPath := path
+	n.priority++
+	numParams := countParams(path)
+
+	// non-empty tree
+	if len(n.path) > 0 || len(n.children) > 0 {
+	walk:
+		for {
+			// Update maxParams of the current node
+			if numParams > n.maxParams {
+				n.maxParams = numParams
+			}
+
+			// Find the longest common prefix.
+			// This also implies that the common prefix contains no ':' or '*'
+			// since the existing key can't contain those chars.
+			i := 0
+			max := min(len(path), len(n.path))
+			for i < max && path[i] == n.path[i] {
+				i++
+			}
+
+			// Split edge
+			if i < len(n.path) {
+				child := node{
+					path:      n.path[i:],
+					wildChild: n.wildChild,
+					indices:   n.indices,
+					children:  n.children,
+					handle:    n.handle,
+					priority:  n.priority - 1,
+				}
+
+				// Update maxParams (max of all children)
+				for i := range child.children {
+					if child.children[i].maxParams > child.maxParams {
+						child.maxParams = child.children[i].maxParams
+					}
+				}
+
+				n.children = []*node{&child}
+				// []byte for proper unicode char conversion, see #65
+				n.indices = string([]byte{n.path[i]})
+				n.path = path[:i]
+				n.handle = nil
+				n.wildChild = false
+			}
+
+			// Make new node a child of this node
+			if i < len(path) {
+				path = path[i:]
+
+				if n.wildChild {
+					n = n.children[0]
+					n.priority++
+
+					// Update maxParams of the child node
+					if numParams > n.maxParams {
+						n.maxParams = numParams
+					}
+					numParams--
+
+					// Check if the wildcard matches
+					if len(path) >= len(n.path) && n.path == path[:len(n.path)] {
+						// check for longer wildcard, e.g. :name and :names
+						if len(n.path) >= len(path) || path[len(n.path)] == '/' {
+							continue walk
+						}
+					}
+
+					panic("path segment '" + path +
+						"' conflicts with existing wildcard '" + n.path +
+						"' in path '" + fullPath + "'")
+				}
+
+				c := path[0]
+
+				// slash after param
+				if n.nType == param && c == '/' && len(n.children) == 1 {
+					n = n.children[0]
+					n.priority++
+					continue walk
+				}
+
+				// Check if a child with the next path byte exists
+				for i := 0; i < len(n.indices); i++ {
+					if c == n.indices[i] {
+						i = n.incrementChildPrio(i)
+						n = n.children[i]
+						continue walk
+					}
+				}
+
+				// Otherwise insert it
+				if c != ':' && c != '*' {
+					// []byte for proper unicode char conversion, see #65
+					n.indices += string([]byte{c})
+					child := &node{
+						maxParams: numParams,
+					}
+					n.children = append(n.children, child)
+					n.incrementChildPrio(len(n.indices) - 1)
+					n = child
+				}
+				n.insertChild(numParams, path, fullPath, handle)
+				return
+
+			} else if i == len(path) { // Make node a (in-path) leaf
+				if n.handle != nil {
+					panic("a handle is already registered for path ''" + fullPath + "'")
+				}
+				n.handle = handle
+			}
+			return
+		}
+	} else { // Empty tree
+		n.insertChild(numParams, path, fullPath, handle)
+	}
+}
+
+func (n *node) insertChild(numParams uint8, path, fullPath string, handle Handle) {
+	var offset int // already handled bytes of the path
+
+	// find prefix until first wildcard (beginning with ':'' or '*'')
+	for i, max := 0, len(path); numParams > 0; i++ {
+		c := path[i]
+		if c != ':' && c != '*' {
+			continue
+		}
+
+		// find wildcard end (either '/' or path end)
+		end := i + 1
+		for end < max && path[end] != '/' {
+			switch path[end] {
+			// the wildcard name must not contain ':' and '*'
+			case ':', '*':
+				panic("only one wildcard per path segment is allowed, has: '" +
+					path[i:] + "' in path '" + fullPath + "'")
+			default:
+				end++
+			}
+		}
+
+		// check if this Node existing children which would be
+		// unreachable if we insert the wildcard here
+		if len(n.children) > 0 {
+			panic("wildcard route '" + path[i:end] +
+				"' conflicts with existing children in path '" + fullPath + "'")
+		}
+
+		// check if the wildcard has a name
+		if end-i < 2 {
+			panic("wildcards must be named with a non-empty name in path '" + fullPath + "'")
+		}
+
+		if c == ':' { // param
+			// split path at the beginning of the wildcard
+			if i > 0 {
+				n.path = path[offset:i]
+				offset = i
+			}
+
+			child := &node{
+				nType:     param,
+				maxParams: numParams,
+			}
+			n.children = []*node{child}
+			n.wildChild = true
+			n = child
+			n.priority++
+			numParams--
+
+			// if the path doesn't end with the wildcard, then there
+			// will be another non-wildcard subpath starting with '/'
+			if end < max {
+				n.path = path[offset:end]
+				offset = end
+
+				child := &node{
+					maxParams: numParams,
+					priority:  1,
+				}
+				n.children = []*node{child}
+				n = child
+			}
+
+		} else { // catchAll
+			if end != max || numParams > 1 {
+				panic("catch-all routes are only allowed at the end of the path in path '" + fullPath + "'")
+			}
+
+			if len(n.path) > 0 && n.path[len(n.path)-1] == '/' {
+				panic("catch-all conflicts with existing handle for the path segment root in path '" + fullPath + "'")
+			}
+
+			// currently fixed width 1 for '/'
+			i--
+			if path[i] != '/' {
+				panic("no / before catch-all in path '" + fullPath + "'")
+			}
+
+			n.path = path[offset:i]
+
+			// first node: catchAll node with empty path
+			child := &node{
+				wildChild: true,
+				nType:     catchAll,
+				maxParams: 1,
+			}
+			n.children = []*node{child}
+			n.indices = string(path[i])
+			n = child
+			n.priority++
+
+			// second node: node holding the variable
+			child = &node{
+				path:      path[i:],
+				nType:     catchAll,
+				maxParams: 1,
+				handle:    handle,
+				priority:  1,
+			}
+			n.children = []*node{child}
+
+			return
+		}
+	}
+
+	// insert remaining path part and handle to the leaf
+	n.path = path[offset:]
+	n.handle = handle
+}
+
+// Returns the handle registered with the given path (key). The values of
+// wildcards are saved to a map.
+// If no handle can be found, a TSR (trailing slash redirect) recommendation is
+// made if a handle exists with an extra (without the) trailing slash for the
+// given path.
+func (n *node) getValue(path string) (handle Handle, p Params, tsr bool) {
+walk: // Outer loop for walking the tree
+	for {
+		if len(path) > len(n.path) {
+			if path[:len(n.path)] == n.path {
+				path = path[len(n.path):]
+				// If this node does not have a wildcard (param or catchAll)
+				// child,  we can just look up the next child node and continue
+				// to walk down the tree
+				if !n.wildChild {
+					c := path[0]
+					for i := 0; i < len(n.indices); i++ {
+						if c == n.indices[i] {
+							n = n.children[i]
+							continue walk
+						}
+					}
+
+					// Nothing found.
+					// We can recommend to redirect to the same URL without a
+					// trailing slash if a leaf exists for that path.
+					tsr = (path == "/" && n.handle != nil)
+					return
+
+				}
+
+				// handle wildcard child
+				n = n.children[0]
+				switch n.nType {
+				case param:
+					// find param end (either '/' or path end)
+					end := 0
+					for end < len(path) && path[end] != '/' {
+						end++
+					}
+
+					// save param value
+					if p == nil {
+						// lazy allocation
+						p = make(Params, 0, n.maxParams)
+					}
+					i := len(p)
+					p = p[:i+1] // expand slice within preallocated capacity
+					p[i].Key = n.path[1:]
+					p[i].Value = path[:end]
+
+					// we need to go deeper!
+					if end < len(path) {
+						if len(n.children) > 0 {
+							path = path[end:]
+							n = n.children[0]
+							continue walk
+						}
+
+						// ... but we can't
+						tsr = (len(path) == end+1)
+						return
+					}
+
+					if handle = n.handle; handle != nil {
+						return
+					} else if len(n.children) == 1 {
+						// No handle found. Check if a handle for this path + a
+						// trailing slash exists for TSR recommendation
+						n = n.children[0]
+						tsr = (n.path == "/" && n.handle != nil)
+					}
+
+					return
+
+				case catchAll:
+					// save param value
+					if p == nil {
+						// lazy allocation
+						p = make(Params, 0, n.maxParams)
+					}
+					i := len(p)
+					p = p[:i+1] // expand slice within preallocated capacity
+					p[i].Key = n.path[2:]
+					p[i].Value = path
+
+					handle = n.handle
+					return
+
+				default:
+					panic("invalid node type")
+				}
+			}
+		} else if path == n.path {
+			// We should have reached the node containing the handle.
+			// Check if this node has a handle registered.
+			if handle = n.handle; handle != nil {
+				return
+			}
+
+			// No handle found. Check if a handle for this path + a
+			// trailing slash exists for trailing slash recommendation
+			for i := 0; i < len(n.indices); i++ {
+				if n.indices[i] == '/' {
+					n = n.children[i]
+					tsr = (len(n.path) == 1 && n.handle != nil) ||
+						(n.nType == catchAll && n.children[0].handle != nil)
+					return
+				}
+			}
+
+			return
+		}
+
+		// Nothing found. We can recommend to redirect to the same URL with an
+		// extra trailing slash if a leaf exists for that path
+		tsr = (path == "/") ||
+			(len(n.path) == len(path)+1 && n.path[len(path)] == '/' &&
+				path == n.path[:len(n.path)-1] && n.handle != nil)
+		return
+	}
+}
+
+// Makes a case-insensitive lookup of the given path and tries to find a handler.
+// It can optionally also fix trailing slashes.
+// It returns the case-corrected path and a bool indicating whether the lookup
+// was successful.
+func (n *node) findCaseInsensitivePath(path string, fixTrailingSlash bool) (ciPath []byte, found bool) {
+	ciPath = make([]byte, 0, len(path)+1) // preallocate enough memory
+
+	// Outer loop for walking the tree
+	for len(path) >= len(n.path) && strings.ToLower(path[:len(n.path)]) == strings.ToLower(n.path) {
+		path = path[len(n.path):]
+		ciPath = append(ciPath, n.path...)
+
+		if len(path) > 0 {
+			// If this node does not have a wildcard (param or catchAll) child,
+			// we can just look up the next child node and continue to walk down
+			// the tree
+			if !n.wildChild {
+				r := unicode.ToLower(rune(path[0]))
+				for i, index := range n.indices {
+					// must use recursive approach since both index and
+					// ToLower(index) could exist. We must check both.
+					if r == unicode.ToLower(index) {
+						out, found := n.children[i].findCaseInsensitivePath(path, fixTrailingSlash)
+						if found {
+							return append(ciPath, out...), true
+						}
+					}
+				}
+
+				// Nothing found. We can recommend to redirect to the same URL
+				// without a trailing slash if a leaf exists for that path
+				found = (fixTrailingSlash && path == "/" && n.handle != nil)
+				return
+			}
+
+			n = n.children[0]
+			switch n.nType {
+			case param:
+				// find param end (either '/' or path end)
+				k := 0
+				for k < len(path) && path[k] != '/' {
+					k++
+				}
+
+				// add param value to case insensitive path
+				ciPath = append(ciPath, path[:k]...)
+
+				// we need to go deeper!
+				if k < len(path) {
+					if len(n.children) > 0 {
+						path = path[k:]
+						n = n.children[0]
+						continue
+					}
+
+					// ... but we can't
+					if fixTrailingSlash && len(path) == k+1 {
+						return ciPath, true
+					}
+					return
+				}
+
+				if n.handle != nil {
+					return ciPath, true
+				} else if fixTrailingSlash && len(n.children) == 1 {
+					// No handle found. Check if a handle for this path + a
+					// trailing slash exists
+					n = n.children[0]
+					if n.path == "/" && n.handle != nil {
+						return append(ciPath, '/'), true
+					}
+				}
+				return
+
+			case catchAll:
+				return append(ciPath, path...), true
+
+			default:
+				panic("invalid node type")
+			}
+		} else {
+			// We should have reached the node containing the handle.
+			// Check if this node has a handle registered.
+			if n.handle != nil {
+				return ciPath, true
+			}
+
+			// No handle found.
+			// Try to fix the path by adding a trailing slash
+			if fixTrailingSlash {
+				for i := 0; i < len(n.indices); i++ {
+					if n.indices[i] == '/' {
+						n = n.children[i]
+						if (len(n.path) == 1 && n.handle != nil) ||
+							(n.nType == catchAll && n.children[0].handle != nil) {
+							return append(ciPath, '/'), true
+						}
+						return
+					}
+				}
+			}
+			return
+		}
+	}
+
+	// Nothing found.
+	// Try to fix the path by adding / removing a trailing slash
+	if fixTrailingSlash {
+		if path == "/" {
+			return ciPath, true
+		}
+		if len(path)+1 == len(n.path) && n.path[len(path)] == '/' &&
+			strings.ToLower(path) == strings.ToLower(n.path[:len(path)]) &&
+			n.handle != nil {
+			return append(ciPath, n.path...), true
+		}
+	}
+	return
+}
diff --git a/Godeps/_workspace/src/github.com/julienschmidt/httprouter/tree_test.go b/Godeps/_workspace/src/github.com/julienschmidt/httprouter/tree_test.go
new file mode 100644
index 00000000..64f26d1a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/julienschmidt/httprouter/tree_test.go
@@ -0,0 +1,611 @@
+// Copyright 2013 Julien Schmidt. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be found
+// in the LICENSE file.
+
+package httprouter
+
+import (
+	"fmt"
+	"net/http"
+	"reflect"
+	"strings"
+	"testing"
+)
+
+func printChildren(n *node, prefix string) {
+	fmt.Printf(" %02d:%02d %s%s[%d] %v %t %d \r\n", n.priority, n.maxParams, prefix, n.path, len(n.children), n.handle, n.wildChild, n.nType)
+	for l := len(n.path); l > 0; l-- {
+		prefix += " "
+	}
+	for _, child := range n.children {
+		printChildren(child, prefix)
+	}
+}
+
+// Used as a workaround since we can't compare functions or their adresses
+var fakeHandlerValue string
+
+func fakeHandler(val string) Handle {
+	return func(http.ResponseWriter, *http.Request, Params) {
+		fakeHandlerValue = val
+	}
+}
+
+type testRequests []struct {
+	path       string
+	nilHandler bool
+	route      string
+	ps         Params
+}
+
+func checkRequests(t *testing.T, tree *node, requests testRequests) {
+	for _, request := range requests {
+		handler, ps, _ := tree.getValue(request.path)
+
+		if handler == nil {
+			if !request.nilHandler {
+				t.Errorf("handle mismatch for route '%s': Expected non-nil handle", request.path)
+			}
+		} else if request.nilHandler {
+			t.Errorf("handle mismatch for route '%s': Expected nil handle", request.path)
+		} else {
+			handler(nil, nil, nil)
+			if fakeHandlerValue != request.route {
+				t.Errorf("handle mismatch for route '%s': Wrong handle (%s != %s)", request.path, fakeHandlerValue, request.route)
+			}
+		}
+
+		if !reflect.DeepEqual(ps, request.ps) {
+			t.Errorf("Params mismatch for route '%s'", request.path)
+		}
+	}
+}
+
+func checkPriorities(t *testing.T, n *node) uint32 {
+	var prio uint32
+	for i := range n.children {
+		prio += checkPriorities(t, n.children[i])
+	}
+
+	if n.handle != nil {
+		prio++
+	}
+
+	if n.priority != prio {
+		t.Errorf(
+			"priority mismatch for node '%s': is %d, should be %d",
+			n.path, n.priority, prio,
+		)
+	}
+
+	return prio
+}
+
+func checkMaxParams(t *testing.T, n *node) uint8 {
+	var maxParams uint8
+	for i := range n.children {
+		params := checkMaxParams(t, n.children[i])
+		if params > maxParams {
+			maxParams = params
+		}
+	}
+	if n.nType != static && !n.wildChild {
+		maxParams++
+	}
+
+	if n.maxParams != maxParams {
+		t.Errorf(
+			"maxParams mismatch for node '%s': is %d, should be %d",
+			n.path, n.maxParams, maxParams,
+		)
+	}
+
+	return maxParams
+}
+
+func TestCountParams(t *testing.T) {
+	if countParams("/path/:param1/static/*catch-all") != 2 {
+		t.Fail()
+	}
+	if countParams(strings.Repeat("/:param", 256)) != 255 {
+		t.Fail()
+	}
+}
+
+func TestTreeAddAndGet(t *testing.T) {
+	tree := &node{}
+
+	routes := [...]string{
+		"/hi",
+		"/contact",
+		"/co",
+		"/c",
+		"/a",
+		"/ab",
+		"/doc/",
+		"/doc/go_faq.html",
+		"/doc/go1.html",
+		"/α",
+		"/β",
+	}
+	for _, route := range routes {
+		tree.addRoute(route, fakeHandler(route))
+	}
+
+	//printChildren(tree, "")
+
+	checkRequests(t, tree, testRequests{
+		{"/a", false, "/a", nil},
+		{"/", true, "", nil},
+		{"/hi", false, "/hi", nil},
+		{"/contact", false, "/contact", nil},
+		{"/co", false, "/co", nil},
+		{"/con", true, "", nil},  // key mismatch
+		{"/cona", true, "", nil}, // key mismatch
+		{"/no", true, "", nil},   // no matching child
+		{"/ab", false, "/ab", nil},
+		{"/α", false, "/α", nil},
+		{"/β", false, "/β", nil},
+	})
+
+	checkPriorities(t, tree)
+	checkMaxParams(t, tree)
+}
+
+func TestTreeWildcard(t *testing.T) {
+	tree := &node{}
+
+	routes := [...]string{
+		"/",
+		"/cmd/:tool/:sub",
+		"/cmd/:tool/",
+		"/src/*filepath",
+		"/search/",
+		"/search/:query",
+		"/user_:name",
+		"/user_:name/about",
+		"/files/:dir/*filepath",
+		"/doc/",
+		"/doc/go_faq.html",
+		"/doc/go1.html",
+		"/info/:user/public",
+		"/info/:user/project/:project",
+	}
+	for _, route := range routes {
+		tree.addRoute(route, fakeHandler(route))
+	}
+
+	//printChildren(tree, "")
+
+	checkRequests(t, tree, testRequests{
+		{"/", false, "/", nil},
+		{"/cmd/test/", false, "/cmd/:tool/", Params{Param{"tool", "test"}}},
+		{"/cmd/test", true, "", Params{Param{"tool", "test"}}},
+		{"/cmd/test/3", false, "/cmd/:tool/:sub", Params{Param{"tool", "test"}, Param{"sub", "3"}}},
+		{"/src/", false, "/src/*filepath", Params{Param{"filepath", "/"}}},
+		{"/src/some/file.png", false, "/src/*filepath", Params{Param{"filepath", "/some/file.png"}}},
+		{"/search/", false, "/search/", nil},
+		{"/search/someth!ng+in+ünìcodé", false, "/search/:query", Params{Param{"query", "someth!ng+in+ünìcodé"}}},
+		{"/search/someth!ng+in+ünìcodé/", true, "", Params{Param{"query", "someth!ng+in+ünìcodé"}}},
+		{"/user_gopher", false, "/user_:name", Params{Param{"name", "gopher"}}},
+		{"/user_gopher/about", false, "/user_:name/about", Params{Param{"name", "gopher"}}},
+		{"/files/js/inc/framework.js", false, "/files/:dir/*filepath", Params{Param{"dir", "js"}, Param{"filepath", "/inc/framework.js"}}},
+		{"/info/gordon/public", false, "/info/:user/public", Params{Param{"user", "gordon"}}},
+		{"/info/gordon/project/go", false, "/info/:user/project/:project", Params{Param{"user", "gordon"}, Param{"project", "go"}}},
+	})
+
+	checkPriorities(t, tree)
+	checkMaxParams(t, tree)
+}
+
+func catchPanic(testFunc func()) (recv interface{}) {
+	defer func() {
+		recv = recover()
+	}()
+
+	testFunc()
+	return
+}
+
+type testRoute struct {
+	path     string
+	conflict bool
+}
+
+func testRoutes(t *testing.T, routes []testRoute) {
+	tree := &node{}
+
+	for _, route := range routes {
+		recv := catchPanic(func() {
+			tree.addRoute(route.path, nil)
+		})
+
+		if route.conflict {
+			if recv == nil {
+				t.Errorf("no panic for conflicting route '%s'", route.path)
+			}
+		} else if recv != nil {
+			t.Errorf("unexpected panic for route '%s': %v", route.path, recv)
+		}
+	}
+
+	//printChildren(tree, "")
+}
+
+func TestTreeWildcardConflict(t *testing.T) {
+	routes := []testRoute{
+		{"/cmd/:tool/:sub", false},
+		{"/cmd/vet", true},
+		{"/src/*filepath", false},
+		{"/src/*filepathx", true},
+		{"/src/", true},
+		{"/src1/", false},
+		{"/src1/*filepath", true},
+		{"/src2*filepath", true},
+		{"/search/:query", false},
+		{"/search/invalid", true},
+		{"/user_:name", false},
+		{"/user_x", true},
+		{"/user_:name", false},
+		{"/id:id", false},
+		{"/id/:id", true},
+	}
+	testRoutes(t, routes)
+}
+
+func TestTreeChildConflict(t *testing.T) {
+	routes := []testRoute{
+		{"/cmd/vet", false},
+		{"/cmd/:tool/:sub", true},
+		{"/src/AUTHORS", false},
+		{"/src/*filepath", true},
+		{"/user_x", false},
+		{"/user_:name", true},
+		{"/id/:id", false},
+		{"/id:id", true},
+		{"/:id", true},
+		{"/*filepath", true},
+	}
+	testRoutes(t, routes)
+}
+
+func TestTreeDupliatePath(t *testing.T) {
+	tree := &node{}
+
+	routes := [...]string{
+		"/",
+		"/doc/",
+		"/src/*filepath",
+		"/search/:query",
+		"/user_:name",
+	}
+	for _, route := range routes {
+		recv := catchPanic(func() {
+			tree.addRoute(route, fakeHandler(route))
+		})
+		if recv != nil {
+			t.Fatalf("panic inserting route '%s': %v", route, recv)
+		}
+
+		// Add again
+		recv = catchPanic(func() {
+			tree.addRoute(route, nil)
+		})
+		if recv == nil {
+			t.Fatalf("no panic while inserting duplicate route '%s", route)
+		}
+	}
+
+	//printChildren(tree, "")
+
+	checkRequests(t, tree, testRequests{
+		{"/", false, "/", nil},
+		{"/doc/", false, "/doc/", nil},
+		{"/src/some/file.png", false, "/src/*filepath", Params{Param{"filepath", "/some/file.png"}}},
+		{"/search/someth!ng+in+ünìcodé", false, "/search/:query", Params{Param{"query", "someth!ng+in+ünìcodé"}}},
+		{"/user_gopher", false, "/user_:name", Params{Param{"name", "gopher"}}},
+	})
+}
+
+func TestEmptyWildcardName(t *testing.T) {
+	tree := &node{}
+
+	routes := [...]string{
+		"/user:",
+		"/user:/",
+		"/cmd/:/",
+		"/src/*",
+	}
+	for _, route := range routes {
+		recv := catchPanic(func() {
+			tree.addRoute(route, nil)
+		})
+		if recv == nil {
+			t.Fatalf("no panic while inserting route with empty wildcard name '%s", route)
+		}
+	}
+}
+
+func TestTreeCatchAllConflict(t *testing.T) {
+	routes := []testRoute{
+		{"/src/*filepath/x", true},
+		{"/src2/", false},
+		{"/src2/*filepath/x", true},
+	}
+	testRoutes(t, routes)
+}
+
+func TestTreeCatchAllConflictRoot(t *testing.T) {
+	routes := []testRoute{
+		{"/", false},
+		{"/*filepath", true},
+	}
+	testRoutes(t, routes)
+}
+
+func TestTreeDoubleWildcard(t *testing.T) {
+	const panicMsg = "only one wildcard per path segment is allowed"
+
+	routes := [...]string{
+		"/:foo:bar",
+		"/:foo:bar/",
+		"/:foo*bar",
+	}
+
+	for _, route := range routes {
+		tree := &node{}
+		recv := catchPanic(func() {
+			tree.addRoute(route, nil)
+		})
+
+		if rs, ok := recv.(string); !ok || !strings.HasPrefix(rs, panicMsg) {
+			t.Fatalf(`"Expected panic "%s" for route '%s', got "%v"`, panicMsg, route, recv)
+		}
+	}
+}
+
+/*func TestTreeDuplicateWildcard(t *testing.T) {
+	tree := &node{}
+
+	routes := [...]string{
+		"/:id/:name/:id",
+	}
+	for _, route := range routes {
+		...
+	}
+}*/
+
+func TestTreeTrailingSlashRedirect(t *testing.T) {
+	tree := &node{}
+
+	routes := [...]string{
+		"/hi",
+		"/b/",
+		"/search/:query",
+		"/cmd/:tool/",
+		"/src/*filepath",
+		"/x",
+		"/x/y",
+		"/y/",
+		"/y/z",
+		"/0/:id",
+		"/0/:id/1",
+		"/1/:id/",
+		"/1/:id/2",
+		"/aa",
+		"/a/",
+		"/doc",
+		"/doc/go_faq.html",
+		"/doc/go1.html",
+		"/no/a",
+		"/no/b",
+		"/api/hello/:name",
+	}
+	for _, route := range routes {
+		recv := catchPanic(func() {
+			tree.addRoute(route, fakeHandler(route))
+		})
+		if recv != nil {
+			t.Fatalf("panic inserting route '%s': %v", route, recv)
+		}
+	}
+
+	//printChildren(tree, "")
+
+	tsrRoutes := [...]string{
+		"/hi/",
+		"/b",
+		"/search/gopher/",
+		"/cmd/vet",
+		"/src",
+		"/x/",
+		"/y",
+		"/0/go/",
+		"/1/go",
+		"/a",
+		"/doc/",
+	}
+	for _, route := range tsrRoutes {
+		handler, _, tsr := tree.getValue(route)
+		if handler != nil {
+			t.Fatalf("non-nil handler for TSR route '%s", route)
+		} else if !tsr {
+			t.Errorf("expected TSR recommendation for route '%s'", route)
+		}
+	}
+
+	noTsrRoutes := [...]string{
+		"/",
+		"/no",
+		"/no/",
+		"/_",
+		"/_/",
+		"/api/world/abc",
+	}
+	for _, route := range noTsrRoutes {
+		handler, _, tsr := tree.getValue(route)
+		if handler != nil {
+			t.Fatalf("non-nil handler for No-TSR route '%s", route)
+		} else if tsr {
+			t.Errorf("expected no TSR recommendation for route '%s'", route)
+		}
+	}
+}
+
+func TestTreeFindCaseInsensitivePath(t *testing.T) {
+	tree := &node{}
+
+	routes := [...]string{
+		"/hi",
+		"/b/",
+		"/ABC/",
+		"/search/:query",
+		"/cmd/:tool/",
+		"/src/*filepath",
+		"/x",
+		"/x/y",
+		"/y/",
+		"/y/z",
+		"/0/:id",
+		"/0/:id/1",
+		"/1/:id/",
+		"/1/:id/2",
+		"/aa",
+		"/a/",
+		"/doc",
+		"/doc/go_faq.html",
+		"/doc/go1.html",
+		"/doc/go/away",
+		"/no/a",
+		"/no/b",
+	}
+
+	for _, route := range routes {
+		recv := catchPanic(func() {
+			tree.addRoute(route, fakeHandler(route))
+		})
+		if recv != nil {
+			t.Fatalf("panic inserting route '%s': %v", route, recv)
+		}
+	}
+
+	// Check out == in for all registered routes
+	// With fixTrailingSlash = true
+	for _, route := range routes {
+		out, found := tree.findCaseInsensitivePath(route, true)
+		if !found {
+			t.Errorf("Route '%s' not found!", route)
+		} else if string(out) != route {
+			t.Errorf("Wrong result for route '%s': %s", route, string(out))
+		}
+	}
+	// With fixTrailingSlash = false
+	for _, route := range routes {
+		out, found := tree.findCaseInsensitivePath(route, false)
+		if !found {
+			t.Errorf("Route '%s' not found!", route)
+		} else if string(out) != route {
+			t.Errorf("Wrong result for route '%s': %s", route, string(out))
+		}
+	}
+
+	tests := []struct {
+		in    string
+		out   string
+		found bool
+		slash bool
+	}{
+		{"/HI", "/hi", true, false},
+		{"/HI/", "/hi", true, true},
+		{"/B", "/b/", true, true},
+		{"/B/", "/b/", true, false},
+		{"/abc", "/ABC/", true, true},
+		{"/abc/", "/ABC/", true, false},
+		{"/aBc", "/ABC/", true, true},
+		{"/aBc/", "/ABC/", true, false},
+		{"/abC", "/ABC/", true, true},
+		{"/abC/", "/ABC/", true, false},
+		{"/SEARCH/QUERY", "/search/QUERY", true, false},
+		{"/SEARCH/QUERY/", "/search/QUERY", true, true},
+		{"/CMD/TOOL/", "/cmd/TOOL/", true, false},
+		{"/CMD/TOOL", "/cmd/TOOL/", true, true},
+		{"/SRC/FILE/PATH", "/src/FILE/PATH", true, false},
+		{"/x/Y", "/x/y", true, false},
+		{"/x/Y/", "/x/y", true, true},
+		{"/X/y", "/x/y", true, false},
+		{"/X/y/", "/x/y", true, true},
+		{"/X/Y", "/x/y", true, false},
+		{"/X/Y/", "/x/y", true, true},
+		{"/Y/", "/y/", true, false},
+		{"/Y", "/y/", true, true},
+		{"/Y/z", "/y/z", true, false},
+		{"/Y/z/", "/y/z", true, true},
+		{"/Y/Z", "/y/z", true, false},
+		{"/Y/Z/", "/y/z", true, true},
+		{"/y/Z", "/y/z", true, false},
+		{"/y/Z/", "/y/z", true, true},
+		{"/Aa", "/aa", true, false},
+		{"/Aa/", "/aa", true, true},
+		{"/AA", "/aa", true, false},
+		{"/AA/", "/aa", true, true},
+		{"/aA", "/aa", true, false},
+		{"/aA/", "/aa", true, true},
+		{"/A/", "/a/", true, false},
+		{"/A", "/a/", true, true},
+		{"/DOC", "/doc", true, false},
+		{"/DOC/", "/doc", true, true},
+		{"/NO", "", false, true},
+		{"/DOC/GO", "", false, true},
+	}
+	// With fixTrailingSlash = true
+	for _, test := range tests {
+		out, found := tree.findCaseInsensitivePath(test.in, true)
+		if found != test.found || (found && (string(out) != test.out)) {
+			t.Errorf("Wrong result for '%s': got %s, %t; want %s, %t",
+				test.in, string(out), found, test.out, test.found)
+			return
+		}
+	}
+	// With fixTrailingSlash = false
+	for _, test := range tests {
+		out, found := tree.findCaseInsensitivePath(test.in, false)
+		if test.slash {
+			if found { // test needs a trailingSlash fix. It must not be found!
+				t.Errorf("Found without fixTrailingSlash: %s; got %s", test.in, string(out))
+			}
+		} else {
+			if found != test.found || (found && (string(out) != test.out)) {
+				t.Errorf("Wrong result for '%s': got %s, %t; want %s, %t",
+					test.in, string(out), found, test.out, test.found)
+				return
+			}
+		}
+	}
+}
+
+func TestTreeInvalidNodeType(t *testing.T) {
+	const panicMsg = "invalid node type"
+
+	tree := &node{}
+	tree.addRoute("/", fakeHandler("/"))
+	tree.addRoute("/:page", fakeHandler("/:page"))
+
+	// set invalid node type
+	tree.children[0].nType = 42
+
+	// normal lookup
+	recv := catchPanic(func() {
+		tree.getValue("/test")
+	})
+	if rs, ok := recv.(string); !ok || rs != panicMsg {
+		t.Fatalf("Expected panic '"+panicMsg+"', got '%v'", recv)
+	}
+
+	// case-insensitive lookup
+	recv = catchPanic(func() {
+		tree.findCaseInsensitivePath("/test", true)
+	})
+	if rs, ok := recv.(string); !ok || rs != panicMsg {
+		t.Fatalf("Expected panic '"+panicMsg+"', got '%v'", recv)
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/kylelemons/godebug/diff/diff.go b/Godeps/_workspace/src/github.com/kylelemons/godebug/diff/diff.go
new file mode 100644
index 00000000..8d7716b9
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/kylelemons/godebug/diff/diff.go
@@ -0,0 +1,133 @@
+// Copyright 2013 Google Inc.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package diff implements a linewise diff algorithm.
+package diff
+
+import (
+	"bytes"
+	"fmt"
+	"strings"
+)
+
+// Chunk represents a piece of the diff.  A chunk will not have both added and
+// deleted lines.  Equal lines are always after any added or deleted lines.
+// A Chunk may or may not have any lines in it, especially for the first or last
+// chunk in a computation.
+type Chunk struct {
+	Added   []string
+	Deleted []string
+	Equal   []string
+}
+
+// Diff returns a string containing a line-by-line unified diff of the linewise
+// changes required to make A into B.  Each line is prefixed with '+', '-', or
+// ' ' to indicate if it should be added, removed, or is correct respectively.
+func Diff(A, B string) string {
+	aLines := strings.Split(A, "\n")
+	bLines := strings.Split(B, "\n")
+
+	chunks := DiffChunks(aLines, bLines)
+
+	buf := new(bytes.Buffer)
+	for _, c := range chunks {
+		for _, line := range c.Added {
+			fmt.Fprintf(buf, "+%s\n", line)
+		}
+		for _, line := range c.Deleted {
+			fmt.Fprintf(buf, "-%s\n", line)
+		}
+		for _, line := range c.Equal {
+			fmt.Fprintf(buf, " %s\n", line)
+		}
+	}
+	return strings.TrimRight(buf.String(), "\n")
+}
+
+// DiffChunks uses an O(D(N+M)) shortest-edit-script algorithm
+// to compute the edits required from A to B and returns the
+// edit chunks.
+func DiffChunks(A, B []string) []Chunk {
+	// algorithm: http://www.xmailserver.org/diff2.pdf
+
+	N, M := len(A), len(B)
+	MAX := N + M
+	V := make([]int, 2*MAX+1)
+	Vs := make([][]int, 0, 8)
+
+	var D int
+dLoop:
+	for D = 0; D <= MAX; D++ {
+		for k := -D; k <= D; k += 2 {
+			var x int
+			if k == -D || (k != D && V[MAX+k-1] < V[MAX+k+1]) {
+				x = V[MAX+k+1]
+			} else {
+				x = V[MAX+k-1] + 1
+			}
+			y := x - k
+			for x < N && y < M && A[x] == B[y] {
+				x++
+				y++
+			}
+			V[MAX+k] = x
+			if x >= N && y >= M {
+				Vs = append(Vs, append(make([]int, 0, len(V)), V...))
+				break dLoop
+			}
+		}
+		Vs = append(Vs, append(make([]int, 0, len(V)), V...))
+	}
+	if D == 0 {
+		return nil
+	}
+	chunks := make([]Chunk, D+1)
+
+	x, y := N, M
+	for d := D; d > 0; d-- {
+		V := Vs[d]
+		k := x - y
+		insert := k == -d || (k != d && V[MAX+k-1] < V[MAX+k+1])
+
+		x1 := V[MAX+k]
+		var x0, xM, kk int
+		if insert {
+			kk = k + 1
+			x0 = V[MAX+kk]
+			xM = x0
+		} else {
+			kk = k - 1
+			x0 = V[MAX+kk]
+			xM = x0 + 1
+		}
+		y0 := x0 - kk
+
+		var c Chunk
+		if insert {
+			c.Added = B[y0:][:1]
+		} else {
+			c.Deleted = A[x0:][:1]
+		}
+		if xM < x1 {
+			c.Equal = A[xM:][:x1-xM]
+		}
+
+		x, y = x0, y0
+		chunks[d] = c
+	}
+	if x > 0 {
+		chunks[0].Equal = A[:x]
+	}
+	return chunks
+}
diff --git a/Godeps/_workspace/src/github.com/kylelemons/godebug/diff/diff_test.go b/Godeps/_workspace/src/github.com/kylelemons/godebug/diff/diff_test.go
new file mode 100644
index 00000000..ed3cb9ab
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/kylelemons/godebug/diff/diff_test.go
@@ -0,0 +1,120 @@
+// Copyright 2013 Google Inc.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package diff
+
+import (
+	"fmt"
+	"reflect"
+	"strings"
+	"testing"
+)
+
+func TestDiff(t *testing.T) {
+	tests := []struct {
+		desc   string
+		A, B   []string
+		chunks []Chunk
+	}{
+		{
+			desc: "constitution",
+			A: []string{
+				"We the People of the United States, in Order to form a more perfect Union,",
+				"establish Justice, insure domestic Tranquility, provide for the common defence,",
+				"and secure the Blessings of Liberty to ourselves",
+				"and our Posterity, do ordain and establish this Constitution for the United",
+				"States of America.",
+			},
+			B: []string{
+				"We the People of the United States, in Order to form a more perfect Union,",
+				"establish Justice, insure domestic Tranquility, provide for the common defence,",
+				"promote the general Welfare, and secure the Blessings of Liberty to ourselves",
+				"and our Posterity, do ordain and establish this Constitution for the United",
+				"States of America.",
+			},
+			chunks: []Chunk{
+				0: {
+					Equal: []string{
+						"We the People of the United States, in Order to form a more perfect Union,",
+						"establish Justice, insure domestic Tranquility, provide for the common defence,",
+					},
+				},
+				1: {
+					Deleted: []string{
+						"and secure the Blessings of Liberty to ourselves",
+					},
+				},
+				2: {
+					Added: []string{
+						"promote the general Welfare, and secure the Blessings of Liberty to ourselves",
+					},
+					Equal: []string{
+						"and our Posterity, do ordain and establish this Constitution for the United",
+						"States of America.",
+					},
+				},
+			},
+		},
+	}
+
+	for _, test := range tests {
+		got := DiffChunks(test.A, test.B)
+		if got, want := len(got), len(test.chunks); got != want {
+			t.Errorf("%s: edit distance = %v, want %v", test.desc, got-1, want-1)
+			continue
+		}
+		for i := range got {
+			got, want := got[i], test.chunks[i]
+			if got, want := got.Added, want.Added; !reflect.DeepEqual(got, want) {
+				t.Errorf("%s[%d]: Added = %v, want %v", test.desc, i, got, want)
+			}
+			if got, want := got.Deleted, want.Deleted; !reflect.DeepEqual(got, want) {
+				t.Errorf("%s[%d]: Deleted = %v, want %v", test.desc, i, got, want)
+			}
+			if got, want := got.Equal, want.Equal; !reflect.DeepEqual(got, want) {
+				t.Errorf("%s[%d]: Equal = %v, want %v", test.desc, i, got, want)
+			}
+		}
+	}
+}
+
+func ExampleDiff() {
+	constitution := strings.TrimSpace(`
+We the People of the United States, in Order to form a more perfect Union,
+establish Justice, insure domestic Tranquility, provide for the common defence,
+promote the general Welfare, and secure the Blessings of Liberty to ourselves
+and our Posterity, do ordain and establish this Constitution for the United
+States of America.
+`)
+
+	got := strings.TrimSpace(`
+:wq
+We the People of the United States, in Order to form a more perfect Union,
+establish Justice, insure domestic Tranquility, provide for the common defence,
+and secure the Blessings of Liberty to ourselves
+and our Posterity, do ordain and establish this Constitution for the United
+States of America.
+`)
+
+	fmt.Println(Diff(got, constitution))
+
+	// Output:
+	// -:wq
+	//  We the People of the United States, in Order to form a more perfect Union,
+	//  establish Justice, insure domestic Tranquility, provide for the common defence,
+	// -and secure the Blessings of Liberty to ourselves
+	// +promote the general Welfare, and secure the Blessings of Liberty to ourselves
+	//  and our Posterity, do ordain and establish this Constitution for the United
+	//  States of America.
+}
diff --git a/Godeps/_workspace/src/github.com/kylelemons/godebug/pretty/.gitignore b/Godeps/_workspace/src/github.com/kylelemons/godebug/pretty/.gitignore
new file mode 100644
index 00000000..fa9a735d
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/kylelemons/godebug/pretty/.gitignore
@@ -0,0 +1,5 @@
+*.test
+*.bench
+*.golden
+*.txt
+*.prof
diff --git a/Godeps/_workspace/src/github.com/kylelemons/godebug/pretty/doc.go b/Godeps/_workspace/src/github.com/kylelemons/godebug/pretty/doc.go
new file mode 100644
index 00000000..03b5718a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/kylelemons/godebug/pretty/doc.go
@@ -0,0 +1,25 @@
+// Copyright 2013 Google Inc.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package pretty pretty-prints Go structures.
+//
+// This package uses reflection to examine a Go value and can
+// print out in a nice, aligned fashion.  It supports three
+// modes (normal, compact, and extended) for advanced use.
+//
+// See the Reflect and Print examples for what the output looks like.
+package pretty
+
+// TODO:
+//   - Catch cycles
diff --git a/Godeps/_workspace/src/github.com/kylelemons/godebug/pretty/examples_test.go b/Godeps/_workspace/src/github.com/kylelemons/godebug/pretty/examples_test.go
new file mode 100644
index 00000000..13b534a3
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/kylelemons/godebug/pretty/examples_test.go
@@ -0,0 +1,158 @@
+// Copyright 2013 Google Inc.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package pretty_test
+
+import (
+	"fmt"
+	"github.com/kylelemons/godebug/pretty"
+)
+
+func ExampleConfig_Sprint() {
+	type Pair [2]int
+	type Map struct {
+		Name      string
+		Players   map[string]Pair
+		Obstacles map[Pair]string
+	}
+
+	m := Map{
+		Name: "Rock Creek",
+		Players: map[string]Pair{
+			"player1": {1, 3},
+			"player2": {0, -1},
+		},
+		Obstacles: map[Pair]string{
+			Pair{0, 0}: "rock",
+			Pair{2, 1}: "pond",
+			Pair{1, 1}: "stream",
+			Pair{0, 1}: "stream",
+		},
+	}
+
+	// Specific output formats
+	compact := &pretty.Config{
+		Compact: true,
+	}
+	diffable := &pretty.Config{
+		Diffable: true,
+	}
+
+	// Print out a summary
+	fmt.Printf("Players: %s\n", compact.Sprint(m.Players))
+
+	// Print diffable output
+	fmt.Printf("Map State:\n%s", diffable.Sprint(m))
+
+	// Output:
+	// Players: {player1:[1,3],player2:[0,-1]}
+	// Map State:
+	// {
+	//  Name:      "Rock Creek",
+	//  Players:   {
+	//              player1: [
+	//                        1,
+	//                        3,
+	//                       ],
+	//              player2: [
+	//                        0,
+	//                        -1,
+	//                       ],
+	//             },
+	//  Obstacles: {
+	//              [0,0]: "rock",
+	//              [0,1]: "stream",
+	//              [1,1]: "stream",
+	//              [2,1]: "pond",
+	//             },
+	// }
+}
+
+func ExamplePrint() {
+	type ShipManifest struct {
+		Name     string
+		Crew     map[string]string
+		Androids int
+		Stolen   bool
+	}
+
+	manifest := &ShipManifest{
+		Name: "Spaceship Heart of Gold",
+		Crew: map[string]string{
+			"Zaphod Beeblebrox": "Galactic President",
+			"Trillian":          "Human",
+			"Ford Prefect":      "A Hoopy Frood",
+			"Arthur Dent":       "Along for the Ride",
+		},
+		Androids: 1,
+		Stolen:   true,
+	}
+
+	pretty.Print(manifest)
+
+	// Output:
+	// {Name:     "Spaceship Heart of Gold",
+	//  Crew:     {Arthur Dent:       "Along for the Ride",
+	//             Ford Prefect:      "A Hoopy Frood",
+	//             Trillian:          "Human",
+	//             Zaphod Beeblebrox: "Galactic President"},
+	//  Androids: 1,
+	//  Stolen:   true}
+}
+
+func ExampleCompare() {
+	type ShipManifest struct {
+		Name     string
+		Crew     map[string]string
+		Androids int
+		Stolen   bool
+	}
+
+	reported := &ShipManifest{
+		Name: "Spaceship Heart of Gold",
+		Crew: map[string]string{
+			"Zaphod Beeblebrox": "Galactic President",
+			"Trillian":          "Human",
+			"Ford Prefect":      "A Hoopy Frood",
+			"Arthur Dent":       "Along for the Ride",
+		},
+		Androids: 1,
+		Stolen:   true,
+	}
+
+	expected := &ShipManifest{
+		Name: "Spaceship Heart of Gold",
+		Crew: map[string]string{
+			"Rowan Artosok": "Captain",
+		},
+		Androids: 1,
+		Stolen:   false,
+	}
+
+	fmt.Println(pretty.Compare(reported, expected))
+	// Output:
+	//  {
+	//   Name:     "Spaceship Heart of Gold",
+	//   Crew:     {
+	// -            Arthur Dent:       "Along for the Ride",
+	// -            Ford Prefect:      "A Hoopy Frood",
+	// -            Trillian:          "Human",
+	// -            Zaphod Beeblebrox: "Galactic President",
+	// +            Rowan Artosok: "Captain",
+	//             },
+	//   Androids: 1,
+	// - Stolen:   true,
+	// + Stolen:   false,
+	//  }
+}
diff --git a/Godeps/_workspace/src/github.com/kylelemons/godebug/pretty/public.go b/Godeps/_workspace/src/github.com/kylelemons/godebug/pretty/public.go
new file mode 100644
index 00000000..ae13858b
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/kylelemons/godebug/pretty/public.go
@@ -0,0 +1,101 @@
+// Copyright 2013 Google Inc.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package pretty
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"reflect"
+
+	"github.com/kylelemons/godebug/diff"
+)
+
+// A Config represents optional configuration parameters for formatting.
+//
+// Some options, notably ShortList, dramatically increase the overhead
+// of pretty-printing a value.
+type Config struct {
+	// Verbosity options
+	Compact  bool // One-line output. Overrides Diffable.
+	Diffable bool // Adds extra newlines for more easily diffable output.
+
+	// Field and value options
+	IncludeUnexported bool // Include unexported fields in output
+	PrintStringers    bool // Call String on a fmt.Stringer
+
+	// Output transforms
+	ShortList int // Maximum character length for short lists if nonzero.
+}
+
+var DefaultConfig = &Config{}
+
+func (cfg *Config) fprint(buf *bytes.Buffer, vals ...interface{}) {
+	for i, val := range vals {
+		if i > 0 {
+			buf.WriteByte('\n')
+		}
+		cfg.val2node(reflect.ValueOf(val)).WriteTo(buf, "", cfg)
+	}
+}
+
+// Print writes the default representation of the given values to standard output.
+func Print(vals ...interface{}) {
+	DefaultConfig.Print(vals...)
+}
+
+// Print writes the configured presentation of the given values to standard output.
+func (cfg *Config) Print(vals ...interface{}) {
+	fmt.Println(cfg.Sprint(vals...))
+}
+
+// Sprint returns a string representation of the given value according to the default config.
+func Sprint(vals ...interface{}) string {
+	return DefaultConfig.Sprint(vals...)
+}
+
+// Sprint returns a string representation of the given value according to cfg.
+func (cfg *Config) Sprint(vals ...interface{}) string {
+	buf := new(bytes.Buffer)
+	cfg.fprint(buf, vals...)
+	return buf.String()
+}
+
+// Fprint writes the representation of the given value to the writer according to the default config.
+func Fprint(w io.Writer, vals ...interface{}) (n int64, err error) {
+	return DefaultConfig.Fprint(w, vals...)
+}
+
+// Fprint writes the representation of the given value to the writer according to the cfg.
+func (cfg *Config) Fprint(w io.Writer, vals ...interface{}) (n int64, err error) {
+	buf := new(bytes.Buffer)
+	cfg.fprint(buf, vals...)
+	return buf.WriteTo(w)
+}
+
+// Compare returns a string containing a line-by-line unified diff of the
+// values in got and want.  Compare includes unexported fields.
+//
+// Each line in the output is prefixed with '+', '-', or ' ' to indicate if it
+// should be added to, removed from, or is correct for the "got" value with
+// respect to the "want" value.
+func Compare(got, want interface{}) string {
+	diffOpt := &Config{
+		Diffable:          true,
+		IncludeUnexported: true,
+	}
+
+	return diff.Diff(diffOpt.Sprint(got), diffOpt.Sprint(want))
+}
diff --git a/Godeps/_workspace/src/github.com/kylelemons/godebug/pretty/public_test.go b/Godeps/_workspace/src/github.com/kylelemons/godebug/pretty/public_test.go
new file mode 100644
index 00000000..ea3ec6e0
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/kylelemons/godebug/pretty/public_test.go
@@ -0,0 +1,72 @@
+// Copyright 2013 Google Inc.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package pretty
+
+import (
+	"testing"
+)
+
+func TestDiff(t *testing.T) {
+	type example struct {
+		Name    string
+		Age     int
+		Friends []string
+	}
+
+	tests := []struct {
+		desc      string
+		got, want interface{}
+		diff      string
+	}{
+		{
+			desc: "basic struct",
+			got: example{
+				Name: "Zaphd",
+				Age:  42,
+				Friends: []string{
+					"Ford Prefect",
+					"Trillian",
+					"Marvin",
+				},
+			},
+			want: example{
+				Name: "Zaphod",
+				Age:  42,
+				Friends: []string{
+					"Ford Prefect",
+					"Trillian",
+				},
+			},
+			diff: ` {
+- Name:    "Zaphd",
++ Name:    "Zaphod",
+  Age:     42,
+  Friends: [
+            "Ford Prefect",
+            "Trillian",
+-           "Marvin",
+           ],
+ }`,
+		},
+	}
+
+	for _, test := range tests {
+		if got, want := Compare(test.got, test.want), test.diff; got != want {
+			t.Errorf("%s:", test.desc)
+			t.Errorf("  got:  %q", got)
+			t.Errorf("  want: %q", want)
+		}
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/kylelemons/godebug/pretty/reflect.go b/Godeps/_workspace/src/github.com/kylelemons/godebug/pretty/reflect.go
new file mode 100644
index 00000000..e181360f
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/kylelemons/godebug/pretty/reflect.go
@@ -0,0 +1,92 @@
+// Copyright 2013 Google Inc.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package pretty
+
+import (
+	"fmt"
+	"reflect"
+	"sort"
+)
+
+func (c *Config) val2node(val reflect.Value) node {
+	// TODO(kevlar): pointer tracking?
+
+	if c.PrintStringers && val.CanInterface() {
+		stringer, ok := val.Interface().(fmt.Stringer)
+		if ok {
+			return stringVal(stringer.String())
+		}
+	}
+
+	switch kind := val.Kind(); kind {
+	case reflect.Ptr, reflect.Interface:
+		if val.IsNil() {
+			return rawVal("nil")
+		}
+		return c.val2node(val.Elem())
+	case reflect.String:
+		return stringVal(val.String())
+	case reflect.Slice, reflect.Array:
+		n := list{}
+		length := val.Len()
+		for i := 0; i < length; i++ {
+			n = append(n, c.val2node(val.Index(i)))
+		}
+		return n
+	case reflect.Map:
+		n := keyvals{}
+		keys := val.MapKeys()
+		for _, key := range keys {
+			// TODO(kevlar): Support arbitrary type keys?
+			n = append(n, keyval{compactString(c.val2node(key)), c.val2node(val.MapIndex(key))})
+		}
+		sort.Sort(n)
+		return n
+	case reflect.Struct:
+		n := keyvals{}
+		typ := val.Type()
+		fields := typ.NumField()
+		for i := 0; i < fields; i++ {
+			sf := typ.Field(i)
+			if !c.IncludeUnexported && sf.PkgPath != "" {
+				continue
+			}
+			n = append(n, keyval{sf.Name, c.val2node(val.Field(i))})
+		}
+		return n
+	case reflect.Bool:
+		if val.Bool() {
+			return rawVal("true")
+		}
+		return rawVal("false")
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		return rawVal(fmt.Sprintf("%d", val.Int()))
+	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+		return rawVal(fmt.Sprintf("%d", val.Uint()))
+	case reflect.Uintptr:
+		return rawVal(fmt.Sprintf("0x%X", val.Uint()))
+	case reflect.Float32, reflect.Float64:
+		return rawVal(fmt.Sprintf("%v", val.Float()))
+	case reflect.Complex64, reflect.Complex128:
+		return rawVal(fmt.Sprintf("%v", val.Complex()))
+	}
+
+	// Fall back to the default %#v if we can
+	if val.CanInterface() {
+		return rawVal(fmt.Sprintf("%#v", val.Interface()))
+	}
+
+	return rawVal(val.String())
+}
diff --git a/Godeps/_workspace/src/github.com/kylelemons/godebug/pretty/reflect_test.go b/Godeps/_workspace/src/github.com/kylelemons/godebug/pretty/reflect_test.go
new file mode 100644
index 00000000..15c80971
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/kylelemons/godebug/pretty/reflect_test.go
@@ -0,0 +1,143 @@
+// Copyright 2013 Google Inc.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package pretty
+
+import (
+	"reflect"
+	"testing"
+	"time"
+)
+
+func TestVal2nodeDefault(t *testing.T) {
+	tests := []struct {
+		desc string
+		raw  interface{}
+		want node
+	}{
+		{
+			"nil",
+			(*int)(nil),
+			rawVal("nil"),
+		},
+		{
+			"string",
+			"zaphod",
+			stringVal("zaphod"),
+		},
+		{
+			"slice",
+			[]string{"a", "b"},
+			list{stringVal("a"), stringVal("b")},
+		},
+		{
+			"map",
+			map[string]string{
+				"zaphod": "beeblebrox",
+				"ford":   "prefect",
+			},
+			keyvals{
+				{"ford", stringVal("prefect")},
+				{"zaphod", stringVal("beeblebrox")},
+			},
+		},
+		{
+			"map of [2]int",
+			map[[2]int]string{
+				[2]int{-1, 2}: "school",
+				[2]int{0, 0}:  "origin",
+				[2]int{1, 3}:  "home",
+			},
+			keyvals{
+				{"[-1,2]", stringVal("school")},
+				{"[0,0]", stringVal("origin")},
+				{"[1,3]", stringVal("home")},
+			},
+		},
+		{
+			"struct",
+			struct{ Zaphod, Ford string }{"beeblebrox", "prefect"},
+			keyvals{
+				{"Zaphod", stringVal("beeblebrox")},
+				{"Ford", stringVal("prefect")},
+			},
+		},
+		{
+			"int",
+			3,
+			rawVal("3"),
+		},
+	}
+
+	for _, test := range tests {
+		if got, want := DefaultConfig.val2node(reflect.ValueOf(test.raw)), test.want; !reflect.DeepEqual(got, want) {
+			t.Errorf("%s: got %#v, want %#v", test.desc, got, want)
+		}
+	}
+}
+
+func TestVal2node(t *testing.T) {
+	tests := []struct {
+		desc string
+		raw  interface{}
+		cfg  *Config
+		want node
+	}{
+		{
+			"struct default",
+			struct{ Zaphod, Ford, foo string }{"beeblebrox", "prefect", "BAD"},
+			DefaultConfig,
+			keyvals{
+				{"Zaphod", stringVal("beeblebrox")},
+				{"Ford", stringVal("prefect")},
+			},
+		},
+		{
+			"struct w/ IncludeUnexported",
+			struct{ Zaphod, Ford, foo string }{"beeblebrox", "prefect", "GOOD"},
+			&Config{
+				IncludeUnexported: true,
+			},
+			keyvals{
+				{"Zaphod", stringVal("beeblebrox")},
+				{"Ford", stringVal("prefect")},
+				{"foo", stringVal("GOOD")},
+			},
+		},
+		{
+			"time default",
+			struct{ Date time.Time }{time.Unix(1234567890, 0).UTC()},
+			DefaultConfig,
+			keyvals{
+				{"Date", keyvals{}}, // empty struct, it has unexported fields
+			},
+		},
+		{
+			"time w/ PrintStringers",
+			struct{ Date time.Time }{time.Unix(1234567890, 0).UTC()},
+			&Config{
+				PrintStringers: true,
+			},
+			keyvals{
+				{"Date", stringVal("2009-02-13 23:31:30 +0000 UTC")},
+			},
+		},
+	}
+
+	for _, test := range tests {
+		if got, want := test.cfg.val2node(reflect.ValueOf(test.raw)), test.want; !reflect.DeepEqual(got, want) {
+			t.Errorf("%s: got %#v, want %#v", test.desc, got, want)
+		}
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/kylelemons/godebug/pretty/structure.go b/Godeps/_workspace/src/github.com/kylelemons/godebug/pretty/structure.go
new file mode 100644
index 00000000..2c963eab
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/kylelemons/godebug/pretty/structure.go
@@ -0,0 +1,128 @@
+// Copyright 2013 Google Inc.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package pretty
+
+import (
+	"bytes"
+	"strconv"
+	"strings"
+)
+
+type node interface {
+	WriteTo(w *bytes.Buffer, indent string, cfg *Config)
+}
+
+func compactString(n node) string {
+	switch k := n.(type) {
+	case stringVal:
+		return string(k)
+	case rawVal:
+		return string(k)
+	}
+
+	buf := new(bytes.Buffer)
+	n.WriteTo(buf, "", &Config{Compact: true})
+	return buf.String()
+}
+
+type stringVal string
+
+func (str stringVal) WriteTo(w *bytes.Buffer, indent string, cfg *Config) {
+	w.WriteString(strconv.Quote(string(str)))
+}
+
+type rawVal string
+
+func (r rawVal) WriteTo(w *bytes.Buffer, indent string, cfg *Config) {
+	w.WriteString(string(r))
+}
+
+type keyval struct {
+	key string
+	val node
+}
+
+type keyvals []keyval
+
+func (l keyvals) Len() int           { return len(l) }
+func (l keyvals) Swap(i, j int)      { l[i], l[j] = l[j], l[i] }
+func (l keyvals) Less(i, j int) bool { return l[i].key < l[j].key }
+
+func (l keyvals) WriteTo(w *bytes.Buffer, indent string, cfg *Config) {
+	keyWidth := 0
+
+	for _, kv := range l {
+		if kw := len(kv.key); kw > keyWidth {
+			keyWidth = kw
+		}
+	}
+	padding := strings.Repeat(" ", keyWidth+1)
+
+	inner := indent + "  " + padding
+	w.WriteByte('{')
+	for i, kv := range l {
+		if cfg.Compact {
+			w.WriteString(kv.key)
+			w.WriteByte(':')
+		} else {
+			if i > 0 || cfg.Diffable {
+				w.WriteString("\n ")
+				w.WriteString(indent)
+			}
+			w.WriteString(kv.key)
+			w.WriteByte(':')
+			w.WriteString(padding[len(kv.key):])
+		}
+		kv.val.WriteTo(w, inner, cfg)
+		if i+1 < len(l) || cfg.Diffable {
+			w.WriteByte(',')
+		}
+	}
+	if !cfg.Compact && cfg.Diffable && len(l) > 0 {
+		w.WriteString("\n")
+		w.WriteString(indent)
+	}
+	w.WriteByte('}')
+}
+
+type list []node
+
+func (l list) WriteTo(w *bytes.Buffer, indent string, cfg *Config) {
+	if max := cfg.ShortList; max > 0 {
+		short := compactString(l)
+		if len(short) <= max {
+			w.WriteString(short)
+			return
+		}
+	}
+
+	inner := indent + " "
+	w.WriteByte('[')
+	for i, v := range l {
+		if !cfg.Compact && (i > 0 || cfg.Diffable) {
+			w.WriteByte('\n')
+			w.WriteString(inner)
+		}
+		v.WriteTo(w, inner, cfg)
+		if i+1 < len(l) || cfg.Diffable {
+			w.WriteByte(',')
+		}
+	}
+	if !cfg.Compact && cfg.Diffable && len(l) > 0 {
+		w.WriteByte('\n')
+		w.WriteString(indent)
+	}
+	w.WriteByte(']')
+}
diff --git a/Godeps/_workspace/src/github.com/kylelemons/godebug/pretty/structure_test.go b/Godeps/_workspace/src/github.com/kylelemons/godebug/pretty/structure_test.go
new file mode 100644
index 00000000..0f0d91de
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/kylelemons/godebug/pretty/structure_test.go
@@ -0,0 +1,262 @@
+// Copyright 2013 Google Inc.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package pretty
+
+import (
+	"bytes"
+	"testing"
+)
+
+func TestWriteTo(t *testing.T) {
+	tests := []struct {
+		desc     string
+		node     node
+		normal   string
+		extended string
+	}{
+		{
+			desc:     "string",
+			node:     stringVal("zaphod"),
+			normal:   `"zaphod"`,
+			extended: `"zaphod"`,
+		},
+		{
+			desc:     "raw",
+			node:     rawVal("42"),
+			normal:   `42`,
+			extended: `42`,
+		},
+		{
+			desc: "keyvals",
+			node: keyvals{
+				{"name", stringVal("zaphod")},
+				{"age", rawVal("42")},
+			},
+			normal: `{name: "zaphod",
+ age:  42}`,
+			extended: `{
+ name: "zaphod",
+ age:  42,
+}`,
+		},
+		{
+			desc: "list",
+			node: list{
+				stringVal("zaphod"),
+				rawVal("42"),
+			},
+			normal: `["zaphod",
+ 42]`,
+			extended: `[
+ "zaphod",
+ 42,
+]`,
+		},
+		{
+			desc: "nested",
+			node: list{
+				stringVal("first"),
+				list{rawVal("1"), rawVal("2"), rawVal("3")},
+				keyvals{
+					{"trillian", keyvals{
+						{"race", stringVal("human")},
+						{"age", rawVal("36")},
+					}},
+					{"zaphod", keyvals{
+						{"occupation", stringVal("president of the galaxy")},
+						{"features", stringVal("two heads")},
+					}},
+				},
+				keyvals{},
+			},
+			normal: `["first",
+ [1,
+  2,
+  3],
+ {trillian: {race: "human",
+             age:  36},
+  zaphod:   {occupation: "president of the galaxy",
+             features:   "two heads"}},
+ {}]`,
+			extended: `[
+ "first",
+ [
+  1,
+  2,
+  3,
+ ],
+ {
+  trillian: {
+             race: "human",
+             age:  36,
+            },
+  zaphod:   {
+             occupation: "president of the galaxy",
+             features:   "two heads",
+            },
+ },
+ {},
+]`,
+		},
+	}
+
+	for _, test := range tests {
+		buf := new(bytes.Buffer)
+		test.node.WriteTo(buf, "", &Config{})
+		if got, want := buf.String(), test.normal; got != want {
+			t.Errorf("%s: normal rendendered incorrectly\ngot:\n%s\nwant:\n%s", test.desc, got, want)
+		}
+		buf.Reset()
+		test.node.WriteTo(buf, "", &Config{Diffable: true})
+		if got, want := buf.String(), test.extended; got != want {
+			t.Errorf("%s: extended rendendered incorrectly\ngot:\n%s\nwant:\n%s", test.desc, got, want)
+		}
+	}
+}
+
+func TestCompactString(t *testing.T) {
+	tests := []struct {
+		node
+		compact string
+	}{
+		{
+			stringVal("abc"),
+			"abc",
+		},
+		{
+			rawVal("2"),
+			"2",
+		},
+		{
+			list{
+				rawVal("2"),
+				rawVal("3"),
+			},
+			"[2,3]",
+		},
+		{
+			keyvals{
+				{"name", stringVal("zaphod")},
+				{"age", rawVal("42")},
+			},
+			`{name:"zaphod",age:42}`,
+		},
+		{
+			list{
+				list{
+					rawVal("0"),
+					rawVal("1"),
+					rawVal("2"),
+					rawVal("3"),
+				},
+				list{
+					rawVal("1"),
+					rawVal("2"),
+					rawVal("3"),
+					rawVal("0"),
+				},
+				list{
+					rawVal("2"),
+					rawVal("3"),
+					rawVal("0"),
+					rawVal("1"),
+				},
+			},
+			`[[0,1,2,3],[1,2,3,0],[2,3,0,1]]`,
+		},
+	}
+
+	for _, test := range tests {
+		if got, want := compactString(test.node), test.compact; got != want {
+			t.Errorf("%#v: compact = %q, want %q", test.node, got, want)
+		}
+	}
+}
+
+func TestShortList(t *testing.T) {
+	cfg := &Config{
+		ShortList: 16,
+	}
+
+	tests := []struct {
+		node
+		want string
+	}{
+		{
+			list{
+				list{
+					rawVal("0"),
+					rawVal("1"),
+					rawVal("2"),
+					rawVal("3"),
+				},
+				list{
+					rawVal("1"),
+					rawVal("2"),
+					rawVal("3"),
+					rawVal("0"),
+				},
+				list{
+					rawVal("2"),
+					rawVal("3"),
+					rawVal("0"),
+					rawVal("1"),
+				},
+			},
+			`[[0,1,2,3],
+ [1,2,3,0],
+ [2,3,0,1]]`,
+		},
+	}
+
+	for _, test := range tests {
+		buf := new(bytes.Buffer)
+		test.node.WriteTo(buf, "", cfg)
+		if got, want := buf.String(), test.want; got != want {
+			t.Errorf("%#v: got:\n%s\nwant:\n%s", test.node, got, want)
+		}
+	}
+}
+
+var benchNode = keyvals{
+	{"list", list{
+		rawVal("0"),
+		rawVal("1"),
+		rawVal("2"),
+		rawVal("3"),
+	}},
+	{"keyvals", keyvals{
+		{"a", stringVal("b")},
+		{"c", stringVal("e")},
+		{"d", stringVal("f")},
+	}},
+}
+
+func benchOpts(b *testing.B, cfg *Config) {
+	buf := new(bytes.Buffer)
+	benchNode.WriteTo(buf, "", cfg)
+	b.SetBytes(int64(buf.Len()))
+	b.ResetTimer()
+
+	for i := 0; i < b.N; i++ {
+		buf.Reset()
+		benchNode.WriteTo(buf, "", cfg)
+	}
+}
+
+func BenchmarkWriteDefault(b *testing.B)   { benchOpts(b, DefaultConfig) }
+func BenchmarkWriteShortList(b *testing.B) { benchOpts(b, &Config{ShortList: 16}) }
+func BenchmarkWriteCompact(b *testing.B)   { benchOpts(b, &Config{Compact: true}) }
+func BenchmarkWriteDiffable(b *testing.B)  { benchOpts(b, &Config{Diffable: true}) }
diff --git a/Godeps/_workspace/src/github.com/lib/pq/.gitignore b/Godeps/_workspace/src/github.com/lib/pq/.gitignore
new file mode 100644
index 00000000..0f1d00e1
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/lib/pq/.gitignore
@@ -0,0 +1,4 @@
+.db
+*.test
+*~
+*.swp
diff --git a/Godeps/_workspace/src/github.com/lib/pq/.travis.yml b/Godeps/_workspace/src/github.com/lib/pq/.travis.yml
new file mode 100644
index 00000000..55eda795
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/lib/pq/.travis.yml
@@ -0,0 +1,61 @@
+language: go
+
+go:
+  - 1.0.2
+  - 1.0.3
+  - 1.1
+  - 1.2
+  - 1.3
+  - tip
+
+before_install:
+  - psql --version
+  - sudo /etc/init.d/postgresql stop
+  - sudo apt-get -y --purge remove postgresql libpq-dev libpq5 postgresql-client-common postgresql-common
+  - sudo rm -rf /var/lib/postgresql
+  - wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
+  - sudo sh -c "echo deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg main $PGVERSION >> /etc/apt/sources.list.d/postgresql.list"
+  - sudo apt-get update -qq
+  - sudo apt-get -y -o Dpkg::Options::=--force-confdef -o Dpkg::Options::="--force-confnew" install postgresql-$PGVERSION postgresql-server-dev-$PGVERSION postgresql-contrib-$PGVERSION
+  - sudo chmod 777 /etc/postgresql/$PGVERSION/main/pg_hba.conf
+  - echo "local     all         postgres                          trust" > /etc/postgresql/$PGVERSION/main/pg_hba.conf
+  - echo "local     all         all                               trust" >> /etc/postgresql/$PGVERSION/main/pg_hba.conf
+  - echo "hostnossl all         pqgossltest 127.0.0.1/32          reject" >> /etc/postgresql/$PGVERSION/main/pg_hba.conf
+  - echo "hostnossl all         pqgosslcert 127.0.0.1/32          reject" >> /etc/postgresql/$PGVERSION/main/pg_hba.conf
+  - echo "hostssl   all         pqgossltest 127.0.0.1/32          trust"  >> /etc/postgresql/$PGVERSION/main/pg_hba.conf
+  - echo "hostssl   all         pqgosslcert 127.0.0.1/32          cert"  >> /etc/postgresql/$PGVERSION/main/pg_hba.conf
+  - echo "host      all         all         127.0.0.1/32          trust" >> /etc/postgresql/$PGVERSION/main/pg_hba.conf
+  - echo "hostnossl all         pqgossltest ::1/128               reject" >> /etc/postgresql/$PGVERSION/main/pg_hba.conf
+  - echo "hostnossl all         pqgosslcert ::1/128               reject" >> /etc/postgresql/$PGVERSION/main/pg_hba.conf
+  - echo "hostssl   all         pqgossltest ::1/128               trust" >> /etc/postgresql/$PGVERSION/main/pg_hba.conf
+  - echo "hostssl   all         pqgosslcert ::1/128               cert" >> /etc/postgresql/$PGVERSION/main/pg_hba.conf
+  - echo "host      all         all         ::1/128               trust" >> /etc/postgresql/$PGVERSION/main/pg_hba.conf
+  - sudo install -o postgres -g postgres -m 600 -t /var/lib/postgresql/$PGVERSION/main/ certs/server.key certs/server.crt certs/root.crt
+  - sudo bash -c "[[ '${PGVERSION}' < '9.2' ]] || (echo \"ssl_cert_file = 'server.crt'\" >> /etc/postgresql/$PGVERSION/main/postgresql.conf)"
+  - sudo bash -c "[[ '${PGVERSION}' < '9.2' ]] || (echo \"ssl_key_file = 'server.key'\" >> /etc/postgresql/$PGVERSION/main/postgresql.conf)"
+  - sudo bash -c "[[ '${PGVERSION}' < '9.2' ]] || (echo \"ssl_ca_file = 'root.crt'\" >> /etc/postgresql/$PGVERSION/main/postgresql.conf)"
+  - sudo sh -c "echo 127.0.0.1 postgres >> /etc/hosts"
+  - sudo ls -l /var/lib/postgresql/$PGVERSION/main/
+  - sudo cat /etc/postgresql/$PGVERSION/main/postgresql.conf
+  - sudo chmod 600 $PQSSLCERTTEST_PATH/postgresql.key
+  - sudo /etc/init.d/postgresql restart
+
+env:
+  global:
+    - PGUSER=postgres
+    - PQGOSSLTESTS=1
+    - PQSSLCERTTEST_PATH=$PWD/certs
+  matrix:
+    - PGVERSION=9.3
+    - PGVERSION=9.2
+    - PGVERSION=9.1
+    - PGVERSION=9.0
+    - PGVERSION=8.4
+
+script:
+ - go test -v ./...
+
+before_script:
+ - psql -c 'create database pqgotest' -U postgres
+ - psql -c 'create user pqgossltest' -U postgres
+ - psql -c 'create user pqgosslcert' -U postgres
diff --git a/Godeps/_workspace/src/github.com/lib/pq/CONTRIBUTING.md b/Godeps/_workspace/src/github.com/lib/pq/CONTRIBUTING.md
new file mode 100644
index 00000000..84c937f1
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/lib/pq/CONTRIBUTING.md
@@ -0,0 +1,29 @@
+## Contributing to pq
+
+`pq` has a backlog of pull requests, but contributions are still very
+much welcome. You can help with patch review, submitting bug reports,
+or adding new functionality. There is no formal style guide, but
+please conform to the style of existing code and general Go formatting
+conventions when submitting patches.
+
+### Patch review
+
+Help review existing open pull requests by commenting on the code or
+proposed functionality.
+
+### Bug reports
+
+We appreciate any bug reports, but especially ones with self-contained
+(doesn't depend on code outside of pq), minimal (can't be simplified
+further) test cases. It's especially helpful if you can submit a pull
+request with just the failing test case (you'll probably want to
+pattern it after the tests in
+[conn_test.go](https://github.com/lib/pq/blob/master/conn_test.go).
+
+### New functionality
+
+There are a number of pending patches for new functionality, so
+additional feature patches will take a while to merge. Still, patches
+are generally reviewed based on usefulness and complexity in addition
+to time-in-queue, so if you have a knockout idea, take a shot. Feel
+free to open an issue discussion your proposed patch beforehand.
diff --git a/Godeps/_workspace/src/github.com/lib/pq/LICENSE.md b/Godeps/_workspace/src/github.com/lib/pq/LICENSE.md
new file mode 100644
index 00000000..5773904a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/lib/pq/LICENSE.md
@@ -0,0 +1,8 @@
+Copyright (c) 2011-2013, 'pq' Contributors
+Portions Copyright (C) 2011 Blake Mizerany
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/Godeps/_workspace/src/github.com/lib/pq/README.md b/Godeps/_workspace/src/github.com/lib/pq/README.md
new file mode 100644
index 00000000..fb385a80
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/lib/pq/README.md
@@ -0,0 +1,95 @@
+# pq - A pure Go postgres driver for Go's database/sql package
+
+[![Build Status](https://travis-ci.org/lib/pq.png?branch=master)](https://travis-ci.org/lib/pq)
+
+## Install
+
+	go get github.com/lib/pq
+
+## Docs
+
+For detailed documentation and basic usage examples, please see the package
+documentation at <http://godoc.org/github.com/lib/pq>.
+
+## Tests
+
+`go test` is used for testing.  A running PostgreSQL server is
+required, with the ability to log in.  The default database to connect
+to test with is "pqgotest," but it can be overridden using environment
+variables.
+
+Example:
+
+	PGHOST=/var/run/postgresql go test github.com/lib/pq
+
+Optionally, a benchmark suite can be run as part of the tests:
+
+	PGHOST=/var/run/postgresql go test -bench .
+
+## Features
+
+* SSL
+* Handles bad connections for `database/sql`
+* Scan `time.Time` correctly (i.e. `timestamp[tz]`, `time[tz]`, `date`)
+* Scan binary blobs correctly (i.e. `bytea`)
+* Package for `hstore` support
+* COPY FROM support
+* pq.ParseURL for converting urls to connection strings for sql.Open.
+* Many libpq compatible environment variables
+* Unix socket support
+* Notifications: `LISTEN`/`NOTIFY`
+
+## Future / Things you can help with
+
+* Better COPY FROM / COPY TO (see discussion in #181)
+
+## Thank you (alphabetical)
+
+Some of these contributors are from the original library `bmizerany/pq.go` whose
+code still exists in here.
+
+* Andy Balholm (andybalholm)
+* Ben Berkert (benburkert)
+* Benjamin Heatwole (bheatwole)
+* Bill Mill (llimllib)
+* Bjørn Madsen (aeons)
+* Blake Gentry (bgentry)
+* Brad Fitzpatrick (bradfitz)
+* Charlie Melbye (cmelbye)
+* Chris Bandy (cbandy)
+* Chris Walsh (cwds)
+* Daniel Farina (fdr)
+* Eric Chlebek (echlebek)
+* Everyone at The Go Team
+* Evan Shaw (edsrzf)
+* Ewan Chou (coocood)
+* Federico Romero (federomero)
+* Fumin (fumin)
+* Gary Burd (garyburd)
+* Heroku (heroku)
+* James Pozdena (jpoz)
+* Jason McVetta (jmcvetta)
+* Jeremy Jay (pbnjay)
+* Joakim Sernbrant (serbaut)
+* John Gallagher (jgallagher)
+* Joël Stemmer (jstemmer)
+* Kamil Kisiel (kisielk)
+* Kelly Dunn (kellydunn)
+* Keith Rarick (kr)
+* Kir Shatrov (kirs)
+* Lann Martin (lann)
+* Maciek Sakrejda (deafbybeheading)
+* Marc Brinkmann (mbr)
+* Marko Tiikkaja (johto)
+* Matt Newberry (MattNewberry)
+* Matt Robenolt (mattrobenolt)
+* Martin Olsen (martinolsen)
+* Mike Lewis (mikelikespie)
+* Nicolas Patry (Narsil)
+* Oliver Tonnhofer (olt)
+* Patrick Hayes (phayes)
+* Paul Hammond (paulhammond)
+* Ryan Smith (ryandotsmith)
+* Samuel Stauffer (samuel)
+* Timothée Peignier (cyberdelia)
+* notedit (notedit)
diff --git a/Godeps/_workspace/src/github.com/lib/pq/bench_test.go b/Godeps/_workspace/src/github.com/lib/pq/bench_test.go
new file mode 100644
index 00000000..2b8ec428
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/lib/pq/bench_test.go
@@ -0,0 +1,436 @@
+// +build go1.1
+
+package pq
+
+import (
+	"bufio"
+	"bytes"
+	"database/sql"
+	"database/sql/driver"
+	"github.com/lib/pq/oid"
+	"io"
+	"math/rand"
+	"net"
+	"runtime"
+	"strconv"
+	"strings"
+	"sync"
+	"testing"
+	"time"
+)
+
+var (
+	selectStringQuery = "SELECT '" + strings.Repeat("0123456789", 10) + "'"
+	selectSeriesQuery = "SELECT generate_series(1, 100)"
+)
+
+func BenchmarkSelectString(b *testing.B) {
+	var result string
+	benchQuery(b, selectStringQuery, &result)
+}
+
+func BenchmarkSelectSeries(b *testing.B) {
+	var result int
+	benchQuery(b, selectSeriesQuery, &result)
+}
+
+func benchQuery(b *testing.B, query string, result interface{}) {
+	b.Skip("current pq database-backed benchmarks are inconsistent")
+	b.StopTimer()
+	db := openTestConn(b)
+	defer db.Close()
+	b.StartTimer()
+
+	for i := 0; i < b.N; i++ {
+		benchQueryLoop(b, db, query, result)
+	}
+}
+
+func benchQueryLoop(b *testing.B, db *sql.DB, query string, result interface{}) {
+	rows, err := db.Query(query)
+	if err != nil {
+		b.Fatal(err)
+	}
+	defer rows.Close()
+	for rows.Next() {
+		err = rows.Scan(result)
+		if err != nil {
+			b.Fatal("failed to scan", err)
+		}
+	}
+}
+
+// reading from circularConn yields content[:prefixLen] once, followed by
+// content[prefixLen:] over and over again. It never returns EOF.
+type circularConn struct {
+	content   string
+	prefixLen int
+	pos       int
+	net.Conn  // for all other net.Conn methods that will never be called
+}
+
+func (r *circularConn) Read(b []byte) (n int, err error) {
+	n = copy(b, r.content[r.pos:])
+	r.pos += n
+	if r.pos >= len(r.content) {
+		r.pos = r.prefixLen
+	}
+	return
+}
+
+func (r *circularConn) Write(b []byte) (n int, err error) { return len(b), nil }
+
+func (r *circularConn) Close() error { return nil }
+
+func fakeConn(content string, prefixLen int) *conn {
+	c := &circularConn{content: content, prefixLen: prefixLen}
+	return &conn{buf: bufio.NewReader(c), c: c}
+}
+
+// This benchmark is meant to be the same as BenchmarkSelectString, but takes
+// out some of the factors this package can't control. The numbers are less noisy,
+// but also the costs of network communication aren't accurately represented.
+func BenchmarkMockSelectString(b *testing.B) {
+	b.StopTimer()
+	// taken from a recorded run of BenchmarkSelectString
+	// See: http://www.postgresql.org/docs/current/static/protocol-message-formats.html
+	const response = "1\x00\x00\x00\x04" +
+		"t\x00\x00\x00\x06\x00\x00" +
+		"T\x00\x00\x00!\x00\x01?column?\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\xc1\xff\xfe\xff\xff\xff\xff\x00\x00" +
+		"Z\x00\x00\x00\x05I" +
+		"2\x00\x00\x00\x04" +
+		"D\x00\x00\x00n\x00\x01\x00\x00\x00d0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789" +
+		"C\x00\x00\x00\rSELECT 1\x00" +
+		"Z\x00\x00\x00\x05I" +
+		"3\x00\x00\x00\x04" +
+		"Z\x00\x00\x00\x05I"
+	c := fakeConn(response, 0)
+	b.StartTimer()
+
+	for i := 0; i < b.N; i++ {
+		benchMockQuery(b, c, selectStringQuery)
+	}
+}
+
+var seriesRowData = func() string {
+	var buf bytes.Buffer
+	for i := 1; i <= 100; i++ {
+		digits := byte(2)
+		if i >= 100 {
+			digits = 3
+		} else if i < 10 {
+			digits = 1
+		}
+		buf.WriteString("D\x00\x00\x00")
+		buf.WriteByte(10 + digits)
+		buf.WriteString("\x00\x01\x00\x00\x00")
+		buf.WriteByte(digits)
+		buf.WriteString(strconv.Itoa(i))
+	}
+	return buf.String()
+}()
+
+func BenchmarkMockSelectSeries(b *testing.B) {
+	b.StopTimer()
+	var response = "1\x00\x00\x00\x04" +
+		"t\x00\x00\x00\x06\x00\x00" +
+		"T\x00\x00\x00!\x00\x01?column?\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\xc1\xff\xfe\xff\xff\xff\xff\x00\x00" +
+		"Z\x00\x00\x00\x05I" +
+		"2\x00\x00\x00\x04" +
+		seriesRowData +
+		"C\x00\x00\x00\x0fSELECT 100\x00" +
+		"Z\x00\x00\x00\x05I" +
+		"3\x00\x00\x00\x04" +
+		"Z\x00\x00\x00\x05I"
+	c := fakeConn(response, 0)
+	b.StartTimer()
+
+	for i := 0; i < b.N; i++ {
+		benchMockQuery(b, c, selectSeriesQuery)
+	}
+}
+
+func benchMockQuery(b *testing.B, c *conn, query string) {
+	stmt, err := c.Prepare(query)
+	if err != nil {
+		b.Fatal(err)
+	}
+	defer stmt.Close()
+	rows, err := stmt.Query(nil)
+	if err != nil {
+		b.Fatal(err)
+	}
+	defer rows.Close()
+	var dest [1]driver.Value
+	for {
+		if err := rows.Next(dest[:]); err != nil {
+			if err == io.EOF {
+				break
+			}
+			b.Fatal(err)
+		}
+	}
+}
+
+func BenchmarkPreparedSelectString(b *testing.B) {
+	var result string
+	benchPreparedQuery(b, selectStringQuery, &result)
+}
+
+func BenchmarkPreparedSelectSeries(b *testing.B) {
+	var result int
+	benchPreparedQuery(b, selectSeriesQuery, &result)
+}
+
+func benchPreparedQuery(b *testing.B, query string, result interface{}) {
+	b.Skip("current pq database-backed benchmarks are inconsistent")
+	b.StopTimer()
+	db := openTestConn(b)
+	defer db.Close()
+	stmt, err := db.Prepare(query)
+	if err != nil {
+		b.Fatal(err)
+	}
+	defer stmt.Close()
+	b.StartTimer()
+
+	for i := 0; i < b.N; i++ {
+		benchPreparedQueryLoop(b, db, stmt, result)
+	}
+}
+
+func benchPreparedQueryLoop(b *testing.B, db *sql.DB, stmt *sql.Stmt, result interface{}) {
+	rows, err := stmt.Query()
+	if err != nil {
+		b.Fatal(err)
+	}
+	if !rows.Next() {
+		rows.Close()
+		b.Fatal("no rows")
+	}
+	defer rows.Close()
+	for rows.Next() {
+		err = rows.Scan(&result)
+		if err != nil {
+			b.Fatal("failed to scan")
+		}
+	}
+}
+
+// See the comment for BenchmarkMockSelectString.
+func BenchmarkMockPreparedSelectString(b *testing.B) {
+	b.StopTimer()
+	const parseResponse = "1\x00\x00\x00\x04" +
+		"t\x00\x00\x00\x06\x00\x00" +
+		"T\x00\x00\x00!\x00\x01?column?\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\xc1\xff\xfe\xff\xff\xff\xff\x00\x00" +
+		"Z\x00\x00\x00\x05I"
+	const responses = parseResponse +
+		"2\x00\x00\x00\x04" +
+		"D\x00\x00\x00n\x00\x01\x00\x00\x00d0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789" +
+		"C\x00\x00\x00\rSELECT 1\x00" +
+		"Z\x00\x00\x00\x05I"
+	c := fakeConn(responses, len(parseResponse))
+
+	stmt, err := c.Prepare(selectStringQuery)
+	if err != nil {
+		b.Fatal(err)
+	}
+	b.StartTimer()
+
+	for i := 0; i < b.N; i++ {
+		benchPreparedMockQuery(b, c, stmt)
+	}
+}
+
+func BenchmarkMockPreparedSelectSeries(b *testing.B) {
+	b.StopTimer()
+	const parseResponse = "1\x00\x00\x00\x04" +
+		"t\x00\x00\x00\x06\x00\x00" +
+		"T\x00\x00\x00!\x00\x01?column?\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\xc1\xff\xfe\xff\xff\xff\xff\x00\x00" +
+		"Z\x00\x00\x00\x05I"
+	var responses = parseResponse +
+		"2\x00\x00\x00\x04" +
+		seriesRowData +
+		"C\x00\x00\x00\x0fSELECT 100\x00" +
+		"Z\x00\x00\x00\x05I"
+	c := fakeConn(responses, len(parseResponse))
+
+	stmt, err := c.Prepare(selectSeriesQuery)
+	if err != nil {
+		b.Fatal(err)
+	}
+	b.StartTimer()
+
+	for i := 0; i < b.N; i++ {
+		benchPreparedMockQuery(b, c, stmt)
+	}
+}
+
+func benchPreparedMockQuery(b *testing.B, c *conn, stmt driver.Stmt) {
+	rows, err := stmt.Query(nil)
+	if err != nil {
+		b.Fatal(err)
+	}
+	defer rows.Close()
+	var dest [1]driver.Value
+	for {
+		if err := rows.Next(dest[:]); err != nil {
+			if err == io.EOF {
+				break
+			}
+			b.Fatal(err)
+		}
+	}
+}
+
+func BenchmarkEncodeInt64(b *testing.B) {
+	for i := 0; i < b.N; i++ {
+		encode(&parameterStatus{}, int64(1234), oid.T_int8)
+	}
+}
+
+func BenchmarkEncodeFloat64(b *testing.B) {
+	for i := 0; i < b.N; i++ {
+		encode(&parameterStatus{}, 3.14159, oid.T_float8)
+	}
+}
+
+var testByteString = []byte("abcdefghijklmnopqrstuvwxyz")
+
+func BenchmarkEncodeByteaHex(b *testing.B) {
+	for i := 0; i < b.N; i++ {
+		encode(&parameterStatus{serverVersion: 90000}, testByteString, oid.T_bytea)
+	}
+}
+func BenchmarkEncodeByteaEscape(b *testing.B) {
+	for i := 0; i < b.N; i++ {
+		encode(&parameterStatus{serverVersion: 84000}, testByteString, oid.T_bytea)
+	}
+}
+
+func BenchmarkEncodeBool(b *testing.B) {
+	for i := 0; i < b.N; i++ {
+		encode(&parameterStatus{}, true, oid.T_bool)
+	}
+}
+
+var testTimestamptz = time.Date(2001, time.January, 1, 0, 0, 0, 0, time.Local)
+
+func BenchmarkEncodeTimestamptz(b *testing.B) {
+	for i := 0; i < b.N; i++ {
+		encode(&parameterStatus{}, testTimestamptz, oid.T_timestamptz)
+	}
+}
+
+var testIntBytes = []byte("1234")
+
+func BenchmarkDecodeInt64(b *testing.B) {
+	for i := 0; i < b.N; i++ {
+		decode(&parameterStatus{}, testIntBytes, oid.T_int8)
+	}
+}
+
+var testFloatBytes = []byte("3.14159")
+
+func BenchmarkDecodeFloat64(b *testing.B) {
+	for i := 0; i < b.N; i++ {
+		decode(&parameterStatus{}, testFloatBytes, oid.T_float8)
+	}
+}
+
+var testBoolBytes = []byte{'t'}
+
+func BenchmarkDecodeBool(b *testing.B) {
+	for i := 0; i < b.N; i++ {
+		decode(&parameterStatus{}, testBoolBytes, oid.T_bool)
+	}
+}
+
+func TestDecodeBool(t *testing.T) {
+	db := openTestConn(t)
+	rows, err := db.Query("select true")
+	if err != nil {
+		t.Fatal(err)
+	}
+	rows.Close()
+}
+
+var testTimestamptzBytes = []byte("2013-09-17 22:15:32.360754-07")
+
+func BenchmarkDecodeTimestamptz(b *testing.B) {
+	for i := 0; i < b.N; i++ {
+		decode(&parameterStatus{}, testTimestamptzBytes, oid.T_timestamptz)
+	}
+}
+
+func BenchmarkDecodeTimestamptzMultiThread(b *testing.B) {
+	oldProcs := runtime.GOMAXPROCS(0)
+	defer runtime.GOMAXPROCS(oldProcs)
+	runtime.GOMAXPROCS(runtime.NumCPU())
+	globalLocationCache = newLocationCache()
+
+	f := func(wg *sync.WaitGroup, loops int) {
+		defer wg.Done()
+		for i := 0; i < loops; i++ {
+			decode(&parameterStatus{}, testTimestamptzBytes, oid.T_timestamptz)
+		}
+	}
+
+	wg := &sync.WaitGroup{}
+	b.ResetTimer()
+	for j := 0; j < 10; j++ {
+		wg.Add(1)
+		go f(wg, b.N/10)
+	}
+	wg.Wait()
+}
+
+func BenchmarkLocationCache(b *testing.B) {
+	globalLocationCache = newLocationCache()
+	for i := 0; i < b.N; i++ {
+		globalLocationCache.getLocation(rand.Intn(10000))
+	}
+}
+
+func BenchmarkLocationCacheMultiThread(b *testing.B) {
+	oldProcs := runtime.GOMAXPROCS(0)
+	defer runtime.GOMAXPROCS(oldProcs)
+	runtime.GOMAXPROCS(runtime.NumCPU())
+	globalLocationCache = newLocationCache()
+
+	f := func(wg *sync.WaitGroup, loops int) {
+		defer wg.Done()
+		for i := 0; i < loops; i++ {
+			globalLocationCache.getLocation(rand.Intn(10000))
+		}
+	}
+
+	wg := &sync.WaitGroup{}
+	b.ResetTimer()
+	for j := 0; j < 10; j++ {
+		wg.Add(1)
+		go f(wg, b.N/10)
+	}
+	wg.Wait()
+}
+
+// Stress test the performance of parsing results from the wire.
+func BenchmarkResultParsing(b *testing.B) {
+	b.StopTimer()
+
+	db := openTestConn(b)
+	defer db.Close()
+	_, err := db.Exec("BEGIN")
+	if err != nil {
+		b.Fatal(err)
+	}
+
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		res, err := db.Query("SELECT generate_series(1, 50000)")
+		if err != nil {
+			b.Fatal(err)
+		}
+		res.Close()
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/lib/pq/buf.go b/Godeps/_workspace/src/github.com/lib/pq/buf.go
new file mode 100644
index 00000000..9f417a1e
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/lib/pq/buf.go
@@ -0,0 +1,73 @@
+package pq
+
+import (
+	"bytes"
+	"encoding/binary"
+	"github.com/lib/pq/oid"
+)
+
+type readBuf []byte
+
+func (b *readBuf) int32() (n int) {
+	n = int(int32(binary.BigEndian.Uint32(*b)))
+	*b = (*b)[4:]
+	return
+}
+
+func (b *readBuf) oid() (n oid.Oid) {
+	n = oid.Oid(binary.BigEndian.Uint32(*b))
+	*b = (*b)[4:]
+	return
+}
+
+func (b *readBuf) int16() (n int) {
+	n = int(binary.BigEndian.Uint16(*b))
+	*b = (*b)[2:]
+	return
+}
+
+func (b *readBuf) string() string {
+	i := bytes.IndexByte(*b, 0)
+	if i < 0 {
+		errorf("invalid message format; expected string terminator")
+	}
+	s := (*b)[:i]
+	*b = (*b)[i+1:]
+	return string(s)
+}
+
+func (b *readBuf) next(n int) (v []byte) {
+	v = (*b)[:n]
+	*b = (*b)[n:]
+	return
+}
+
+func (b *readBuf) byte() byte {
+	return b.next(1)[0]
+}
+
+type writeBuf []byte
+
+func (b *writeBuf) int32(n int) {
+	x := make([]byte, 4)
+	binary.BigEndian.PutUint32(x, uint32(n))
+	*b = append(*b, x...)
+}
+
+func (b *writeBuf) int16(n int) {
+	x := make([]byte, 2)
+	binary.BigEndian.PutUint16(x, uint16(n))
+	*b = append(*b, x...)
+}
+
+func (b *writeBuf) string(s string) {
+	*b = append(*b, (s + "\000")...)
+}
+
+func (b *writeBuf) byte(c byte) {
+	*b = append(*b, c)
+}
+
+func (b *writeBuf) bytes(v []byte) {
+	*b = append(*b, v...)
+}
diff --git a/Godeps/_workspace/src/github.com/lib/pq/certs/README b/Godeps/_workspace/src/github.com/lib/pq/certs/README
new file mode 100644
index 00000000..24ab7b25
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/lib/pq/certs/README
@@ -0,0 +1,3 @@
+This directory contains certificates and private keys for testing some
+SSL-related functionality in Travis.  Do NOT use these certificates for
+anything other than testing.
diff --git a/Godeps/_workspace/src/github.com/lib/pq/certs/postgresql.crt b/Godeps/_workspace/src/github.com/lib/pq/certs/postgresql.crt
new file mode 100644
index 00000000..6e6b4284
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/lib/pq/certs/postgresql.crt
@@ -0,0 +1,69 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 2 (0x2)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=US, ST=Nevada, L=Las Vegas, O=github.com/lib/pq, CN=pq CA
+        Validity
+            Not Before: Oct 11 15:10:11 2014 GMT
+            Not After : Oct  8 15:10:11 2024 GMT
+        Subject: C=US, ST=Nevada, L=Las Vegas, O=github.com/lib/pq, CN=pqgosslcert
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:e3:8c:06:9a:70:54:51:d1:34:34:83:39:cd:a2:
+                    59:0f:05:ed:8d:d8:0e:34:d0:92:f4:09:4d:ee:8c:
+                    78:55:49:24:f8:3c:e0:34:58:02:b2:e7:94:58:c1:
+                    e8:e5:bb:d1:af:f6:54:c1:40:b1:90:70:79:0d:35:
+                    54:9c:8f:16:e9:c2:f0:92:e6:64:49:38:c1:76:f8:
+                    47:66:c4:5b:4a:b6:a9:43:ce:c8:be:6c:4d:2b:94:
+                    97:3c:55:bc:d1:d0:6e:b7:53:ae:89:5c:4b:6b:86:
+                    40:be:c1:ae:1e:64:ce:9c:ae:87:0a:69:e5:c8:21:
+                    12:be:ae:1d:f6:45:df:16:a7
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                9B:25:31:63:A2:D8:06:FF:CB:E3:E9:96:FF:0D:BA:DC:12:7D:04:CF
+            X509v3 Authority Key Identifier: 
+                keyid:52:93:ED:1E:76:0A:9F:65:4F:DE:19:66:C1:D5:22:40:35:CB:A0:72
+
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            X509v3 Key Usage: 
+                Digital Signature, Non Repudiation, Key Encipherment
+    Signature Algorithm: sha256WithRSAEncryption
+        3e:f5:f8:0b:4e:11:bd:00:86:1f:ce:dc:97:02:98:91:11:f5:
+        65:f6:f2:8a:b2:3e:47:92:05:69:28:c9:e9:b4:f7:cf:93:d1:
+        2d:81:5d:00:3c:23:be:da:70:ea:59:e1:2c:d3:25:49:ae:a6:
+        95:54:c1:10:df:23:e3:fe:d6:e4:76:c7:6b:73:ad:1b:34:7c:
+        e2:56:cc:c0:37:ae:c5:7a:11:20:6c:3d:05:0e:99:cd:22:6c:
+        cf:59:a1:da:28:d4:65:ba:7d:2f:2b:3d:69:6d:a6:c1:ae:57:
+        bf:56:64:13:79:f8:48:46:65:eb:81:67:28:0b:7b:de:47:10:
+        b3:80:3c:31:d1:58:94:01:51:4a:c7:c8:1a:01:a8:af:c4:cd:
+        bb:84:a5:d9:8b:b4:b9:a1:64:3e:95:d9:90:1d:d5:3f:67:cc:
+        3b:ba:f5:b4:d1:33:77:ee:c2:d2:3e:7e:c5:66:6e:b7:35:4c:
+        60:57:b0:b8:be:36:c8:f3:d3:95:8c:28:4a:c9:f7:27:a4:0d:
+        e5:96:99:eb:f5:c8:bd:f3:84:6d:ef:02:f9:8a:36:7d:6b:5f:
+        36:68:37:41:d9:74:ae:c6:78:2e:44:86:a1:ad:43:ca:fb:b5:
+        3e:ba:10:23:09:02:ac:62:d1:d0:83:c8:95:b9:e3:5e:30:ff:
+        5b:2b:38:fa
+-----BEGIN CERTIFICATE-----
+MIIDEzCCAfugAwIBAgIBAjANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQGEwJVUzEP
+MA0GA1UECBMGTmV2YWRhMRIwEAYDVQQHEwlMYXMgVmVnYXMxGjAYBgNVBAoTEWdp
+dGh1Yi5jb20vbGliL3BxMQ4wDAYDVQQDEwVwcSBDQTAeFw0xNDEwMTExNTEwMTFa
+Fw0yNDEwMDgxNTEwMTFaMGQxCzAJBgNVBAYTAlVTMQ8wDQYDVQQIEwZOZXZhZGEx
+EjAQBgNVBAcTCUxhcyBWZWdhczEaMBgGA1UEChMRZ2l0aHViLmNvbS9saWIvcHEx
+FDASBgNVBAMTC3BxZ29zc2xjZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
+gQDjjAaacFRR0TQ0gznNolkPBe2N2A400JL0CU3ujHhVSST4POA0WAKy55RYwejl
+u9Gv9lTBQLGQcHkNNVScjxbpwvCS5mRJOMF2+EdmxFtKtqlDzsi+bE0rlJc8VbzR
+0G63U66JXEtrhkC+wa4eZM6crocKaeXIIRK+rh32Rd8WpwIDAQABo1owWDAdBgNV
+HQ4EFgQUmyUxY6LYBv/L4+mW/w263BJ9BM8wHwYDVR0jBBgwFoAUUpPtHnYKn2VP
+3hlmwdUiQDXLoHIwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwDQYJKoZIhvcNAQEL
+BQADggEBAD71+AtOEb0Ahh/O3JcCmJER9WX28oqyPkeSBWkoyem098+T0S2BXQA8
+I77acOpZ4SzTJUmuppVUwRDfI+P+1uR2x2tzrRs0fOJWzMA3rsV6ESBsPQUOmc0i
+bM9Zodoo1GW6fS8rPWltpsGuV79WZBN5+EhGZeuBZygLe95HELOAPDHRWJQBUUrH
+yBoBqK/EzbuEpdmLtLmhZD6V2ZAd1T9nzDu69bTRM3fuwtI+fsVmbrc1TGBXsLi+
+Nsjz05WMKErJ9yekDeWWmev1yL3zhG3vAvmKNn1rXzZoN0HZdK7GeC5EhqGtQ8r7
+tT66ECMJAqxi0dCDyJW5414w/1srOPo=
+-----END CERTIFICATE-----
diff --git a/Godeps/_workspace/src/github.com/lib/pq/certs/postgresql.key b/Godeps/_workspace/src/github.com/lib/pq/certs/postgresql.key
new file mode 100644
index 00000000..eb8b20be
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/lib/pq/certs/postgresql.key
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICWwIBAAKBgQDjjAaacFRR0TQ0gznNolkPBe2N2A400JL0CU3ujHhVSST4POA0
+WAKy55RYwejlu9Gv9lTBQLGQcHkNNVScjxbpwvCS5mRJOMF2+EdmxFtKtqlDzsi+
+bE0rlJc8VbzR0G63U66JXEtrhkC+wa4eZM6crocKaeXIIRK+rh32Rd8WpwIDAQAB
+AoGAM5dM6/kp9P700i8qjOgRPym96Zoh5nGfz/rIE5z/r36NBkdvIg8OVZfR96nH
+b0b9TOMR5lsPp0sI9yivTWvX6qyvLJRWy2vvx17hXK9NxXUNTAm0PYZUTvCtcPeX
+RnJpzQKNZQPkFzF0uXBc4CtPK2Vz0+FGvAelrhYAxnw1dIkCQQD+9qaW5QhXjsjb
+Nl85CmXgxPmGROcgLQCO+omfrjf9UXrituU9Dz6auym5lDGEdMFnkzfr+wpasEy9
+mf5ZZOhDAkEA5HjXfVGaCtpydOt6hDon/uZsyssCK2lQ7NSuE3vP+sUsYMzIpEoy
+t3VWXqKbo+g9KNDTP4WEliqp1aiSIylzzQJANPeqzihQnlgEdD4MdD4rwhFJwVIp
+Le8Lcais1KaN7StzOwxB/XhgSibd2TbnPpw+3bSg5n5lvUdo+e62/31OHwJAU1jS
+I+F09KikQIr28u3UUWT2IzTT4cpVv1AHAQyV3sG3YsjSGT0IK20eyP9BEBZU2WL0
+7aNjrvR5aHxKc5FXsQJABsFtyGpgI5X4xufkJZVZ+Mklz2n7iXa+XPatMAHFxAtb
+EEMt60rngwMjXAzBSC6OYuYogRRAY3UCacNC5VhLYQ==
+-----END RSA PRIVATE KEY-----
diff --git a/Godeps/_workspace/src/github.com/lib/pq/certs/root.crt b/Godeps/_workspace/src/github.com/lib/pq/certs/root.crt
new file mode 100644
index 00000000..aecf8f62
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/lib/pq/certs/root.crt
@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIIEAzCCAuugAwIBAgIJANmheROCdW1NMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNV
+BAYTAlVTMQ8wDQYDVQQIEwZOZXZhZGExEjAQBgNVBAcTCUxhcyBWZWdhczEaMBgG
+A1UEChMRZ2l0aHViLmNvbS9saWIvcHExDjAMBgNVBAMTBXBxIENBMB4XDTE0MTAx
+MTE1MDQyOVoXDTI0MTAwODE1MDQyOVowXjELMAkGA1UEBhMCVVMxDzANBgNVBAgT
+Bk5ldmFkYTESMBAGA1UEBxMJTGFzIFZlZ2FzMRowGAYDVQQKExFnaXRodWIuY29t
+L2xpYi9wcTEOMAwGA1UEAxMFcHEgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCV4PxP7ShzWBzUCThcKk3qZtOLtHmszQVtbqhvgTpm1kTRtKBdVMu0
+pLAHQ3JgJCnAYgH0iZxVGoMP16T3irdgsdC48+nNTFM2T0cCdkfDURGIhSFN47cb
+Pgy306BcDUD2q7ucW33+dlFSRuGVewocoh4BWM/vMtMvvWzdi4Ag/L/jhb+5wZxZ
+sWymsadOVSDePEMKOvlCa3EdVwVFV40TVyDb+iWBUivDAYsS2a3KajuJrO6MbZiE
+Sp2RCIkZS2zFmzWxVRi9ZhzIZhh7EVF9JAaNC3T52jhGUdlRq3YpBTMnd89iOh74
+6jWXG7wSuPj3haFzyNhmJ0ZUh+2Ynoh1AgMBAAGjgcMwgcAwHQYDVR0OBBYEFFKT
+7R52Cp9lT94ZZsHVIkA1y6ByMIGQBgNVHSMEgYgwgYWAFFKT7R52Cp9lT94ZZsHV
+IkA1y6ByoWKkYDBeMQswCQYDVQQGEwJVUzEPMA0GA1UECBMGTmV2YWRhMRIwEAYD
+VQQHEwlMYXMgVmVnYXMxGjAYBgNVBAoTEWdpdGh1Yi5jb20vbGliL3BxMQ4wDAYD
+VQQDEwVwcSBDQYIJANmheROCdW1NMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF
+BQADggEBAAEhCLWkqJNMI8b4gkbmj5fqQ/4+oO83bZ3w2Oqf6eZ8I8BC4f2NOyE6
+tRUlq5+aU7eqC1cOAvGjO+YHN/bF/DFpwLlzvUSXt+JP/pYcUjL7v+pIvwqec9hD
+ndvM4iIbkD/H/OYQ3L+N3W+G1x7AcFIX+bGCb3PzYVQAjxreV6//wgKBosMGFbZo
+HPxT9RPMun61SViF04H5TNs0derVn1+5eiiYENeAhJzQNyZoOOUuX1X/Inx9bEPh
+C5vFBtSMgIytPgieRJVWAiMLYsfpIAStrHztRAbBs2DU01LmMgRvHdxgFEKinC/d
+UHZZQDP+6pT+zADrGhQGXe4eThaO6f0=
+-----END CERTIFICATE-----
diff --git a/Godeps/_workspace/src/github.com/lib/pq/certs/server.crt b/Godeps/_workspace/src/github.com/lib/pq/certs/server.crt
new file mode 100644
index 00000000..ddc995a6
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/lib/pq/certs/server.crt
@@ -0,0 +1,81 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 1 (0x1)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=US, ST=Nevada, L=Las Vegas, O=github.com/lib/pq, CN=pq CA
+        Validity
+            Not Before: Oct 11 15:05:15 2014 GMT
+            Not After : Oct  8 15:05:15 2024 GMT
+        Subject: C=US, ST=Nevada, L=Las Vegas, O=github.com/lib/pq, CN=postgres
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:d7:8a:4c:85:fb:17:a5:3c:8f:e0:72:11:29:ce:
+                    3f:b0:1f:3f:7d:c6:ee:7f:a7:fc:02:2b:35:47:08:
+                    a6:3d:90:df:5c:56:14:94:00:c7:6d:d1:d2:e2:61:
+                    95:77:b8:e3:a6:66:31:f9:1f:21:7d:62:e1:27:da:
+                    94:37:61:4a:ea:63:53:a0:61:b8:9c:bb:a5:e2:e7:
+                    b7:a6:d8:0f:05:04:c7:29:e2:ea:49:2b:7f:de:15:
+                    00:a6:18:70:50:c7:0c:de:9a:f9:5a:96:b0:e1:94:
+                    06:c6:6d:4a:21:3b:b4:0f:a5:6d:92:86:34:b2:4e:
+                    d7:0e:a7:19:c0:77:0b:7b:87:c8:92:de:42:ff:86:
+                    d2:b7:9a:a4:d4:15:23:ca:ad:a5:69:21:b8:ce:7e:
+                    66:cb:85:5d:b9:ed:8b:2d:09:8d:94:e4:04:1e:72:
+                    ec:ef:d0:76:90:15:5a:a4:f7:91:4b:e9:ce:4e:9d:
+                    5d:9a:70:17:9c:d8:e9:73:83:ea:3d:61:99:a6:cd:
+                    ac:91:40:5a:88:77:e5:4e:2a:8e:3d:13:f3:f9:38:
+                    6f:81:6b:8a:95:ca:0e:07:ab:6f:da:b4:8c:d9:ff:
+                    aa:78:03:aa:c7:c2:cf:6f:64:92:d3:d8:83:d5:af:
+                    f1:23:18:a7:2e:7b:17:0b:e7:7d:f1:fa:a8:41:a3:
+                    04:57
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                EE:F0:B3:46:DC:C7:09:EB:0E:B6:2F:E5:FE:62:60:45:44:9F:59:CC
+            X509v3 Authority Key Identifier: 
+                keyid:52:93:ED:1E:76:0A:9F:65:4F:DE:19:66:C1:D5:22:40:35:CB:A0:72
+
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            X509v3 Key Usage: 
+                Digital Signature, Non Repudiation, Key Encipherment
+    Signature Algorithm: sha256WithRSAEncryption
+        7e:5a:6e:be:bf:d2:6c:c1:d6:fa:b6:fb:3f:06:53:36:08:87:
+        9d:95:b1:39:af:9e:f6:47:38:17:39:da:25:7c:f2:ad:0c:e3:
+        ab:74:19:ca:fb:8c:a0:50:c0:1d:19:8a:9c:21:ed:0f:3a:d1:
+        96:54:2e:10:09:4f:b8:70:f7:2b:99:43:d2:c6:15:bc:3f:24:
+        7d:28:39:32:3f:8d:a4:4f:40:75:7f:3e:0d:1c:d1:69:f2:4e:
+        98:83:47:97:d2:25:ac:c9:36:86:2f:04:a6:c4:86:c7:c4:00:
+        5f:7f:b9:ad:fc:bf:e9:f5:78:d7:82:1a:51:0d:fc:ab:9e:92:
+        1d:5f:0c:18:d1:82:e0:14:c9:ce:91:89:71:ff:49:49:ff:35:
+        bf:7b:44:78:42:c1:d0:66:65:bb:28:2e:60:ca:9b:20:12:a9:
+        90:61:b1:96:ec:15:46:c9:37:f7:07:90:8a:89:45:2a:3f:37:
+        ec:dc:e3:e5:8f:c3:3a:57:80:a5:54:60:0c:e1:b2:26:99:2b:
+        40:7e:36:d1:9a:70:02:ec:63:f4:3b:72:ae:81:fb:30:20:6d:
+        cb:48:46:c6:b5:8f:39:b1:84:05:25:55:8d:f5:62:f6:1b:46:
+        2e:da:a3:4c:26:12:44:d7:56:b6:b8:a9:ca:d3:ab:71:45:7c:
+        9f:48:6d:1e
+-----BEGIN CERTIFICATE-----
+MIIDlDCCAnygAwIBAgIBATANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQGEwJVUzEP
+MA0GA1UECBMGTmV2YWRhMRIwEAYDVQQHEwlMYXMgVmVnYXMxGjAYBgNVBAoTEWdp
+dGh1Yi5jb20vbGliL3BxMQ4wDAYDVQQDEwVwcSBDQTAeFw0xNDEwMTExNTA1MTVa
+Fw0yNDEwMDgxNTA1MTVaMGExCzAJBgNVBAYTAlVTMQ8wDQYDVQQIEwZOZXZhZGEx
+EjAQBgNVBAcTCUxhcyBWZWdhczEaMBgGA1UEChMRZ2l0aHViLmNvbS9saWIvcHEx
+ETAPBgNVBAMTCHBvc3RncmVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEA14pMhfsXpTyP4HIRKc4/sB8/fcbuf6f8Ais1RwimPZDfXFYUlADHbdHS4mGV
+d7jjpmYx+R8hfWLhJ9qUN2FK6mNToGG4nLul4ue3ptgPBQTHKeLqSSt/3hUAphhw
+UMcM3pr5Wpaw4ZQGxm1KITu0D6VtkoY0sk7XDqcZwHcLe4fIkt5C/4bSt5qk1BUj
+yq2laSG4zn5my4Vdue2LLQmNlOQEHnLs79B2kBVapPeRS+nOTp1dmnAXnNjpc4Pq
+PWGZps2skUBaiHflTiqOPRPz+ThvgWuKlcoOB6tv2rSM2f+qeAOqx8LPb2SS09iD
+1a/xIxinLnsXC+d98fqoQaMEVwIDAQABo1owWDAdBgNVHQ4EFgQU7vCzRtzHCesO
+ti/l/mJgRUSfWcwwHwYDVR0jBBgwFoAUUpPtHnYKn2VP3hlmwdUiQDXLoHIwCQYD
+VR0TBAIwADALBgNVHQ8EBAMCBeAwDQYJKoZIhvcNAQELBQADggEBAH5abr6/0mzB
+1vq2+z8GUzYIh52VsTmvnvZHOBc52iV88q0M46t0Gcr7jKBQwB0Zipwh7Q860ZZU
+LhAJT7hw9yuZQ9LGFbw/JH0oOTI/jaRPQHV/Pg0c0WnyTpiDR5fSJazJNoYvBKbE
+hsfEAF9/ua38v+n1eNeCGlEN/Kuekh1fDBjRguAUyc6RiXH/SUn/Nb97RHhCwdBm
+ZbsoLmDKmyASqZBhsZbsFUbJN/cHkIqJRSo/N+zc4+WPwzpXgKVUYAzhsiaZK0B+
+NtGacALsY/Q7cq6B+zAgbctIRsa1jzmxhAUlVY31YvYbRi7ao0wmEkTXVra4qcrT
+q3FFfJ9IbR4=
+-----END CERTIFICATE-----
diff --git a/Godeps/_workspace/src/github.com/lib/pq/certs/server.key b/Godeps/_workspace/src/github.com/lib/pq/certs/server.key
new file mode 100644
index 00000000..bd7b019b
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/lib/pq/certs/server.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEA14pMhfsXpTyP4HIRKc4/sB8/fcbuf6f8Ais1RwimPZDfXFYU
+lADHbdHS4mGVd7jjpmYx+R8hfWLhJ9qUN2FK6mNToGG4nLul4ue3ptgPBQTHKeLq
+SSt/3hUAphhwUMcM3pr5Wpaw4ZQGxm1KITu0D6VtkoY0sk7XDqcZwHcLe4fIkt5C
+/4bSt5qk1BUjyq2laSG4zn5my4Vdue2LLQmNlOQEHnLs79B2kBVapPeRS+nOTp1d
+mnAXnNjpc4PqPWGZps2skUBaiHflTiqOPRPz+ThvgWuKlcoOB6tv2rSM2f+qeAOq
+x8LPb2SS09iD1a/xIxinLnsXC+d98fqoQaMEVwIDAQABAoIBAF3ZoihUhJ82F4+r
+Gz4QyDpv4L1reT2sb1aiabhcU8ZK5nbWJG+tRyjSS/i2dNaEcttpdCj9HR/zhgZM
+bm0OuAgG58rVwgS80CZUruq++Qs+YVojq8/gWPTiQD4SNhV2Fmx3HkwLgUk3oxuT
+SsvdqzGE3okGVrutCIcgy126eA147VPMoej1Bb3fO6npqK0pFPhZfAc0YoqJuM+k
+obRm5pAnGUipyLCFXjA9HYPKwYZw2RtfdA3CiImHeanSdqS+ctrC9y8BV40Th7gZ
+haXdKUNdjmIxV695QQ1mkGqpKLZFqhzKioGQ2/Ly2d1iaKN9fZltTusu8unepWJ2
+tlT9qMECgYEA9uHaF1t2CqE+AJvWTihHhPIIuLxoOQXYea1qvxfcH/UMtaLKzCNm
+lQ5pqCGsPvp+10f36yttO1ZehIvlVNXuJsjt0zJmPtIolNuJY76yeussfQ9jHheB
+5uPEzCFlHzxYbBUyqgWaF6W74okRGzEGJXjYSP0yHPPdU4ep2q3bGiUCgYEA34Af
+wBSuQSK7uLxArWHvQhyuvi43ZGXls6oRGl+Ysj54s8BP6XGkq9hEJ6G4yxgyV+BR
+DUOs5X8/TLT8POuIMYvKTQthQyCk0eLv2FLdESDuuKx0kBVY3s8lK3/z5HhrdOiN
+VMNZU+xDKgKc3hN9ypkk8vcZe6EtH7Y14e0rVcsCgYBTgxi8F/M5K0wG9rAqphNz
+VFBA9XKn/2M33cKjO5X5tXIEKzpAjaUQvNxexG04rJGljzG8+mar0M6ONahw5yD1
+O7i/XWgazgpuOEkkVYiYbd8RutfDgR4vFVMn3hAP3eDnRtBplRWH9Ec3HTiNIys6
+F8PKBOQjyRZQQC7jyzW3hQKBgACe5HeuFwXLSOYsb6mLmhR+6+VPT4wR1F95W27N
+USk9jyxAnngxfpmTkiziABdgS9N+pfr5cyN4BP77ia/Jn6kzkC5Cl9SN5KdIkA3z
+vPVtN/x/ThuQU5zaymmig1ThGLtMYggYOslG4LDfLPxY5YKIhle+Y+259twdr2yf
+Mf2dAoGAaGv3tWMgnIdGRk6EQL/yb9PKHo7ShN+tKNlGaK7WwzBdKs+Fe8jkgcr7
+pz4Ne887CmxejdISzOCcdT+Zm9Bx6I/uZwWOtDvWpIgIxVX9a9URj/+D1MxTE/y4
+d6H+c89yDY62I2+drMpdjCd3EtCaTlxpTbRS+s1eAHMH7aEkcCE=
+-----END RSA PRIVATE KEY-----
diff --git a/Godeps/_workspace/src/github.com/lib/pq/conn.go b/Godeps/_workspace/src/github.com/lib/pq/conn.go
new file mode 100644
index 00000000..749142f1
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/lib/pq/conn.go
@@ -0,0 +1,1502 @@
+package pq
+
+import (
+	"bufio"
+	"crypto/md5"
+	"crypto/tls"
+	"crypto/x509"
+	"database/sql"
+	"database/sql/driver"
+	"encoding/binary"
+	"errors"
+	"fmt"
+	"github.com/lib/pq/oid"
+	"io"
+	"io/ioutil"
+	"net"
+	"os"
+	"os/user"
+	"path"
+	"path/filepath"
+	"strconv"
+	"strings"
+	"time"
+	"unicode"
+)
+
+// Common error types
+var (
+	ErrNotSupported              = errors.New("pq: Unsupported command")
+	ErrInFailedTransaction       = errors.New("pq: Could not complete operation in a failed transaction")
+	ErrSSLNotSupported           = errors.New("pq: SSL is not enabled on the server")
+	ErrSSLKeyHasWorldPermissions = errors.New("pq: Private key file has group or world access. Permissions should be u=rw (0600) or less.")
+)
+
+type drv struct{}
+
+func (d *drv) Open(name string) (driver.Conn, error) {
+	return Open(name)
+}
+
+func init() {
+	sql.Register("postgres", &drv{})
+}
+
+type parameterStatus struct {
+	// server version in the same format as server_version_num, or 0 if
+	// unavailable
+	serverVersion int
+
+	// the current location based on the TimeZone value of the session, if
+	// available
+	currentLocation *time.Location
+}
+
+type transactionStatus byte
+
+const (
+	txnStatusIdle                transactionStatus = 'I'
+	txnStatusIdleInTransaction   transactionStatus = 'T'
+	txnStatusInFailedTransaction transactionStatus = 'E'
+)
+
+func (s transactionStatus) String() string {
+	switch s {
+	case txnStatusIdle:
+		return "idle"
+	case txnStatusIdleInTransaction:
+		return "idle in transaction"
+	case txnStatusInFailedTransaction:
+		return "in a failed transaction"
+	default:
+		errorf("unknown transactionStatus %d", s)
+	}
+	panic("not reached")
+}
+
+type Dialer interface {
+	Dial(network, address string) (net.Conn, error)
+	DialTimeout(network, address string, timeout time.Duration) (net.Conn, error)
+}
+
+type defaultDialer struct{}
+
+func (d defaultDialer) Dial(ntw, addr string) (net.Conn, error) {
+	return net.Dial(ntw, addr)
+}
+func (d defaultDialer) DialTimeout(ntw, addr string, timeout time.Duration) (net.Conn, error) {
+	return net.DialTimeout(ntw, addr, timeout)
+}
+
+type conn struct {
+	c         net.Conn
+	buf       *bufio.Reader
+	namei     int
+	scratch   [512]byte
+	txnStatus transactionStatus
+
+	parameterStatus parameterStatus
+
+	saveMessageType   byte
+	saveMessageBuffer []byte
+
+	// If true, this connection is bad and all public-facing functions should
+	// return ErrBadConn.
+	bad bool
+}
+
+func (c *conn) writeBuf(b byte) *writeBuf {
+	c.scratch[0] = b
+	w := writeBuf(c.scratch[:5])
+	return &w
+}
+
+func Open(name string) (_ driver.Conn, err error) {
+	return DialOpen(defaultDialer{}, name)
+}
+
+func DialOpen(d Dialer, name string) (_ driver.Conn, err error) {
+	defer func() {
+		// Handle any panics during connection initialization.  Note that we
+		// specifically do *not* want to use errRecover(), as that would turn
+		// any connection errors into ErrBadConns, hiding the real error
+		// message from the user.
+		e := recover()
+		if e == nil {
+			// Do nothing
+			return
+		}
+		var ok bool
+		err, ok = e.(error)
+		if !ok {
+			err = fmt.Errorf("pq: unexpected error: %#v", e)
+		}
+	}()
+
+	o := make(values)
+
+	// A number of defaults are applied here, in this order:
+	//
+	// * Very low precedence defaults applied in every situation
+	// * Environment variables
+	// * Explicitly passed connection information
+	o.Set("host", "localhost")
+	o.Set("port", "5432")
+	// N.B.: Extra float digits should be set to 3, but that breaks
+	// Postgres 8.4 and older, where the max is 2.
+	o.Set("extra_float_digits", "2")
+	for k, v := range parseEnviron(os.Environ()) {
+		o.Set(k, v)
+	}
+
+	if strings.HasPrefix(name, "postgres://") {
+		name, err = ParseURL(name)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	if err := parseOpts(name, o); err != nil {
+		return nil, err
+	}
+
+	// Use the "fallback" application name if necessary
+	if fallback := o.Get("fallback_application_name"); fallback != "" {
+		if !o.Isset("application_name") {
+			o.Set("application_name", fallback)
+		}
+	}
+
+	// We can't work with any client_encoding other than UTF-8 currently.
+	// However, we have historically allowed the user to set it to UTF-8
+	// explicitly, and there's no reason to break such programs, so allow that.
+	// Note that the "options" setting could also set client_encoding, but
+	// parsing its value is not worth it.  Instead, we always explicitly send
+	// client_encoding as a separate run-time parameter, which should override
+	// anything set in options.
+	if enc := o.Get("client_encoding"); enc != "" && !isUTF8(enc) {
+		return nil, errors.New("client_encoding must be absent or 'UTF8'")
+	}
+	o.Set("client_encoding", "UTF8")
+	// DateStyle needs a similar treatment.
+	if datestyle := o.Get("datestyle"); datestyle != "" {
+		if datestyle != "ISO, MDY" {
+			panic(fmt.Sprintf("setting datestyle must be absent or %v; got %v",
+				"ISO, MDY", datestyle))
+		}
+	} else {
+		o.Set("datestyle", "ISO, MDY")
+	}
+
+	// If a user is not provided by any other means, the last
+	// resort is to use the current operating system provided user
+	// name.
+	if o.Get("user") == "" {
+		u, err := userCurrent()
+		if err != nil {
+			return nil, err
+		} else {
+			o.Set("user", u)
+		}
+	}
+
+	c, err := dial(d, o)
+	if err != nil {
+		return nil, err
+	}
+
+	cn := &conn{c: c}
+	cn.ssl(o)
+	cn.buf = bufio.NewReader(cn.c)
+	cn.startup(o)
+	// reset the deadline, in case one was set (see dial)
+	err = cn.c.SetDeadline(time.Time{})
+	return cn, err
+}
+
+func dial(d Dialer, o values) (net.Conn, error) {
+	ntw, addr := network(o)
+
+	timeout := o.Get("connect_timeout")
+
+	// Zero or not specified means wait indefinitely.
+	if timeout != "" && timeout != "0" {
+		seconds, err := strconv.ParseInt(timeout, 10, 0)
+		if err != nil {
+			return nil, fmt.Errorf("invalid value for parameter connect_timeout: %s", err)
+		}
+		duration := time.Duration(seconds) * time.Second
+		// connect_timeout should apply to the entire connection establishment
+		// procedure, so we both use a timeout for the TCP connection
+		// establishment and set a deadline for doing the initial handshake.
+		// The deadline is then reset after startup() is done.
+		deadline := time.Now().Add(duration)
+		conn, err := d.DialTimeout(ntw, addr, duration)
+		if err != nil {
+			return nil, err
+		}
+		err = conn.SetDeadline(deadline)
+		return conn, err
+	}
+	return d.Dial(ntw, addr)
+}
+
+func network(o values) (string, string) {
+	host := o.Get("host")
+
+	if strings.HasPrefix(host, "/") {
+		sockPath := path.Join(host, ".s.PGSQL."+o.Get("port"))
+		return "unix", sockPath
+	}
+
+	return "tcp", host + ":" + o.Get("port")
+}
+
+type values map[string]string
+
+func (vs values) Set(k, v string) {
+	vs[k] = v
+}
+
+func (vs values) Get(k string) (v string) {
+	return vs[k]
+}
+
+func (vs values) Isset(k string) bool {
+	_, ok := vs[k]
+	return ok
+}
+
+// scanner implements a tokenizer for libpq-style option strings.
+type scanner struct {
+	s []rune
+	i int
+}
+
+// newScanner returns a new scanner initialized with the option string s.
+func newScanner(s string) *scanner {
+	return &scanner{[]rune(s), 0}
+}
+
+// Next returns the next rune.
+// It returns 0, false if the end of the text has been reached.
+func (s *scanner) Next() (rune, bool) {
+	if s.i >= len(s.s) {
+		return 0, false
+	}
+	r := s.s[s.i]
+	s.i++
+	return r, true
+}
+
+// SkipSpaces returns the next non-whitespace rune.
+// It returns 0, false if the end of the text has been reached.
+func (s *scanner) SkipSpaces() (rune, bool) {
+	r, ok := s.Next()
+	for unicode.IsSpace(r) && ok {
+		r, ok = s.Next()
+	}
+	return r, ok
+}
+
+// parseOpts parses the options from name and adds them to the values.
+//
+// The parsing code is based on conninfo_parse from libpq's fe-connect.c
+func parseOpts(name string, o values) error {
+	s := newScanner(name)
+
+	for {
+		var (
+			keyRunes, valRunes []rune
+			r                  rune
+			ok                 bool
+		)
+
+		if r, ok = s.SkipSpaces(); !ok {
+			break
+		}
+
+		// Scan the key
+		for !unicode.IsSpace(r) && r != '=' {
+			keyRunes = append(keyRunes, r)
+			if r, ok = s.Next(); !ok {
+				break
+			}
+		}
+
+		// Skip any whitespace if we're not at the = yet
+		if r != '=' {
+			r, ok = s.SkipSpaces()
+		}
+
+		// The current character should be =
+		if r != '=' || !ok {
+			return fmt.Errorf(`missing "=" after %q in connection info string"`, string(keyRunes))
+		}
+
+		// Skip any whitespace after the =
+		if r, ok = s.SkipSpaces(); !ok {
+			// If we reach the end here, the last value is just an empty string as per libpq.
+			o.Set(string(keyRunes), "")
+			break
+		}
+
+		if r != '\'' {
+			for !unicode.IsSpace(r) {
+				if r == '\\' {
+					if r, ok = s.Next(); !ok {
+						return fmt.Errorf(`missing character after backslash`)
+					}
+				}
+				valRunes = append(valRunes, r)
+
+				if r, ok = s.Next(); !ok {
+					break
+				}
+			}
+		} else {
+		quote:
+			for {
+				if r, ok = s.Next(); !ok {
+					return fmt.Errorf(`unterminated quoted string literal in connection string`)
+				}
+				switch r {
+				case '\'':
+					break quote
+				case '\\':
+					r, _ = s.Next()
+					fallthrough
+				default:
+					valRunes = append(valRunes, r)
+				}
+			}
+		}
+
+		o.Set(string(keyRunes), string(valRunes))
+	}
+
+	return nil
+}
+
+func (cn *conn) isInTransaction() bool {
+	return cn.txnStatus == txnStatusIdleInTransaction ||
+		cn.txnStatus == txnStatusInFailedTransaction
+}
+
+func (cn *conn) checkIsInTransaction(intxn bool) {
+	if cn.isInTransaction() != intxn {
+		cn.bad = true
+		errorf("unexpected transaction status %v", cn.txnStatus)
+	}
+}
+
+func (cn *conn) Begin() (_ driver.Tx, err error) {
+	if cn.bad {
+		return nil, driver.ErrBadConn
+	}
+	defer cn.errRecover(&err)
+
+	cn.checkIsInTransaction(false)
+	_, commandTag, err := cn.simpleExec("BEGIN")
+	if err != nil {
+		return nil, err
+	}
+	if commandTag != "BEGIN" {
+		cn.bad = true
+		return nil, fmt.Errorf("unexpected command tag %s", commandTag)
+	}
+	if cn.txnStatus != txnStatusIdleInTransaction {
+		cn.bad = true
+		return nil, fmt.Errorf("unexpected transaction status %v", cn.txnStatus)
+	}
+	return cn, nil
+}
+
+func (cn *conn) Commit() (err error) {
+	if cn.bad {
+		return driver.ErrBadConn
+	}
+	defer cn.errRecover(&err)
+
+	cn.checkIsInTransaction(true)
+	// We don't want the client to think that everything is okay if it tries
+	// to commit a failed transaction.  However, no matter what we return,
+	// database/sql will release this connection back into the free connection
+	// pool so we have to abort the current transaction here.  Note that you
+	// would get the same behaviour if you issued a COMMIT in a failed
+	// transaction, so it's also the least surprising thing to do here.
+	if cn.txnStatus == txnStatusInFailedTransaction {
+		if err := cn.Rollback(); err != nil {
+			return err
+		}
+		return ErrInFailedTransaction
+	}
+
+	_, commandTag, err := cn.simpleExec("COMMIT")
+	if err != nil {
+		return err
+	}
+	if commandTag != "COMMIT" {
+		cn.bad = true
+		return fmt.Errorf("unexpected command tag %s", commandTag)
+	}
+	cn.checkIsInTransaction(false)
+	return nil
+}
+
+func (cn *conn) Rollback() (err error) {
+	if cn.bad {
+		return driver.ErrBadConn
+	}
+	defer cn.errRecover(&err)
+
+	cn.checkIsInTransaction(true)
+	_, commandTag, err := cn.simpleExec("ROLLBACK")
+	if err != nil {
+		return err
+	}
+	if commandTag != "ROLLBACK" {
+		return fmt.Errorf("unexpected command tag %s", commandTag)
+	}
+	cn.checkIsInTransaction(false)
+	return nil
+}
+
+func (cn *conn) gname() string {
+	cn.namei++
+	return strconv.FormatInt(int64(cn.namei), 10)
+}
+
+func (cn *conn) simpleExec(q string) (res driver.Result, commandTag string, err error) {
+	b := cn.writeBuf('Q')
+	b.string(q)
+	cn.send(b)
+
+	for {
+		t, r := cn.recv1()
+		switch t {
+		case 'C':
+			res, commandTag = cn.parseComplete(r.string())
+		case 'Z':
+			cn.processReadyForQuery(r)
+			// done
+			return
+		case 'E':
+			err = parseError(r)
+		case 'T', 'D', 'I':
+			// ignore any results
+		default:
+			cn.bad = true
+			errorf("unknown response for simple query: %q", t)
+		}
+	}
+	panic("not reached")
+}
+
+func (cn *conn) simpleQuery(q string) (res driver.Rows, err error) {
+	defer cn.errRecover(&err)
+
+	st := &stmt{cn: cn, name: ""}
+
+	b := cn.writeBuf('Q')
+	b.string(q)
+	cn.send(b)
+
+	for {
+		t, r := cn.recv1()
+		switch t {
+		case 'C', 'I':
+			// We allow queries which don't return any results through Query as
+			// well as Exec.  We still have to give database/sql a rows object
+			// the user can close, though, to avoid connections from being
+			// leaked.  A "rows" with done=true works fine for that purpose.
+			if err != nil {
+				cn.bad = true
+				errorf("unexpected message %q in simple query execution", t)
+			}
+			res = &rows{st: st, done: true}
+		case 'Z':
+			cn.processReadyForQuery(r)
+			// done
+			return
+		case 'E':
+			res = nil
+			err = parseError(r)
+		case 'D':
+			if res == nil {
+				cn.bad = true
+				errorf("unexpected DataRow in simple query execution")
+			}
+			// the query didn't fail; kick off to Next
+			cn.saveMessage(t, r)
+			return
+		case 'T':
+			// res might be non-nil here if we received a previous
+			// CommandComplete, but that's fine; just overwrite it
+			res = &rows{st: st}
+			st.cols, st.rowTyps = parseMeta(r)
+
+			// To work around a bug in QueryRow in Go 1.2 and earlier, wait
+			// until the first DataRow has been received.
+		default:
+			cn.bad = true
+			errorf("unknown response for simple query: %q", t)
+		}
+	}
+	panic("not reached")
+}
+
+func (cn *conn) prepareTo(q, stmtName string) (_ *stmt, err error) {
+	st := &stmt{cn: cn, name: stmtName}
+
+	b := cn.writeBuf('P')
+	b.string(st.name)
+	b.string(q)
+	b.int16(0)
+	cn.send(b)
+
+	b = cn.writeBuf('D')
+	b.byte('S')
+	b.string(st.name)
+	cn.send(b)
+
+	cn.send(cn.writeBuf('S'))
+
+	for {
+		t, r := cn.recv1()
+		switch t {
+		case '1':
+		case 't':
+			nparams := r.int16()
+			st.paramTyps = make([]oid.Oid, nparams)
+
+			for i := range st.paramTyps {
+				st.paramTyps[i] = r.oid()
+			}
+		case 'T':
+			st.cols, st.rowTyps = parseMeta(r)
+		case 'n':
+			// no data
+		case 'Z':
+			cn.processReadyForQuery(r)
+			return st, err
+		case 'E':
+			err = parseError(r)
+		default:
+			cn.bad = true
+			errorf("unexpected describe rows response: %q", t)
+		}
+	}
+
+	panic("not reached")
+}
+
+func (cn *conn) Prepare(q string) (_ driver.Stmt, err error) {
+	if cn.bad {
+		return nil, driver.ErrBadConn
+	}
+	defer cn.errRecover(&err)
+
+	if len(q) >= 4 && strings.EqualFold(q[:4], "COPY") {
+		return cn.prepareCopyIn(q)
+	}
+	return cn.prepareTo(q, cn.gname())
+}
+
+func (cn *conn) Close() (err error) {
+	if cn.bad {
+		return driver.ErrBadConn
+	}
+	defer cn.errRecover(&err)
+
+	// Don't go through send(); ListenerConn relies on us not scribbling on the
+	// scratch buffer of this connection.
+	err = cn.sendSimpleMessage('X')
+	if err != nil {
+		return err
+	}
+
+	return cn.c.Close()
+}
+
+// Implement the "Queryer" interface
+func (cn *conn) Query(query string, args []driver.Value) (_ driver.Rows, err error) {
+	if cn.bad {
+		return nil, driver.ErrBadConn
+	}
+	defer cn.errRecover(&err)
+
+	// Check to see if we can use the "simpleQuery" interface, which is
+	// *much* faster than going through prepare/exec
+	if len(args) == 0 {
+		return cn.simpleQuery(query)
+	}
+
+	st, err := cn.prepareTo(query, "")
+	if err != nil {
+		panic(err)
+	}
+
+	st.exec(args)
+	return &rows{st: st}, nil
+}
+
+// Implement the optional "Execer" interface for one-shot queries
+func (cn *conn) Exec(query string, args []driver.Value) (_ driver.Result, err error) {
+	if cn.bad {
+		return nil, driver.ErrBadConn
+	}
+	defer cn.errRecover(&err)
+
+	// Check to see if we can use the "simpleExec" interface, which is
+	// *much* faster than going through prepare/exec
+	if len(args) == 0 {
+		// ignore commandTag, our caller doesn't care
+		r, _, err := cn.simpleExec(query)
+		return r, err
+	}
+
+	// Use the unnamed statement to defer planning until bind
+	// time, or else value-based selectivity estimates cannot be
+	// used.
+	st, err := cn.prepareTo(query, "")
+	if err != nil {
+		panic(err)
+	}
+
+	r, err := st.Exec(args)
+	if err != nil {
+		panic(err)
+	}
+
+	return r, err
+}
+
+// Assumes len(*m) is > 5
+func (cn *conn) send(m *writeBuf) {
+	b := (*m)[1:]
+	binary.BigEndian.PutUint32(b, uint32(len(b)))
+
+	if (*m)[0] == 0 {
+		*m = b
+	}
+
+	_, err := cn.c.Write(*m)
+	if err != nil {
+		panic(err)
+	}
+}
+
+// Send a message of type typ to the server on the other end of cn.  The
+// message should have no payload.  This method does not use the scratch
+// buffer.
+func (cn *conn) sendSimpleMessage(typ byte) (err error) {
+	_, err = cn.c.Write([]byte{typ, '\x00', '\x00', '\x00', '\x04'})
+	return err
+}
+
+// saveMessage memorizes a message and its buffer in the conn struct.
+// recvMessage will then return these values on the next call to it.  This
+// method is useful in cases where you have to see what the next message is
+// going to be (e.g. to see whether it's an error or not) but you can't handle
+// the message yourself.
+func (cn *conn) saveMessage(typ byte, buf *readBuf) {
+	if cn.saveMessageType != 0 {
+		cn.bad = true
+		errorf("unexpected saveMessageType %d", cn.saveMessageType)
+	}
+	cn.saveMessageType = typ
+	cn.saveMessageBuffer = *buf
+}
+
+// recvMessage receives any message from the backend, or returns an error if
+// a problem occurred while reading the message.
+func (cn *conn) recvMessage(r *readBuf) (byte, error) {
+	// workaround for a QueryRow bug, see exec
+	if cn.saveMessageType != 0 {
+		t := cn.saveMessageType
+		*r = cn.saveMessageBuffer
+		cn.saveMessageType = 0
+		cn.saveMessageBuffer = nil
+		return t, nil
+	}
+
+	x := cn.scratch[:5]
+	_, err := io.ReadFull(cn.buf, x)
+	if err != nil {
+		return 0, err
+	}
+
+	// read the type and length of the message that follows
+	t := x[0]
+	n := int(binary.BigEndian.Uint32(x[1:])) - 4
+	var y []byte
+	if n <= len(cn.scratch) {
+		y = cn.scratch[:n]
+	} else {
+		y = make([]byte, n)
+	}
+	_, err = io.ReadFull(cn.buf, y)
+	if err != nil {
+		return 0, err
+	}
+	*r = y
+	return t, nil
+}
+
+// recv receives a message from the backend, but if an error happened while
+// reading the message or the received message was an ErrorResponse, it panics.
+// NoticeResponses are ignored.  This function should generally be used only
+// during the startup sequence.
+func (cn *conn) recv() (t byte, r *readBuf) {
+	for {
+		var err error
+		r = &readBuf{}
+		t, err = cn.recvMessage(r)
+		if err != nil {
+			panic(err)
+		}
+
+		switch t {
+		case 'E':
+			panic(parseError(r))
+		case 'N':
+			// ignore
+		default:
+			return
+		}
+	}
+
+	panic("not reached")
+}
+
+// recv1Buf is exactly equivalent to recv1, except it uses a buffer supplied by
+// the caller to avoid an allocation.
+func (cn *conn) recv1Buf(r *readBuf) byte {
+	for {
+		t, err := cn.recvMessage(r)
+		if err != nil {
+			panic(err)
+		}
+
+		switch t {
+		case 'A', 'N':
+			// ignore
+		case 'S':
+			cn.processParameterStatus(r)
+		default:
+			return t
+		}
+	}
+
+	panic("not reached")
+}
+
+// recv1 receives a message from the backend, panicking if an error occurs
+// while attempting to read it.  All asynchronous messages are ignored, with
+// the exception of ErrorResponse.
+func (cn *conn) recv1() (t byte, r *readBuf) {
+	r = &readBuf{}
+	t = cn.recv1Buf(r)
+	return t, r
+}
+
+func (cn *conn) ssl(o values) {
+	verifyCaOnly := false
+	tlsConf := tls.Config{}
+	switch mode := o.Get("sslmode"); mode {
+	case "require", "":
+		tlsConf.InsecureSkipVerify = true
+	case "verify-ca":
+		// We must skip TLS's own verification since it requires full
+		// verification since Go 1.3.
+		tlsConf.InsecureSkipVerify = true
+		verifyCaOnly = true
+	case "verify-full":
+		tlsConf.ServerName = o.Get("host")
+	case "disable":
+		return
+	default:
+		errorf(`unsupported sslmode %q; only "require" (default), "verify-full", and "disable" supported`, mode)
+	}
+
+	cn.setupSSLClientCertificates(&tlsConf, o)
+	cn.setupSSLCA(&tlsConf, o)
+
+	w := cn.writeBuf(0)
+	w.int32(80877103)
+	cn.send(w)
+
+	b := cn.scratch[:1]
+	_, err := io.ReadFull(cn.c, b)
+	if err != nil {
+		panic(err)
+	}
+
+	if b[0] != 'S' {
+		panic(ErrSSLNotSupported)
+	}
+
+	client := tls.Client(cn.c, &tlsConf)
+	if verifyCaOnly {
+		cn.verifyCA(client, &tlsConf)
+	}
+	cn.c = client
+}
+
+// verifyCA carries out a TLS handshake to the server and verifies the
+// presented certificate against the effective CA, i.e. the one specified in
+// sslrootcert or the system CA if sslrootcert was not specified.
+func (cn *conn) verifyCA(client *tls.Conn, tlsConf *tls.Config) {
+	err := client.Handshake()
+	if err != nil {
+		panic(err)
+	}
+	certs := client.ConnectionState().PeerCertificates
+	opts := x509.VerifyOptions{
+		DNSName:       client.ConnectionState().ServerName,
+		Intermediates: x509.NewCertPool(),
+		Roots:         tlsConf.RootCAs,
+	}
+	for i, cert := range certs {
+		if i == 0 {
+			continue
+		}
+		opts.Intermediates.AddCert(cert)
+	}
+	_, err = certs[0].Verify(opts)
+	if err != nil {
+		panic(err)
+	}
+}
+
+// This function sets up SSL client certificates based on either the "sslkey"
+// and "sslcert" settings (possibly set via the environment variables PGSSLKEY
+// and PGSSLCERT, respectively), or if they aren't set, from the .postgresql
+// directory in the user's home directory.  If the file paths are set
+// explicitly, the files must exist.  The key file must also not be
+// world-readable, or this function will panic with
+// ErrSSLKeyHasWorldPermissions.
+func (cn *conn) setupSSLClientCertificates(tlsConf *tls.Config, o values) {
+	var missingOk bool
+
+	sslkey := o.Get("sslkey")
+	sslcert := o.Get("sslcert")
+	if sslkey != "" && sslcert != "" {
+		// If the user has set a sslkey and sslcert, they *must* exist.
+		missingOk = false
+	} else {
+		// Automatically load certificates from ~/.postgresql.
+		user, err := user.Current()
+		if err != nil {
+			// user.Current() might fail when cross-compiling.  We have to
+			// ignore the error and continue without client certificates, since
+			// we wouldn't know where to load them from.
+			return
+		}
+
+		sslkey = filepath.Join(user.HomeDir, ".postgresql", "postgresql.key")
+		sslcert = filepath.Join(user.HomeDir, ".postgresql", "postgresql.crt")
+		missingOk = true
+	}
+
+	// Check that both files exist, and report the error or stop depending on
+	// which behaviour we want.  Note that we don't do any more extensive
+	// checks than this (such as checking that the paths aren't directories);
+	// LoadX509KeyPair() will take care of the rest.
+	keyfinfo, err := os.Stat(sslkey)
+	if err != nil && missingOk {
+		return
+	} else if err != nil {
+		panic(err)
+	}
+	_, err = os.Stat(sslcert)
+	if err != nil && missingOk {
+		return
+	} else if err != nil {
+		panic(err)
+	}
+
+	// If we got this far, the key file must also have the correct permissions
+	kmode := keyfinfo.Mode()
+	if kmode != kmode&0600 {
+		panic(ErrSSLKeyHasWorldPermissions)
+	}
+
+	cert, err := tls.LoadX509KeyPair(sslcert, sslkey)
+	if err != nil {
+		panic(err)
+	}
+	tlsConf.Certificates = []tls.Certificate{cert}
+}
+
+// Sets up RootCAs in the TLS configuration if sslrootcert is set.
+func (cn *conn) setupSSLCA(tlsConf *tls.Config, o values) {
+	if sslrootcert := o.Get("sslrootcert"); sslrootcert != "" {
+		tlsConf.RootCAs = x509.NewCertPool()
+
+		cert, err := ioutil.ReadFile(sslrootcert)
+		if err != nil {
+			panic(err)
+		}
+
+		ok := tlsConf.RootCAs.AppendCertsFromPEM(cert)
+		if !ok {
+			errorf("couldn't parse pem in sslrootcert")
+		}
+	}
+}
+
+// isDriverSetting returns true iff a setting is purely for the configuring the
+// driver's options and should not be sent to the server in the connection
+// startup packet.
+func isDriverSetting(key string) bool {
+	switch key {
+	case "host", "port":
+		return true
+	case "password":
+		return true
+	case "sslmode", "sslcert", "sslkey", "sslrootcert":
+		return true
+	case "fallback_application_name":
+		return true
+	case "connect_timeout":
+		return true
+
+	default:
+		return false
+	}
+	panic("not reached")
+}
+
+func (cn *conn) startup(o values) {
+	w := cn.writeBuf(0)
+	w.int32(196608)
+	// Send the backend the name of the database we want to connect to, and the
+	// user we want to connect as.  Additionally, we send over any run-time
+	// parameters potentially included in the connection string.  If the server
+	// doesn't recognize any of them, it will reply with an error.
+	for k, v := range o {
+		if isDriverSetting(k) {
+			// skip options which can't be run-time parameters
+			continue
+		}
+		// The protocol requires us to supply the database name as "database"
+		// instead of "dbname".
+		if k == "dbname" {
+			k = "database"
+		}
+		w.string(k)
+		w.string(v)
+	}
+	w.string("")
+	cn.send(w)
+
+	for {
+		t, r := cn.recv()
+		switch t {
+		case 'K':
+		case 'S':
+			cn.processParameterStatus(r)
+		case 'R':
+			cn.auth(r, o)
+		case 'Z':
+			cn.processReadyForQuery(r)
+			return
+		default:
+			errorf("unknown response for startup: %q", t)
+		}
+	}
+}
+
+func (cn *conn) auth(r *readBuf, o values) {
+	switch code := r.int32(); code {
+	case 0:
+		// OK
+	case 3:
+		w := cn.writeBuf('p')
+		w.string(o.Get("password"))
+		cn.send(w)
+
+		t, r := cn.recv()
+		if t != 'R' {
+			errorf("unexpected password response: %q", t)
+		}
+
+		if r.int32() != 0 {
+			errorf("unexpected authentication response: %q", t)
+		}
+	case 5:
+		s := string(r.next(4))
+		w := cn.writeBuf('p')
+		w.string("md5" + md5s(md5s(o.Get("password")+o.Get("user"))+s))
+		cn.send(w)
+
+		t, r := cn.recv()
+		if t != 'R' {
+			errorf("unexpected password response: %q", t)
+		}
+
+		if r.int32() != 0 {
+			errorf("unexpected authentication response: %q", t)
+		}
+	default:
+		errorf("unknown authentication response: %d", code)
+	}
+}
+
+type stmt struct {
+	cn        *conn
+	name      string
+	cols      []string
+	rowTyps   []oid.Oid
+	paramTyps []oid.Oid
+	closed    bool
+}
+
+func (st *stmt) Close() (err error) {
+	if st.closed {
+		return nil
+	}
+	if st.cn.bad {
+		return driver.ErrBadConn
+	}
+	defer st.cn.errRecover(&err)
+
+	w := st.cn.writeBuf('C')
+	w.byte('S')
+	w.string(st.name)
+	st.cn.send(w)
+
+	st.cn.send(st.cn.writeBuf('S'))
+
+	t, _ := st.cn.recv1()
+	if t != '3' {
+		st.cn.bad = true
+		errorf("unexpected close response: %q", t)
+	}
+	st.closed = true
+
+	t, r := st.cn.recv1()
+	if t != 'Z' {
+		st.cn.bad = true
+		errorf("expected ready for query, but got: %q", t)
+	}
+	st.cn.processReadyForQuery(r)
+
+	return nil
+}
+
+func (st *stmt) Query(v []driver.Value) (r driver.Rows, err error) {
+	if st.cn.bad {
+		return nil, driver.ErrBadConn
+	}
+	defer st.cn.errRecover(&err)
+
+	st.exec(v)
+	return &rows{st: st}, nil
+}
+
+func (st *stmt) Exec(v []driver.Value) (res driver.Result, err error) {
+	if st.cn.bad {
+		return nil, driver.ErrBadConn
+	}
+	defer st.cn.errRecover(&err)
+
+	st.exec(v)
+
+	for {
+		t, r := st.cn.recv1()
+		switch t {
+		case 'E':
+			err = parseError(r)
+		case 'C':
+			res, _ = st.cn.parseComplete(r.string())
+		case 'Z':
+			st.cn.processReadyForQuery(r)
+			// done
+			return
+		case 'T', 'D', 'I':
+			// ignore any results
+		default:
+			st.cn.bad = true
+			errorf("unknown exec response: %q", t)
+		}
+	}
+
+	panic("not reached")
+}
+
+func (st *stmt) exec(v []driver.Value) {
+	if len(v) >= 65536 {
+		errorf("got %d parameters but PostgreSQL only supports 65535 parameters", len(v))
+	}
+	if len(v) != len(st.paramTyps) {
+		errorf("got %d parameters but the statement requires %d", len(v), len(st.paramTyps))
+	}
+
+	w := st.cn.writeBuf('B')
+	w.string("")
+	w.string(st.name)
+	w.int16(0)
+	w.int16(len(v))
+	for i, x := range v {
+		if x == nil {
+			w.int32(-1)
+		} else {
+			b := encode(&st.cn.parameterStatus, x, st.paramTyps[i])
+			w.int32(len(b))
+			w.bytes(b)
+		}
+	}
+	w.int16(0)
+	st.cn.send(w)
+
+	w = st.cn.writeBuf('E')
+	w.string("")
+	w.int32(0)
+	st.cn.send(w)
+
+	st.cn.send(st.cn.writeBuf('S'))
+
+	var err error
+	for {
+		t, r := st.cn.recv1()
+		switch t {
+		case 'E':
+			err = parseError(r)
+		case '2':
+			if err != nil {
+				panic(err)
+			}
+			goto workaround
+		case 'Z':
+			st.cn.processReadyForQuery(r)
+			if err != nil {
+				panic(err)
+			}
+			return
+		default:
+			st.cn.bad = true
+			errorf("unexpected bind response: %q", t)
+		}
+	}
+
+	// Work around a bug in sql.DB.QueryRow: in Go 1.2 and earlier it ignores
+	// any errors from rows.Next, which masks errors that happened during the
+	// execution of the query.  To avoid the problem in common cases, we wait
+	// here for one more message from the database.  If it's not an error the
+	// query will likely succeed (or perhaps has already, if it's a
+	// CommandComplete), so we push the message into the conn struct; recv1
+	// will return it as the next message for rows.Next or rows.Close.
+	// However, if it's an error, we wait until ReadyForQuery and then return
+	// the error to our caller.
+workaround:
+	for {
+		t, r := st.cn.recv1()
+		switch t {
+		case 'E':
+			err = parseError(r)
+		case 'C', 'D', 'I':
+			// the query didn't fail, but we can't process this message
+			st.cn.saveMessage(t, r)
+			return
+		case 'Z':
+			if err == nil {
+				st.cn.bad = true
+				errorf("unexpected ReadyForQuery during extended query execution")
+			}
+			st.cn.processReadyForQuery(r)
+			panic(err)
+		default:
+			st.cn.bad = true
+			errorf("unexpected message during query execution: %q", t)
+		}
+	}
+}
+
+func (st *stmt) NumInput() int {
+	return len(st.paramTyps)
+}
+
+// parseComplete parses the "command tag" from a CommandComplete message, and
+// returns the number of rows affected (if applicable) and a string
+// identifying only the command that was executed, e.g. "ALTER TABLE".  If the
+// command tag could not be parsed, parseComplete panics.
+func (cn *conn) parseComplete(commandTag string) (driver.Result, string) {
+	commandsWithAffectedRows := []string{
+		"SELECT ",
+		// INSERT is handled below
+		"UPDATE ",
+		"DELETE ",
+		"FETCH ",
+		"MOVE ",
+		"COPY ",
+	}
+
+	var affectedRows *string
+	for _, tag := range commandsWithAffectedRows {
+		if strings.HasPrefix(commandTag, tag) {
+			t := commandTag[len(tag):]
+			affectedRows = &t
+			commandTag = tag[:len(tag)-1]
+			break
+		}
+	}
+	// INSERT also includes the oid of the inserted row in its command tag.
+	// Oids in user tables are deprecated, and the oid is only returned when
+	// exactly one row is inserted, so it's unlikely to be of value to any
+	// real-world application and we can ignore it.
+	if affectedRows == nil && strings.HasPrefix(commandTag, "INSERT ") {
+		parts := strings.Split(commandTag, " ")
+		if len(parts) != 3 {
+			cn.bad = true
+			errorf("unexpected INSERT command tag %s", commandTag)
+		}
+		affectedRows = &parts[len(parts)-1]
+		commandTag = "INSERT"
+	}
+	// There should be no affected rows attached to the tag, just return it
+	if affectedRows == nil {
+		return driver.RowsAffected(0), commandTag
+	}
+	n, err := strconv.ParseInt(*affectedRows, 10, 64)
+	if err != nil {
+		cn.bad = true
+		errorf("could not parse commandTag: %s", err)
+	}
+	return driver.RowsAffected(n), commandTag
+}
+
+type rows struct {
+	st   *stmt
+	done bool
+	rb   readBuf
+}
+
+func (rs *rows) Close() error {
+	// no need to look at cn.bad as Next() will
+	for {
+		err := rs.Next(nil)
+		switch err {
+		case nil:
+		case io.EOF:
+			return nil
+		default:
+			return err
+		}
+	}
+	panic("not reached")
+}
+
+func (rs *rows) Columns() []string {
+	return rs.st.cols
+}
+
+func (rs *rows) Next(dest []driver.Value) (err error) {
+	if rs.done {
+		return io.EOF
+	}
+
+	conn := rs.st.cn
+	if conn.bad {
+		return driver.ErrBadConn
+	}
+	defer conn.errRecover(&err)
+
+	for {
+		t := conn.recv1Buf(&rs.rb)
+		switch t {
+		case 'E':
+			err = parseError(&rs.rb)
+		case 'C', 'I':
+			continue
+		case 'Z':
+			conn.processReadyForQuery(&rs.rb)
+			rs.done = true
+			if err != nil {
+				return err
+			}
+			return io.EOF
+		case 'D':
+			n := rs.rb.int16()
+			if n < len(dest) {
+				dest = dest[:n]
+			}
+			for i := range dest {
+				l := rs.rb.int32()
+				if l == -1 {
+					dest[i] = nil
+					continue
+				}
+				dest[i] = decode(&conn.parameterStatus, rs.rb.next(l), rs.st.rowTyps[i])
+			}
+			return
+		default:
+			errorf("unexpected message after execute: %q", t)
+		}
+	}
+
+	panic("not reached")
+}
+
+// QuoteIdentifier quotes an "identifier" (e.g. a table or a column name) to be
+// used as part of an SQL statement.  For example:
+//
+//    tblname := "my_table"
+//    data := "my_data"
+//    err = db.Exec(fmt.Sprintf("INSERT INTO %s VALUES ($1)", pq.QuoteIdentifier(tblname)), data)
+//
+// Any double quotes in name will be escaped.  The quoted identifier will be
+// case sensitive when used in a query.  If the input string contains a zero
+// byte, the result will be truncated immediately before it.
+func QuoteIdentifier(name string) string {
+	end := strings.IndexRune(name, 0)
+	if end > -1 {
+		name = name[:end]
+	}
+	return `"` + strings.Replace(name, `"`, `""`, -1) + `"`
+}
+
+func md5s(s string) string {
+	h := md5.New()
+	h.Write([]byte(s))
+	return fmt.Sprintf("%x", h.Sum(nil))
+}
+
+func (c *conn) processParameterStatus(r *readBuf) {
+	var err error
+
+	param := r.string()
+	switch param {
+	case "server_version":
+		var major1 int
+		var major2 int
+		var minor int
+		_, err = fmt.Sscanf(r.string(), "%d.%d.%d", &major1, &major2, &minor)
+		if err == nil {
+			c.parameterStatus.serverVersion = major1*10000 + major2*100 + minor
+		}
+
+	case "TimeZone":
+		c.parameterStatus.currentLocation, err = time.LoadLocation(r.string())
+		if err != nil {
+			c.parameterStatus.currentLocation = nil
+		}
+
+	default:
+		// ignore
+	}
+}
+
+func (c *conn) processReadyForQuery(r *readBuf) {
+	c.txnStatus = transactionStatus(r.byte())
+}
+
+func parseMeta(r *readBuf) (cols []string, rowTyps []oid.Oid) {
+	n := r.int16()
+	cols = make([]string, n)
+	rowTyps = make([]oid.Oid, n)
+	for i := range cols {
+		cols[i] = r.string()
+		r.next(6)
+		rowTyps[i] = r.oid()
+		r.next(8)
+	}
+	return
+}
+
+// parseEnviron tries to mimic some of libpq's environment handling
+//
+// To ease testing, it does not directly reference os.Environ, but is
+// designed to accept its output.
+//
+// Environment-set connection information is intended to have a higher
+// precedence than a library default but lower than any explicitly
+// passed information (such as in the URL or connection string).
+func parseEnviron(env []string) (out map[string]string) {
+	out = make(map[string]string)
+
+	for _, v := range env {
+		parts := strings.SplitN(v, "=", 2)
+
+		accrue := func(keyname string) {
+			out[keyname] = parts[1]
+		}
+		unsupported := func() {
+			panic(fmt.Sprintf("setting %v not supported", parts[0]))
+		}
+
+		// The order of these is the same as is seen in the
+		// PostgreSQL 9.1 manual. Unsupported but well-defined
+		// keys cause a panic; these should be unset prior to
+		// execution. Options which pq expects to be set to a
+		// certain value are allowed, but must be set to that
+		// value if present (they can, of course, be absent).
+		switch parts[0] {
+		case "PGHOST":
+			accrue("host")
+		case "PGHOSTADDR":
+			unsupported()
+		case "PGPORT":
+			accrue("port")
+		case "PGDATABASE":
+			accrue("dbname")
+		case "PGUSER":
+			accrue("user")
+		case "PGPASSWORD":
+			accrue("password")
+		case "PGPASSFILE", "PGSERVICE", "PGSERVICEFILE", "PGREALM":
+			unsupported()
+		case "PGOPTIONS":
+			accrue("options")
+		case "PGAPPNAME":
+			accrue("application_name")
+		case "PGSSLMODE":
+			accrue("sslmode")
+		case "PGSSLCERT":
+			accrue("sslcert")
+		case "PGSSLKEY":
+			accrue("sslkey")
+		case "PGSSLROOTCERT":
+			accrue("sslrootcert")
+		case "PGREQUIRESSL", "PGSSLCRL":
+			unsupported()
+		case "PGREQUIREPEER":
+			unsupported()
+		case "PGKRBSRVNAME", "PGGSSLIB":
+			unsupported()
+		case "PGCONNECT_TIMEOUT":
+			accrue("connect_timeout")
+		case "PGCLIENTENCODING":
+			accrue("client_encoding")
+		case "PGDATESTYLE":
+			accrue("datestyle")
+		case "PGTZ":
+			accrue("timezone")
+		case "PGGEQO":
+			accrue("geqo")
+		case "PGSYSCONFDIR", "PGLOCALEDIR":
+			unsupported()
+		}
+	}
+
+	return out
+}
+
+// isUTF8 returns whether name is a fuzzy variation of the string "UTF-8".
+func isUTF8(name string) bool {
+	// Recognize all sorts of silly things as "UTF-8", like Postgres does
+	s := strings.Map(alnumLowerASCII, name)
+	return s == "utf8" || s == "unicode"
+}
+
+func alnumLowerASCII(ch rune) rune {
+	if 'A' <= ch && ch <= 'Z' {
+		return ch + ('a' - 'A')
+	}
+	if 'a' <= ch && ch <= 'z' || '0' <= ch && ch <= '9' {
+		return ch
+	}
+	return -1 // discard
+}
diff --git a/Godeps/_workspace/src/github.com/lib/pq/conn_test.go b/Godeps/_workspace/src/github.com/lib/pq/conn_test.go
new file mode 100644
index 00000000..378e110b
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/lib/pq/conn_test.go
@@ -0,0 +1,1244 @@
+package pq
+
+import (
+	"database/sql"
+	"database/sql/driver"
+	"fmt"
+	"io"
+	"os"
+	"reflect"
+	"runtime"
+	"strings"
+	"testing"
+	"time"
+)
+
+type Fatalistic interface {
+	Fatal(args ...interface{})
+}
+
+func openTestConnConninfo(conninfo string) (*sql.DB, error) {
+	datname := os.Getenv("PGDATABASE")
+	sslmode := os.Getenv("PGSSLMODE")
+	timeout := os.Getenv("PGCONNECT_TIMEOUT")
+
+	if datname == "" {
+		os.Setenv("PGDATABASE", "pqgotest")
+	}
+
+	if sslmode == "" {
+		os.Setenv("PGSSLMODE", "disable")
+	}
+
+	if timeout == "" {
+		os.Setenv("PGCONNECT_TIMEOUT", "20")
+	}
+
+	return sql.Open("postgres", conninfo)
+}
+
+func openTestConn(t Fatalistic) *sql.DB {
+	conn, err := openTestConnConninfo("")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	return conn
+}
+
+func getServerVersion(t *testing.T, db *sql.DB) int {
+	var version int
+	err := db.QueryRow("SHOW server_version_num").Scan(&version)
+	if err != nil {
+		t.Fatal(err)
+	}
+	return version
+}
+
+func TestReconnect(t *testing.T) {
+	if runtime.Version() == "go1.0.2" {
+		fmt.Println("Skipping failing test; " +
+			"fixed in database/sql on go1.0.3+")
+		return
+	}
+
+	db1 := openTestConn(t)
+	defer db1.Close()
+	tx, err := db1.Begin()
+	if err != nil {
+		t.Fatal(err)
+	}
+	var pid1 int
+	err = tx.QueryRow("SELECT pg_backend_pid()").Scan(&pid1)
+	if err != nil {
+		t.Fatal(err)
+	}
+	db2 := openTestConn(t)
+	defer db2.Close()
+	_, err = db2.Exec("SELECT pg_terminate_backend($1)", pid1)
+	if err != nil {
+		t.Fatal(err)
+	}
+	// The rollback will probably "fail" because we just killed
+	// its connection above
+	_ = tx.Rollback()
+
+	const expected int = 42
+	var result int
+	err = db1.QueryRow(fmt.Sprintf("SELECT %d", expected)).Scan(&result)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if result != expected {
+		t.Errorf("got %v; expected %v", result, expected)
+	}
+}
+
+func TestCommitInFailedTransaction(t *testing.T) {
+	db := openTestConn(t)
+	defer db.Close()
+
+	txn, err := db.Begin()
+	if err != nil {
+		t.Fatal(err)
+	}
+	rows, err := txn.Query("SELECT error")
+	if err == nil {
+		rows.Close()
+		t.Fatal("expected failure")
+	}
+	err = txn.Commit()
+	if err != ErrInFailedTransaction {
+		t.Fatalf("expected ErrInFailedTransaction; got %#v", err)
+	}
+}
+
+func TestOpenURL(t *testing.T) {
+	db, err := openTestConnConninfo("postgres://")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer db.Close()
+	// database/sql might not call our Open at all unless we do something with
+	// the connection
+	txn, err := db.Begin()
+	if err != nil {
+		t.Fatal(err)
+	}
+	txn.Rollback()
+}
+
+func TestExec(t *testing.T) {
+	db := openTestConn(t)
+	defer db.Close()
+
+	_, err := db.Exec("CREATE TEMP TABLE temp (a int)")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	r, err := db.Exec("INSERT INTO temp VALUES (1)")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if n, _ := r.RowsAffected(); n != 1 {
+		t.Fatalf("expected 1 row affected, not %d", n)
+	}
+
+	r, err = db.Exec("INSERT INTO temp VALUES ($1), ($2), ($3)", 1, 2, 3)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if n, _ := r.RowsAffected(); n != 3 {
+		t.Fatalf("expected 3 rows affected, not %d", n)
+	}
+
+	// SELECT doesn't send the number of returned rows in the command tag
+	// before 9.0
+	if getServerVersion(t, db) >= 90000 {
+		r, err = db.Exec("SELECT g FROM generate_series(1, 2) g")
+		if err != nil {
+			t.Fatal(err)
+		}
+		if n, _ := r.RowsAffected(); n != 2 {
+			t.Fatalf("expected 2 rows affected, not %d", n)
+		}
+
+		r, err = db.Exec("SELECT g FROM generate_series(1, $1) g", 3)
+		if err != nil {
+			t.Fatal(err)
+		}
+		if n, _ := r.RowsAffected(); n != 3 {
+			t.Fatalf("expected 3 rows affected, not %d", n)
+		}
+	}
+}
+
+func TestStatment(t *testing.T) {
+	db := openTestConn(t)
+	defer db.Close()
+
+	st, err := db.Prepare("SELECT 1")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	st1, err := db.Prepare("SELECT 2")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	r, err := st.Query()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer r.Close()
+
+	if !r.Next() {
+		t.Fatal("expected row")
+	}
+
+	var i int
+	err = r.Scan(&i)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if i != 1 {
+		t.Fatalf("expected 1, got %d", i)
+	}
+
+	// st1
+
+	r1, err := st1.Query()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer r1.Close()
+
+	if !r1.Next() {
+		if r.Err() != nil {
+			t.Fatal(r1.Err())
+		}
+		t.Fatal("expected row")
+	}
+
+	err = r1.Scan(&i)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if i != 2 {
+		t.Fatalf("expected 2, got %d", i)
+	}
+}
+
+func TestRowsCloseBeforeDone(t *testing.T) {
+	db := openTestConn(t)
+	defer db.Close()
+
+	r, err := db.Query("SELECT 1")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = r.Close()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if r.Next() {
+		t.Fatal("unexpected row")
+	}
+
+	if r.Err() != nil {
+		t.Fatal(r.Err())
+	}
+}
+
+func TestParameterCountMismatch(t *testing.T) {
+	db := openTestConn(t)
+	defer db.Close()
+
+	var notused int
+	err := db.QueryRow("SELECT false", 1).Scan(&notused)
+	if err == nil {
+		t.Fatal("expected err")
+	}
+	// make sure we clean up correctly
+	err = db.QueryRow("SELECT 1").Scan(&notused)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = db.QueryRow("SELECT $1").Scan(&notused)
+	if err == nil {
+		t.Fatal("expected err")
+	}
+	// make sure we clean up correctly
+	err = db.QueryRow("SELECT 1").Scan(&notused)
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+// Test that EmptyQueryResponses are handled correctly.
+func TestEmptyQuery(t *testing.T) {
+	db := openTestConn(t)
+	defer db.Close()
+
+	_, err := db.Exec("")
+	if err != nil {
+		t.Fatal(err)
+	}
+	rows, err := db.Query("")
+	if err != nil {
+		t.Fatal(err)
+	}
+	cols, err := rows.Columns()
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(cols) != 0 {
+		t.Fatalf("unexpected number of columns %d in response to an empty query", len(cols))
+	}
+	if rows.Next() {
+		t.Fatal("unexpected row")
+	}
+	if rows.Err() != nil {
+		t.Fatal(rows.Err())
+	}
+
+	stmt, err := db.Prepare("")
+	if err != nil {
+		t.Fatal(err)
+	}
+	_, err = stmt.Exec()
+	if err != nil {
+		t.Fatal(err)
+	}
+	rows, err = stmt.Query()
+	if err != nil {
+		t.Fatal(err)
+	}
+	cols, err = rows.Columns()
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(cols) != 0 {
+		t.Fatalf("unexpected number of columns %d in response to an empty query", len(cols))
+	}
+	if rows.Next() {
+		t.Fatal("unexpected row")
+	}
+	if rows.Err() != nil {
+		t.Fatal(rows.Err())
+	}
+}
+
+func TestEncodeDecode(t *testing.T) {
+	db := openTestConn(t)
+	defer db.Close()
+
+	q := `
+		SELECT
+			E'\\000\\001\\002'::bytea,
+			'foobar'::text,
+			NULL::integer,
+			'2000-1-1 01:02:03.04-7'::timestamptz,
+			0::boolean,
+			123,
+			3.14::float8
+		WHERE
+			    E'\\000\\001\\002'::bytea = $1
+			AND 'foobar'::text = $2
+			AND $3::integer is NULL
+	`
+	// AND '2000-1-1 12:00:00.000000-7'::timestamp = $3
+
+	exp1 := []byte{0, 1, 2}
+	exp2 := "foobar"
+
+	r, err := db.Query(q, exp1, exp2, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer r.Close()
+
+	if !r.Next() {
+		if r.Err() != nil {
+			t.Fatal(r.Err())
+		}
+		t.Fatal("expected row")
+	}
+
+	var got1 []byte
+	var got2 string
+	var got3 = sql.NullInt64{Valid: true}
+	var got4 time.Time
+	var got5, got6, got7 interface{}
+
+	err = r.Scan(&got1, &got2, &got3, &got4, &got5, &got6, &got7)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if !reflect.DeepEqual(exp1, got1) {
+		t.Errorf("expected %q byte: %q", exp1, got1)
+	}
+
+	if !reflect.DeepEqual(exp2, got2) {
+		t.Errorf("expected %q byte: %q", exp2, got2)
+	}
+
+	if got3.Valid {
+		t.Fatal("expected invalid")
+	}
+
+	if got4.Year() != 2000 {
+		t.Fatal("wrong year")
+	}
+
+	if got5 != false {
+		t.Fatalf("expected false, got %q", got5)
+	}
+
+	if got6 != int64(123) {
+		t.Fatalf("expected 123, got %d", got6)
+	}
+
+	if got7 != float64(3.14) {
+		t.Fatalf("expected 3.14, got %f", got7)
+	}
+}
+
+func TestNoData(t *testing.T) {
+	db := openTestConn(t)
+	defer db.Close()
+
+	st, err := db.Prepare("SELECT 1 WHERE true = false")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer st.Close()
+
+	r, err := st.Query()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer r.Close()
+
+	if r.Next() {
+		if r.Err() != nil {
+			t.Fatal(r.Err())
+		}
+		t.Fatal("unexpected row")
+	}
+
+	_, err = db.Query("SELECT * FROM nonexistenttable WHERE age=$1", 20)
+	if err == nil {
+		t.Fatal("Should have raised an error on non existent table")
+	}
+
+	_, err = db.Query("SELECT * FROM nonexistenttable")
+	if err == nil {
+		t.Fatal("Should have raised an error on non existent table")
+	}
+}
+
+func TestErrorDuringStartup(t *testing.T) {
+	// Don't use the normal connection setup, this is intended to
+	// blow up in the startup packet from a non-existent user.
+	db, err := openTestConnConninfo("user=thisuserreallydoesntexist")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer db.Close()
+
+	_, err = db.Begin()
+	if err == nil {
+		t.Fatal("expected error")
+	}
+
+	e, ok := err.(*Error)
+	if !ok {
+		t.Fatalf("expected Error, got %#v", err)
+	} else if e.Code.Name() != "invalid_authorization_specification" && e.Code.Name() != "invalid_password" {
+		t.Fatalf("expected invalid_authorization_specification or invalid_password, got %s (%+v)", e.Code.Name(), err)
+	}
+}
+
+func TestBadConn(t *testing.T) {
+	var err error
+
+	cn := conn{}
+	func() {
+		defer cn.errRecover(&err)
+		panic(io.EOF)
+	}()
+	if err != driver.ErrBadConn {
+		t.Fatalf("expected driver.ErrBadConn, got: %#v", err)
+	}
+	if !cn.bad {
+		t.Fatalf("expected cn.bad")
+	}
+
+	cn = conn{}
+	func() {
+		defer cn.errRecover(&err)
+		e := &Error{Severity: Efatal}
+		panic(e)
+	}()
+	if err != driver.ErrBadConn {
+		t.Fatalf("expected driver.ErrBadConn, got: %#v", err)
+	}
+	if !cn.bad {
+		t.Fatalf("expected cn.bad")
+	}
+}
+
+func TestErrorOnExec(t *testing.T) {
+	db := openTestConn(t)
+	defer db.Close()
+
+	txn, err := db.Begin()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer txn.Rollback()
+
+	_, err = txn.Exec("CREATE TEMPORARY TABLE foo(f1 int PRIMARY KEY)")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	_, err = txn.Exec("INSERT INTO foo VALUES (0), (0)")
+	if err == nil {
+		t.Fatal("Should have raised error")
+	}
+
+	e, ok := err.(*Error)
+	if !ok {
+		t.Fatalf("expected Error, got %#v", err)
+	} else if e.Code.Name() != "unique_violation" {
+		t.Fatalf("expected unique_violation, got %s (%+v)", e.Code.Name(), err)
+	}
+}
+
+func TestErrorOnQuery(t *testing.T) {
+	db := openTestConn(t)
+	defer db.Close()
+
+	txn, err := db.Begin()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer txn.Rollback()
+
+	_, err = txn.Exec("CREATE TEMPORARY TABLE foo(f1 int PRIMARY KEY)")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	_, err = txn.Query("INSERT INTO foo VALUES (0), (0)")
+	if err == nil {
+		t.Fatal("Should have raised error")
+	}
+
+	e, ok := err.(*Error)
+	if !ok {
+		t.Fatalf("expected Error, got %#v", err)
+	} else if e.Code.Name() != "unique_violation" {
+		t.Fatalf("expected unique_violation, got %s (%+v)", e.Code.Name(), err)
+	}
+}
+
+func TestErrorOnQueryRowSimpleQuery(t *testing.T) {
+	db := openTestConn(t)
+	defer db.Close()
+
+	txn, err := db.Begin()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer txn.Rollback()
+
+	_, err = txn.Exec("CREATE TEMPORARY TABLE foo(f1 int PRIMARY KEY)")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	var v int
+	err = txn.QueryRow("INSERT INTO foo VALUES (0), (0)").Scan(&v)
+	if err == nil {
+		t.Fatal("Should have raised error")
+	}
+
+	e, ok := err.(*Error)
+	if !ok {
+		t.Fatalf("expected Error, got %#v", err)
+	} else if e.Code.Name() != "unique_violation" {
+		t.Fatalf("expected unique_violation, got %s (%+v)", e.Code.Name(), err)
+	}
+}
+
+// Test the QueryRow bug workarounds in stmt.exec() and simpleQuery()
+func TestQueryRowBugWorkaround(t *testing.T) {
+	db := openTestConn(t)
+	defer db.Close()
+
+	// stmt.exec()
+	_, err := db.Exec("CREATE TEMP TABLE notnulltemp (a varchar(10) not null)")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	var a string
+	err = db.QueryRow("INSERT INTO notnulltemp(a) values($1) RETURNING a", nil).Scan(&a)
+	if err == sql.ErrNoRows {
+		t.Fatalf("expected constraint violation error; got: %v", err)
+	}
+	pge, ok := err.(*Error)
+	if !ok {
+		t.Fatalf("expected *Error; got: %#v", err)
+	}
+	if pge.Code.Name() != "not_null_violation" {
+		t.Fatalf("expected not_null_violation; got: %s (%+v)", pge.Code.Name(), err)
+	}
+
+	// Test workaround in simpleQuery()
+	tx, err := db.Begin()
+	if err != nil {
+		t.Fatalf("unexpected error %s in Begin", err)
+	}
+	defer tx.Rollback()
+
+	_, err = tx.Exec("SET LOCAL check_function_bodies TO FALSE")
+	if err != nil {
+		t.Fatalf("could not disable check_function_bodies: %s", err)
+	}
+	_, err = tx.Exec(`
+CREATE OR REPLACE FUNCTION bad_function()
+RETURNS integer
+-- hack to prevent the function from being inlined
+SET check_function_bodies TO TRUE
+AS $$
+	SELECT text 'bad'
+$$ LANGUAGE sql`)
+	if err != nil {
+		t.Fatalf("could not create function: %s", err)
+	}
+
+	err = tx.QueryRow("SELECT * FROM bad_function()").Scan(&a)
+	if err == nil {
+		t.Fatalf("expected error")
+	}
+	pge, ok = err.(*Error)
+	if !ok {
+		t.Fatalf("expected *Error; got: %#v", err)
+	}
+	if pge.Code.Name() != "invalid_function_definition" {
+		t.Fatalf("expected invalid_function_definition; got: %s (%+v)", pge.Code.Name(), err)
+	}
+
+	err = tx.Rollback()
+	if err != nil {
+		t.Fatalf("unexpected error %s in Rollback", err)
+	}
+
+	// Also test that simpleQuery()'s workaround works when the query fails
+	// after a row has been received.
+	rows, err := db.Query(`
+select
+	(select generate_series(1, ss.i))
+from (select gs.i
+      from generate_series(1, 2) gs(i)
+      order by gs.i limit 2) ss`)
+	if err != nil {
+		t.Fatalf("query failed: %s", err)
+	}
+	if !rows.Next() {
+		t.Fatalf("expected at least one result row; got %s", rows.Err())
+	}
+	var i int
+	err = rows.Scan(&i)
+	if err != nil {
+		t.Fatalf("rows.Scan() failed: %s", err)
+	}
+	if i != 1 {
+		t.Fatalf("unexpected value for i: %d", i)
+	}
+	if rows.Next() {
+		t.Fatalf("unexpected row")
+	}
+	pge, ok = rows.Err().(*Error)
+	if !ok {
+		t.Fatalf("expected *Error; got: %#v", err)
+	}
+	if pge.Code.Name() != "cardinality_violation" {
+		t.Fatalf("expected cardinality_violation; got: %s (%+v)", pge.Code.Name(), rows.Err())
+	}
+}
+
+func TestSimpleQuery(t *testing.T) {
+	db := openTestConn(t)
+	defer db.Close()
+
+	r, err := db.Query("select 1")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer r.Close()
+
+	if !r.Next() {
+		t.Fatal("expected row")
+	}
+}
+
+func TestBindError(t *testing.T) {
+	db := openTestConn(t)
+	defer db.Close()
+
+	_, err := db.Exec("create temp table test (i integer)")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	_, err = db.Query("select * from test where i=$1", "hhh")
+	if err == nil {
+		t.Fatal("expected an error")
+	}
+
+	// Should not get error here
+	r, err := db.Query("select * from test where i=$1", 1)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer r.Close()
+}
+
+func TestParseErrorInExtendedQuery(t *testing.T) {
+	db := openTestConn(t)
+	defer db.Close()
+
+	rows, err := db.Query("PARSE_ERROR $1", 1)
+	if err == nil {
+		t.Fatal("expected error")
+	}
+
+	rows, err = db.Query("SELECT 1")
+	if err != nil {
+		t.Fatal(err)
+	}
+	rows.Close()
+}
+
+// TestReturning tests that an INSERT query using the RETURNING clause returns a row.
+func TestReturning(t *testing.T) {
+	db := openTestConn(t)
+	defer db.Close()
+
+	_, err := db.Exec("CREATE TEMP TABLE distributors (did integer default 0, dname text)")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	rows, err := db.Query("INSERT INTO distributors (did, dname) VALUES (DEFAULT, 'XYZ Widgets') " +
+		"RETURNING did;")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !rows.Next() {
+		t.Fatal("no rows")
+	}
+	var did int
+	err = rows.Scan(&did)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if did != 0 {
+		t.Fatalf("bad value for did: got %d, want %d", did, 0)
+	}
+
+	if rows.Next() {
+		t.Fatal("unexpected next row")
+	}
+	err = rows.Err()
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestIssue186(t *testing.T) {
+	db := openTestConn(t)
+	defer db.Close()
+
+	// Exec() a query which returns results
+	_, err := db.Exec("VALUES (1), (2), (3)")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	_, err = db.Exec("VALUES ($1), ($2), ($3)", 1, 2, 3)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Query() a query which doesn't return any results
+	txn, err := db.Begin()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer txn.Rollback()
+
+	rows, err := txn.Query("CREATE TEMP TABLE foo(f1 int)")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err = rows.Close(); err != nil {
+		t.Fatal(err)
+	}
+
+	// small trick to get NoData from a parameterized query
+	_, err = txn.Exec("CREATE RULE nodata AS ON INSERT TO foo DO INSTEAD NOTHING")
+	if err != nil {
+		t.Fatal(err)
+	}
+	rows, err = txn.Query("INSERT INTO foo VALUES ($1)", 1)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err = rows.Close(); err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestIssue196(t *testing.T) {
+	db := openTestConn(t)
+	defer db.Close()
+
+	row := db.QueryRow("SELECT float4 '0.10000122' = $1, float8 '35.03554004971999' = $2",
+		float32(0.10000122), float64(35.03554004971999))
+
+	var float4match, float8match bool
+	err := row.Scan(&float4match, &float8match)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !float4match {
+		t.Errorf("Expected float4 fidelity to be maintained; got no match")
+	}
+	if !float8match {
+		t.Errorf("Expected float8 fidelity to be maintained; got no match")
+	}
+}
+
+// Test that any CommandComplete messages sent before the query results are
+// ignored.
+func TestIssue282(t *testing.T) {
+	if strings.HasPrefix(runtime.Version(), "go1.0") {
+		fmt.Println("Skipping test due to lack of Queryer implementation")
+		return
+	}
+
+	db := openTestConn(t)
+	defer db.Close()
+
+	var search_path string
+	err := db.QueryRow(`
+		SET LOCAL search_path TO pg_catalog;
+		SET LOCAL search_path TO pg_catalog;
+		SHOW search_path`).Scan(&search_path)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if search_path != "pg_catalog" {
+		t.Fatalf("unexpected search_path %s", search_path)
+	}
+}
+
+func TestReadFloatPrecision(t *testing.T) {
+	db := openTestConn(t)
+	defer db.Close()
+
+	row := db.QueryRow("SELECT float4 '0.10000122', float8 '35.03554004971999'")
+	var float4val float32
+	var float8val float64
+	err := row.Scan(&float4val, &float8val)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if float4val != float32(0.10000122) {
+		t.Errorf("Expected float4 fidelity to be maintained; got no match")
+	}
+	if float8val != float64(35.03554004971999) {
+		t.Errorf("Expected float8 fidelity to be maintained; got no match")
+	}
+}
+
+var envParseTests = []struct {
+	Expected map[string]string
+	Env      []string
+}{
+	{
+		Env:      []string{"PGDATABASE=hello", "PGUSER=goodbye"},
+		Expected: map[string]string{"dbname": "hello", "user": "goodbye"},
+	},
+	{
+		Env:      []string{"PGDATESTYLE=ISO, MDY"},
+		Expected: map[string]string{"datestyle": "ISO, MDY"},
+	},
+	{
+		Env:      []string{"PGCONNECT_TIMEOUT=30"},
+		Expected: map[string]string{"connect_timeout": "30"},
+	},
+}
+
+func TestParseEnviron(t *testing.T) {
+	for i, tt := range envParseTests {
+		results := parseEnviron(tt.Env)
+		if !reflect.DeepEqual(tt.Expected, results) {
+			t.Errorf("%d: Expected: %#v Got: %#v", i, tt.Expected, results)
+		}
+	}
+}
+
+func TestParseComplete(t *testing.T) {
+	tpc := func(commandTag string, command string, affectedRows int64, shouldFail bool) {
+		defer func() {
+			if p := recover(); p != nil {
+				if !shouldFail {
+					t.Error(p)
+				}
+			}
+		}()
+		cn := &conn{}
+		res, c := cn.parseComplete(commandTag)
+		if c != command {
+			t.Errorf("Expected %v, got %v", command, c)
+		}
+		n, err := res.RowsAffected()
+		if err != nil {
+			t.Fatal(err)
+		}
+		if n != affectedRows {
+			t.Errorf("Expected %d, got %d", affectedRows, n)
+		}
+	}
+
+	tpc("ALTER TABLE", "ALTER TABLE", 0, false)
+	tpc("INSERT 0 1", "INSERT", 1, false)
+	tpc("UPDATE 100", "UPDATE", 100, false)
+	tpc("SELECT 100", "SELECT", 100, false)
+	tpc("FETCH 100", "FETCH", 100, false)
+	// allow COPY (and others) without row count
+	tpc("COPY", "COPY", 0, false)
+	// don't fail on command tags we don't recognize
+	tpc("UNKNOWNCOMMANDTAG", "UNKNOWNCOMMANDTAG", 0, false)
+
+	// failure cases
+	tpc("INSERT 1", "", 0, true)   // missing oid
+	tpc("UPDATE 0 1", "", 0, true) // too many numbers
+	tpc("SELECT foo", "", 0, true) // invalid row count
+}
+
+func TestExecerInterface(t *testing.T) {
+	// Gin up a straw man private struct just for the type check
+	cn := &conn{c: nil}
+	var cni interface{} = cn
+
+	_, ok := cni.(driver.Execer)
+	if !ok {
+		t.Fatal("Driver doesn't implement Execer")
+	}
+}
+
+func TestNullAfterNonNull(t *testing.T) {
+	db := openTestConn(t)
+	defer db.Close()
+
+	r, err := db.Query("SELECT 9::integer UNION SELECT NULL::integer")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	var n sql.NullInt64
+
+	if !r.Next() {
+		if r.Err() != nil {
+			t.Fatal(err)
+		}
+		t.Fatal("expected row")
+	}
+
+	if err := r.Scan(&n); err != nil {
+		t.Fatal(err)
+	}
+
+	if n.Int64 != 9 {
+		t.Fatalf("expected 2, not %d", n.Int64)
+	}
+
+	if !r.Next() {
+		if r.Err() != nil {
+			t.Fatal(err)
+		}
+		t.Fatal("expected row")
+	}
+
+	if err := r.Scan(&n); err != nil {
+		t.Fatal(err)
+	}
+
+	if n.Valid {
+		t.Fatal("expected n to be invalid")
+	}
+
+	if n.Int64 != 0 {
+		t.Fatalf("expected n to 2, not %d", n.Int64)
+	}
+}
+
+func Test64BitErrorChecking(t *testing.T) {
+	defer func() {
+		if err := recover(); err != nil {
+			t.Fatal("panic due to 0xFFFFFFFF != -1 " +
+				"when int is 64 bits")
+		}
+	}()
+
+	db := openTestConn(t)
+	defer db.Close()
+
+	r, err := db.Query(`SELECT *
+FROM (VALUES (0::integer, NULL::text), (1, 'test string')) AS t;`)
+
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	defer r.Close()
+
+	for r.Next() {
+	}
+}
+
+func TestCommit(t *testing.T) {
+	db := openTestConn(t)
+	defer db.Close()
+
+	_, err := db.Exec("CREATE TEMP TABLE temp (a int)")
+	if err != nil {
+		t.Fatal(err)
+	}
+	sqlInsert := "INSERT INTO temp VALUES (1)"
+	sqlSelect := "SELECT * FROM temp"
+	tx, err := db.Begin()
+	if err != nil {
+		t.Fatal(err)
+	}
+	_, err = tx.Exec(sqlInsert)
+	if err != nil {
+		t.Fatal(err)
+	}
+	err = tx.Commit()
+	if err != nil {
+		t.Fatal(err)
+	}
+	var i int
+	err = db.QueryRow(sqlSelect).Scan(&i)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if i != 1 {
+		t.Fatalf("expected 1, got %d", i)
+	}
+}
+
+func TestErrorClass(t *testing.T) {
+	db := openTestConn(t)
+	defer db.Close()
+
+	_, err := db.Query("SELECT int 'notint'")
+	if err == nil {
+		t.Fatal("expected error")
+	}
+	pge, ok := err.(*Error)
+	if !ok {
+		t.Fatalf("expected *pq.Error, got %#+v", err)
+	}
+	if pge.Code.Class() != "22" {
+		t.Fatalf("expected class 28, got %v", pge.Code.Class())
+	}
+	if pge.Code.Class().Name() != "data_exception" {
+		t.Fatalf("expected data_exception, got %v", pge.Code.Class().Name())
+	}
+}
+
+func TestParseOpts(t *testing.T) {
+	tests := []struct {
+		in       string
+		expected values
+		valid    bool
+	}{
+		{"dbname=hello user=goodbye", values{"dbname": "hello", "user": "goodbye"}, true},
+		{"dbname=hello user=goodbye  ", values{"dbname": "hello", "user": "goodbye"}, true},
+		{"dbname = hello user=goodbye", values{"dbname": "hello", "user": "goodbye"}, true},
+		{"dbname=hello user =goodbye", values{"dbname": "hello", "user": "goodbye"}, true},
+		{"dbname=hello user= goodbye", values{"dbname": "hello", "user": "goodbye"}, true},
+		{"host=localhost password='correct horse battery staple'", values{"host": "localhost", "password": "correct horse battery staple"}, true},
+		{"dbname=データベース password=パスワード", values{"dbname": "データベース", "password": "パスワード"}, true},
+		{"dbname=hello user=''", values{"dbname": "hello", "user": ""}, true},
+		{"user='' dbname=hello", values{"dbname": "hello", "user": ""}, true},
+		// The last option value is an empty string if there's no non-whitespace after its =
+		{"dbname=hello user=   ", values{"dbname": "hello", "user": ""}, true},
+
+		// The parser ignores spaces after = and interprets the next set of non-whitespace characters as the value.
+		{"user= password=foo", values{"user": "password=foo"}, true},
+
+		// Backslash escapes next char
+		{`user=a\ \'\\b`, values{"user": `a '\b`}, true},
+		{`user='a \'b'`, values{"user": `a 'b`}, true},
+
+		// Incomplete escape
+		{`user=x\`, values{}, false},
+
+		// No '=' after the key
+		{"postgre://marko@internet", values{}, false},
+		{"dbname user=goodbye", values{}, false},
+		{"user=foo blah", values{}, false},
+		{"user=foo blah   ", values{}, false},
+
+		// Unterminated quoted value
+		{"dbname=hello user='unterminated", values{}, false},
+	}
+
+	for _, test := range tests {
+		o := make(values)
+		err := parseOpts(test.in, o)
+
+		switch {
+		case err != nil && test.valid:
+			t.Errorf("%q got unexpected error: %s", test.in, err)
+		case err == nil && test.valid && !reflect.DeepEqual(test.expected, o):
+			t.Errorf("%q got: %#v want: %#v", test.in, o, test.expected)
+		case err == nil && !test.valid:
+			t.Errorf("%q expected an error", test.in)
+		}
+	}
+}
+
+func TestRuntimeParameters(t *testing.T) {
+	type RuntimeTestResult int
+	const (
+		ResultUnknown RuntimeTestResult = iota
+		ResultSuccess
+		ResultError // other error
+	)
+
+	tests := []struct {
+		conninfo        string
+		param           string
+		expected        string
+		expectedOutcome RuntimeTestResult
+	}{
+		// invalid parameter
+		{"DOESNOTEXIST=foo", "", "", ResultError},
+		// we can only work with a specific value for these two
+		{"client_encoding=SQL_ASCII", "", "", ResultError},
+		{"datestyle='ISO, YDM'", "", "", ResultError},
+		// "options" should work exactly as it does in libpq
+		{"options='-c search_path=pqgotest'", "search_path", "pqgotest", ResultSuccess},
+		// pq should override client_encoding in this case
+		{"options='-c client_encoding=SQL_ASCII'", "client_encoding", "UTF8", ResultSuccess},
+		// allow client_encoding to be set explicitly
+		{"client_encoding=UTF8", "client_encoding", "UTF8", ResultSuccess},
+		// test a runtime parameter not supported by libpq
+		{"work_mem='139kB'", "work_mem", "139kB", ResultSuccess},
+		// test fallback_application_name
+		{"application_name=foo fallback_application_name=bar", "application_name", "foo", ResultSuccess},
+		{"application_name='' fallback_application_name=bar", "application_name", "", ResultSuccess},
+		{"fallback_application_name=bar", "application_name", "bar", ResultSuccess},
+	}
+
+	for _, test := range tests {
+		db, err := openTestConnConninfo(test.conninfo)
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer db.Close()
+
+		// application_name didn't exist before 9.0
+		if test.param == "application_name" && getServerVersion(t, db) < 90000 {
+			continue
+		}
+
+		tryGetParameterValue := func() (value string, outcome RuntimeTestResult) {
+			row := db.QueryRow("SELECT current_setting($1)", test.param)
+			err = row.Scan(&value)
+			if err != nil {
+				return "", ResultError
+			}
+			return value, ResultSuccess
+		}
+
+		value, outcome := tryGetParameterValue()
+		if outcome != test.expectedOutcome && outcome == ResultError {
+			t.Fatalf("%v: unexpected error: %v", test.conninfo, err)
+		}
+		if outcome != test.expectedOutcome {
+			t.Fatalf("unexpected outcome %v (was expecting %v) for conninfo \"%s\"",
+				outcome, test.expectedOutcome, test.conninfo)
+		}
+		if value != test.expected {
+			t.Fatalf("bad value for %s: got %s, want %s with conninfo \"%s\"",
+				test.param, value, test.expected, test.conninfo)
+		}
+	}
+}
+
+func TestIsUTF8(t *testing.T) {
+	var cases = []struct {
+		name string
+		want bool
+	}{
+		{"unicode", true},
+		{"utf-8", true},
+		{"utf_8", true},
+		{"UTF-8", true},
+		{"UTF8", true},
+		{"utf8", true},
+		{"u n ic_ode", true},
+		{"ut_f%8", true},
+		{"ubf8", false},
+		{"punycode", false},
+	}
+
+	for _, test := range cases {
+		if g := isUTF8(test.name); g != test.want {
+			t.Errorf("isUTF8(%q) = %v want %v", test.name, g, test.want)
+		}
+	}
+}
+
+func TestQuoteIdentifier(t *testing.T) {
+	var cases = []struct {
+		input string
+		want  string
+	}{
+		{`foo`, `"foo"`},
+		{`foo bar baz`, `"foo bar baz"`},
+		{`foo"bar`, `"foo""bar"`},
+		{"foo\x00bar", `"foo"`},
+		{"\x00foo", `""`},
+	}
+
+	for _, test := range cases {
+		got := QuoteIdentifier(test.input)
+		if got != test.want {
+			t.Errorf("QuoteIdentifier(%q) = %v want %v", test.input, got, test.want)
+		}
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/lib/pq/conn_xact_test.go b/Godeps/_workspace/src/github.com/lib/pq/conn_xact_test.go
new file mode 100644
index 00000000..4c635d43
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/lib/pq/conn_xact_test.go
@@ -0,0 +1,61 @@
+// +build go1.1
+
+package pq
+
+import (
+	"testing"
+)
+
+func TestXactMultiStmt(t *testing.T) {
+	// minified test case based on bug reports from
+	// pico303@gmail.com and rangelspam@gmail.com
+	t.Skip("Skipping failing test")
+	db := openTestConn(t)
+	defer db.Close()
+
+	tx, err := db.Begin()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer tx.Commit()
+
+	rows, err := tx.Query("select 1")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if rows.Next() {
+		var val int32
+		if err = rows.Scan(&val); err != nil {
+			t.Fatal(err)
+		}
+	} else {
+		t.Fatal("Expected at least one row in first query in xact")
+	}
+
+	rows2, err := tx.Query("select 2")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if rows2.Next() {
+		var val2 int32
+		if err := rows2.Scan(&val2); err != nil {
+			t.Fatal(err)
+		}
+	} else {
+		t.Fatal("Expected at least one row in second query in xact")
+	}
+
+	if err = rows.Err(); err != nil {
+		t.Fatal(err)
+	}
+
+	if err = rows2.Err(); err != nil {
+		t.Fatal(err)
+	}
+
+	if err = tx.Commit(); err != nil {
+		t.Fatal(err)
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/lib/pq/copy.go b/Godeps/_workspace/src/github.com/lib/pq/copy.go
new file mode 100644
index 00000000..472e8351
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/lib/pq/copy.go
@@ -0,0 +1,249 @@
+package pq
+
+import (
+	"database/sql/driver"
+	"encoding/binary"
+	"errors"
+	"sync/atomic"
+)
+
+var (
+	errCopyInClosed               = errors.New("pq: copyin statement has already been closed")
+	errBinaryCopyNotSupported     = errors.New("pq: only text format supported for COPY")
+	errCopyToNotSupported         = errors.New("pq: COPY TO is not supported")
+	errCopyNotSupportedOutsideTxn = errors.New("pq: COPY is only allowed inside a transaction")
+)
+
+// CopyIn creates a COPY FROM statement which can be prepared with
+// Tx.Prepare().  The target table should be visible in search_path.
+func CopyIn(table string, columns ...string) string {
+	stmt := "COPY " + QuoteIdentifier(table) + " ("
+	for i, col := range columns {
+		if i != 0 {
+			stmt += ", "
+		}
+		stmt += QuoteIdentifier(col)
+	}
+	stmt += ") FROM STDIN"
+	return stmt
+}
+
+// CopyInSchema creates a COPY FROM statement which can be prepared with
+// Tx.Prepare().
+func CopyInSchema(schema, table string, columns ...string) string {
+	stmt := "COPY " + QuoteIdentifier(schema) + "." + QuoteIdentifier(table) + " ("
+	for i, col := range columns {
+		if i != 0 {
+			stmt += ", "
+		}
+		stmt += QuoteIdentifier(col)
+	}
+	stmt += ") FROM STDIN"
+	return stmt
+}
+
+type copyin struct {
+	cn      *conn
+	buffer  []byte
+	rowData chan []byte
+	done    chan bool
+
+	closed   bool
+	err      error
+	errorset int32
+}
+
+const ciBufferSize = 64 * 1024
+
+// flush buffer before the buffer is filled up and needs reallocation
+const ciBufferFlushSize = 63 * 1024
+
+func (cn *conn) prepareCopyIn(q string) (_ driver.Stmt, err error) {
+	if !cn.isInTransaction() {
+		return nil, errCopyNotSupportedOutsideTxn
+	}
+
+	ci := &copyin{
+		cn:      cn,
+		buffer:  make([]byte, 0, ciBufferSize),
+		rowData: make(chan []byte),
+		done:    make(chan bool),
+	}
+	// add CopyData identifier + 4 bytes for message length
+	ci.buffer = append(ci.buffer, 'd', 0, 0, 0, 0)
+
+	b := cn.writeBuf('Q')
+	b.string(q)
+	cn.send(b)
+
+awaitCopyInResponse:
+	for {
+		t, r := cn.recv1()
+		switch t {
+		case 'G':
+			if r.byte() != 0 {
+				err = errBinaryCopyNotSupported
+				break awaitCopyInResponse
+			}
+			go ci.resploop()
+			return ci, nil
+		case 'H':
+			err = errCopyToNotSupported
+			break awaitCopyInResponse
+		case 'E':
+			err = parseError(r)
+		case 'Z':
+			if err == nil {
+				cn.bad = true
+				errorf("unexpected ReadyForQuery in response to COPY")
+			}
+			cn.processReadyForQuery(r)
+			return nil, err
+		default:
+			cn.bad = true
+			errorf("unknown response for copy query: %q", t)
+		}
+	}
+
+	// something went wrong, abort COPY before we return
+	b = cn.writeBuf('f')
+	b.string(err.Error())
+	cn.send(b)
+
+	for {
+		t, r := cn.recv1()
+		switch t {
+		case 'c', 'C', 'E':
+		case 'Z':
+			// correctly aborted, we're done
+			cn.processReadyForQuery(r)
+			return nil, err
+		default:
+			cn.bad = true
+			errorf("unknown response for CopyFail: %q", t)
+		}
+	}
+
+	panic("not reached")
+}
+
+func (ci *copyin) flush(buf []byte) {
+	// set message length (without message identifier)
+	binary.BigEndian.PutUint32(buf[1:], uint32(len(buf)-1))
+
+	_, err := ci.cn.c.Write(buf)
+	if err != nil {
+		panic(err)
+	}
+}
+
+func (ci *copyin) resploop() {
+	for {
+		t, r := ci.cn.recv1()
+		switch t {
+		case 'C':
+			// complete
+		case 'Z':
+			ci.cn.processReadyForQuery(r)
+			ci.done <- true
+			return
+		case 'E':
+			err := parseError(r)
+			ci.setError(err)
+		default:
+			ci.cn.bad = true
+			errorf("unknown response: %q", t)
+		}
+	}
+}
+
+func (ci *copyin) isErrorSet() bool {
+	return atomic.LoadInt32(&ci.errorset) != 0
+}
+
+func (ci *copyin) setError(err error) {
+	ci.err = err
+	atomic.StoreInt32(&ci.errorset, 1)
+}
+
+func (ci *copyin) NumInput() int {
+	return -1
+}
+
+func (ci *copyin) Query(v []driver.Value) (r driver.Rows, err error) {
+	return nil, ErrNotSupported
+}
+
+// Exec inserts values into the COPY stream. The insert is asynchronous
+// and Exec can return errors from previous Exec calls to the same
+// COPY stmt.
+//
+// You need to call Exec(nil) to sync the COPY stream and to get any
+// errors from pending data, since Stmt.Close() doesn't return errors
+// to the user.
+func (ci *copyin) Exec(v []driver.Value) (r driver.Result, err error) {
+	if ci.closed {
+		return nil, errCopyInClosed
+	}
+
+	if ci.cn.bad {
+		return nil, driver.ErrBadConn
+	}
+	defer ci.cn.errRecover(&err)
+
+	if ci.isErrorSet() {
+		return nil, ci.err
+	}
+
+	if len(v) == 0 {
+		err = ci.Close()
+		ci.closed = true
+		return nil, err
+	}
+
+	numValues := len(v)
+	for i, value := range v {
+		ci.buffer = appendEncodedText(&ci.cn.parameterStatus, ci.buffer, value)
+		if i < numValues-1 {
+			ci.buffer = append(ci.buffer, '\t')
+		}
+	}
+
+	ci.buffer = append(ci.buffer, '\n')
+
+	if len(ci.buffer) > ciBufferFlushSize {
+		ci.flush(ci.buffer)
+		// reset buffer, keep bytes for message identifier and length
+		ci.buffer = ci.buffer[:5]
+	}
+
+	return driver.RowsAffected(0), nil
+}
+
+func (ci *copyin) Close() (err error) {
+	if ci.closed {
+		return errCopyInClosed
+	}
+
+	if ci.cn.bad {
+		return driver.ErrBadConn
+	}
+	defer ci.cn.errRecover(&err)
+
+	if len(ci.buffer) > 0 {
+		ci.flush(ci.buffer)
+	}
+	// Avoid touching the scratch buffer as resploop could be using it.
+	err = ci.cn.sendSimpleMessage('c')
+	if err != nil {
+		return err
+	}
+
+	<-ci.done
+
+	if ci.isErrorSet() {
+		err = ci.err
+		return err
+	}
+	return nil
+}
diff --git a/Godeps/_workspace/src/github.com/lib/pq/copy_test.go b/Godeps/_workspace/src/github.com/lib/pq/copy_test.go
new file mode 100644
index 00000000..fbd5a11b
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/lib/pq/copy_test.go
@@ -0,0 +1,324 @@
+package pq
+
+import (
+	"bytes"
+	"database/sql"
+	"strings"
+	"testing"
+)
+
+func TestCopyInStmt(t *testing.T) {
+	var stmt string
+	stmt = CopyIn("table name")
+	if stmt != `COPY "table name" () FROM STDIN` {
+		t.Fatal(stmt)
+	}
+
+	stmt = CopyIn("table name", "column 1", "column 2")
+	if stmt != `COPY "table name" ("column 1", "column 2") FROM STDIN` {
+		t.Fatal(stmt)
+	}
+
+	stmt = CopyIn(`table " name """`, `co"lumn""`)
+	if stmt != `COPY "table "" name """"""" ("co""lumn""""") FROM STDIN` {
+		t.Fatal(stmt)
+	}
+}
+
+func TestCopyInSchemaStmt(t *testing.T) {
+	var stmt string
+	stmt = CopyInSchema("schema name", "table name")
+	if stmt != `COPY "schema name"."table name" () FROM STDIN` {
+		t.Fatal(stmt)
+	}
+
+	stmt = CopyInSchema("schema name", "table name", "column 1", "column 2")
+	if stmt != `COPY "schema name"."table name" ("column 1", "column 2") FROM STDIN` {
+		t.Fatal(stmt)
+	}
+
+	stmt = CopyInSchema(`schema " name """`, `table " name """`, `co"lumn""`)
+	if stmt != `COPY "schema "" name """"""".`+
+		`"table "" name """"""" ("co""lumn""""") FROM STDIN` {
+		t.Fatal(stmt)
+	}
+}
+
+func TestCopyInMultipleValues(t *testing.T) {
+	db := openTestConn(t)
+	defer db.Close()
+
+	txn, err := db.Begin()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer txn.Rollback()
+
+	_, err = txn.Exec("CREATE TEMP TABLE temp (a int, b varchar)")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	stmt, err := txn.Prepare(CopyIn("temp", "a", "b"))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	longString := strings.Repeat("#", 500)
+
+	for i := 0; i < 500; i++ {
+		_, err = stmt.Exec(int64(i), longString)
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
+
+	_, err = stmt.Exec()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = stmt.Close()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	var num int
+	err = txn.QueryRow("SELECT COUNT(*) FROM temp").Scan(&num)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if num != 500 {
+		t.Fatalf("expected 500 items, not %d", num)
+	}
+}
+
+func TestCopyInTypes(t *testing.T) {
+	db := openTestConn(t)
+	defer db.Close()
+
+	txn, err := db.Begin()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer txn.Rollback()
+
+	_, err = txn.Exec("CREATE TEMP TABLE temp (num INTEGER, text VARCHAR, blob BYTEA, nothing VARCHAR)")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	stmt, err := txn.Prepare(CopyIn("temp", "num", "text", "blob", "nothing"))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	_, err = stmt.Exec(int64(1234567890), "Héllö\n ☃!\r\t\\", []byte{0, 255, 9, 10, 13}, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	_, err = stmt.Exec()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = stmt.Close()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	var num int
+	var text string
+	var blob []byte
+	var nothing sql.NullString
+
+	err = txn.QueryRow("SELECT * FROM temp").Scan(&num, &text, &blob, &nothing)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if num != 1234567890 {
+		t.Fatal("unexpected result", num)
+	}
+	if text != "Héllö\n ☃!\r\t\\" {
+		t.Fatal("unexpected result", text)
+	}
+	if bytes.Compare(blob, []byte{0, 255, 9, 10, 13}) != 0 {
+		t.Fatal("unexpected result", blob)
+	}
+	if nothing.Valid {
+		t.Fatal("unexpected result", nothing.String)
+	}
+}
+
+func TestCopyInWrongType(t *testing.T) {
+	db := openTestConn(t)
+	defer db.Close()
+
+	txn, err := db.Begin()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer txn.Rollback()
+
+	_, err = txn.Exec("CREATE TEMP TABLE temp (num INTEGER)")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	stmt, err := txn.Prepare(CopyIn("temp", "num"))
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer stmt.Close()
+
+	_, err = stmt.Exec("Héllö\n ☃!\r\t\\")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	_, err = stmt.Exec()
+	if err == nil {
+		t.Fatal("expected error")
+	}
+	if pge := err.(*Error); pge.Code.Name() != "invalid_text_representation" {
+		t.Fatalf("expected 'invalid input syntax for integer' error, got %s (%+v)", pge.Code.Name(), pge)
+	}
+}
+
+func TestCopyOutsideOfTxnError(t *testing.T) {
+	db := openTestConn(t)
+	defer db.Close()
+
+	_, err := db.Prepare(CopyIn("temp", "num"))
+	if err == nil {
+		t.Fatal("COPY outside of transaction did not return an error")
+	}
+	if err != errCopyNotSupportedOutsideTxn {
+		t.Fatalf("expected %s, got %s", err, err.Error())
+	}
+}
+
+func TestCopyInBinaryError(t *testing.T) {
+	db := openTestConn(t)
+	defer db.Close()
+
+	txn, err := db.Begin()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer txn.Rollback()
+
+	_, err = txn.Exec("CREATE TEMP TABLE temp (num INTEGER)")
+	if err != nil {
+		t.Fatal(err)
+	}
+	_, err = txn.Prepare("COPY temp (num) FROM STDIN WITH binary")
+	if err != errBinaryCopyNotSupported {
+		t.Fatalf("expected %s, got %+v", errBinaryCopyNotSupported, err)
+	}
+	// check that the protocol is in a valid state
+	err = txn.Rollback()
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestCopyFromError(t *testing.T) {
+	db := openTestConn(t)
+	defer db.Close()
+
+	txn, err := db.Begin()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer txn.Rollback()
+
+	_, err = txn.Exec("CREATE TEMP TABLE temp (num INTEGER)")
+	if err != nil {
+		t.Fatal(err)
+	}
+	_, err = txn.Prepare("COPY temp (num) TO STDOUT")
+	if err != errCopyToNotSupported {
+		t.Fatalf("expected %s, got %+v", errCopyToNotSupported, err)
+	}
+	// check that the protocol is in a valid state
+	err = txn.Rollback()
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestCopySyntaxError(t *testing.T) {
+	db := openTestConn(t)
+	defer db.Close()
+
+	txn, err := db.Begin()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer txn.Rollback()
+
+	_, err = txn.Prepare("COPY ")
+	if err == nil {
+		t.Fatal("expected error")
+	}
+	if pge := err.(*Error); pge.Code.Name() != "syntax_error" {
+		t.Fatalf("expected syntax error, got %s (%+v)", pge.Code.Name(), pge)
+	}
+	// check that the protocol is in a valid state
+	err = txn.Rollback()
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+func BenchmarkCopyIn(b *testing.B) {
+	db := openTestConn(b)
+	defer db.Close()
+
+	txn, err := db.Begin()
+	if err != nil {
+		b.Fatal(err)
+	}
+	defer txn.Rollback()
+
+	_, err = txn.Exec("CREATE TEMP TABLE temp (a int, b varchar)")
+	if err != nil {
+		b.Fatal(err)
+	}
+
+	stmt, err := txn.Prepare(CopyIn("temp", "a", "b"))
+	if err != nil {
+		b.Fatal(err)
+	}
+
+	for i := 0; i < b.N; i++ {
+		_, err = stmt.Exec(int64(i), "hello world!")
+		if err != nil {
+			b.Fatal(err)
+		}
+	}
+
+	_, err = stmt.Exec()
+	if err != nil {
+		b.Fatal(err)
+	}
+
+	err = stmt.Close()
+	if err != nil {
+		b.Fatal(err)
+	}
+
+	var num int
+	err = txn.QueryRow("SELECT COUNT(*) FROM temp").Scan(&num)
+	if err != nil {
+		b.Fatal(err)
+	}
+
+	if num != b.N {
+		b.Fatalf("expected %d items, not %d", b.N, num)
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/lib/pq/doc.go b/Godeps/_workspace/src/github.com/lib/pq/doc.go
new file mode 100644
index 00000000..4d7a0e39
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/lib/pq/doc.go
@@ -0,0 +1,209 @@
+/*
+Package pq is a pure Go Postgres driver for the database/sql package.
+
+In most cases clients will use the database/sql package instead of
+using this package directly. For example:
+
+	import (
+		_ "github.com/lib/pq"
+		"database/sql"
+	)
+
+	func main() {
+		db, err := sql.Open("postgres", "user=pqgotest dbname=pqgotest sslmode=verify-full")
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		age := 21
+		rows, err := db.Query("SELECT name FROM users WHERE age = $1", age)
+		…
+	}
+
+You can also connect to a database using a URL. For example:
+
+	db, err := sql.Open("postgres", "postgres://pqgotest:password@localhost/pqgotest?sslmode=verify-full")
+
+
+Connection String Parameters
+
+
+Similarly to libpq, when establishing a connection using pq you are expected to
+supply a connection string containing zero or more parameters.
+A subset of the connection parameters supported by libpq are also supported by pq.
+Additionally, pq also lets you specify run-time parameters (such as search_path or work_mem)
+directly in the connection string.  This is different from libpq, which does not allow
+run-time parameters in the connection string, instead requiring you to supply
+them in the options parameter.
+
+For compatibility with libpq, the following special connection parameters are
+supported:
+
+	* dbname - The name of the database to connect to
+	* user - The user to sign in as
+	* password - The user's password
+	* host - The host to connect to. Values that start with / are for unix domain sockets. (default is localhost)
+	* port - The port to bind to. (default is 5432)
+	* sslmode - Whether or not to use SSL (default is require, this is not the default for libpq)
+	* fallback_application_name - An application_name to fall back to if one isn't provided.
+	* connect_timeout - Maximum wait for connection, in seconds. Zero or not specified means wait indefinitely.
+	* sslcert - Cert file location. The file must contain PEM encoded data.
+	* sslkey - Key file location. The file must contain PEM encoded data.
+	* sslrootcert - The location of the root certificate file. The file must contain PEM encoded data.
+
+Valid values for sslmode are:
+
+	* disable - No SSL
+	* require - Always SSL (skip verification)
+	* verify-ca - Always SSL (verify that the certificate presented by the server was signed by a trusted CA)
+	* verify-full - Always SSL (verify that the certification presented by the server was signed by a trusted CA and the server host name matches the one in the certificate)
+
+See http://www.postgresql.org/docs/current/static/libpq-connect.html#LIBPQ-CONNSTRING
+for more information about connection string parameters.
+
+Use single quotes for values that contain whitespace:
+
+    "user=pqgotest password='with spaces'"
+
+A backslash will escape the next character in values:
+
+    "user=space\ man password='it\'s valid'
+
+Note that the connection parameter client_encoding (which sets the
+text encoding for the connection) may be set but must be "UTF8",
+matching with the same rules as Postgres. It is an error to provide
+any other value.
+
+In addition to the parameters listed above, any run-time parameter that can be
+set at backend start time can be set in the connection string.  For more
+information, see
+http://www.postgresql.org/docs/current/static/runtime-config.html.
+
+Most environment variables as specified at http://www.postgresql.org/docs/current/static/libpq-envars.html
+supported by libpq are also supported by pq.  If any of the environment
+variables not supported by pq are set, pq will panic during connection
+establishment.  Environment variables have a lower precedence than explicitly
+provided connection parameters.
+
+
+Queries
+
+database/sql does not dictate any specific format for parameter
+markers in query strings, and pq uses the Postgres-native ordinal markers,
+as shown above. The same marker can be reused for the same parameter:
+
+	rows, err := db.Query(`SELECT name FROM users WHERE favorite_fruit = $1
+		OR age BETWEEN $2 AND $2 + 3`, "orange", 64)
+
+pq does not support the LastInsertId() method of the Result type in database/sql.
+To return the identifier of an INSERT (or UPDATE or DELETE), use the Postgres
+RETURNING clause with a standard Query or QueryRow call:
+
+	var userid int
+	err := db.QueryRow(`INSERT INTO users(name, favorite_fruit, age)
+		VALUES('beatrice', 'starfruit', 93) RETURNING id`).Scan(&userid)
+
+For more details on RETURNING, see the Postgres documentation:
+
+	http://www.postgresql.org/docs/current/static/sql-insert.html
+	http://www.postgresql.org/docs/current/static/sql-update.html
+	http://www.postgresql.org/docs/current/static/sql-delete.html
+
+For additional instructions on querying see the documentation for the database/sql package.
+
+Errors
+
+pq may return errors of type *pq.Error which can be interrogated for error details:
+
+        if err, ok := err.(*pq.Error); ok {
+            fmt.Println("pq error:", err.Code.Name())
+        }
+
+See the pq.Error type for details.
+
+
+Bulk imports
+
+You can perform bulk imports by preparing a statement returned by pq.CopyIn (or
+pq.CopyInSchema) in an explicit transaction (sql.Tx). The returned statement
+handle can then be repeatedly "executed" to copy data into the target table.
+After all data has been processed you should call Exec() once with no arguments
+to flush all buffered data. Any call to Exec() might return an error which
+should be handled appropriately, but because of the internal buffering an error
+returned by Exec() might not be related to the data passed in the call that
+failed.
+
+CopyIn uses COPY FROM internally. It is not possible to COPY outside of an
+explicit transaction in pq.
+
+Usage example:
+
+	txn, err := db.Begin()
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	stmt, err := txn.Prepare(pq.CopyIn("users", "name", "age"))
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	for _, user := range users {
+		_, err = stmt.Exec(user.Name, int64(user.Age))
+		if err != nil {
+			log.Fatal(err)
+		}
+	}
+
+	_, err = stmt.Exec()
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	err = stmt.Close()
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	err = txn.Commit()
+	if err != nil {
+		log.Fatal(err)
+	}
+
+
+Notifications
+
+
+PostgreSQL supports a simple publish/subscribe model over database
+connections.  See http://www.postgresql.org/docs/current/static/sql-notify.html
+for more information about the general mechanism.
+
+To start listening for notifications, you first have to open a new connection
+to the database by calling NewListener.  This connection can not be used for
+anything other than LISTEN / NOTIFY.  Calling Listen will open a "notification
+channel"; once a notification channel is open, a notification generated on that
+channel will effect a send on the Listener.Notify channel.  A notification
+channel will remain open until Unlisten is called, though connection loss might
+result in some notifications being lost.  To solve this problem, Listener sends
+a nil pointer over the Notify channel any time the connection is re-established
+following a connection loss.  The application can get information about the
+state of the underlying connection by setting an event callback in the call to
+NewListener.
+
+A single Listener can safely be used from concurrent goroutines, which means
+that there is often no need to create more than one Listener in your
+application.  However, a Listener is always connected to a single database, so
+you will need to create a new Listener instance for every database you want to
+receive notifications in.
+
+The channel name in both Listen and Unlisten is case sensitive, and can contain
+any characters legal in an identifier (see
+http://www.postgresql.org/docs/current/static/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS
+for more information).  Note that the channel name will be truncated to 63
+bytes by the PostgreSQL server.
+
+You can find a complete, working example of Listener usage at
+http://godoc.org/github.com/lib/pq/listen_example.
+
+*/
+package pq
diff --git a/Godeps/_workspace/src/github.com/lib/pq/encode.go b/Godeps/_workspace/src/github.com/lib/pq/encode.go
new file mode 100644
index 00000000..e70f8b8b
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/lib/pq/encode.go
@@ -0,0 +1,425 @@
+package pq
+
+import (
+	"bytes"
+	"database/sql/driver"
+	"encoding/hex"
+	"fmt"
+	"github.com/lib/pq/oid"
+	"math"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+)
+
+func encode(parameterStatus *parameterStatus, x interface{}, pgtypOid oid.Oid) []byte {
+	switch v := x.(type) {
+	case int64:
+		return []byte(fmt.Sprintf("%d", v))
+	case float32:
+		return []byte(fmt.Sprintf("%.9f", v))
+	case float64:
+		return []byte(fmt.Sprintf("%.17f", v))
+	case []byte:
+		if pgtypOid == oid.T_bytea {
+			return encodeBytea(parameterStatus.serverVersion, v)
+		}
+
+		return v
+	case string:
+		if pgtypOid == oid.T_bytea {
+			return encodeBytea(parameterStatus.serverVersion, []byte(v))
+		}
+
+		return []byte(v)
+	case bool:
+		return []byte(fmt.Sprintf("%t", v))
+	case time.Time:
+		return formatTs(v)
+
+	default:
+		errorf("encode: unknown type for %T", v)
+	}
+
+	panic("not reached")
+}
+
+func decode(parameterStatus *parameterStatus, s []byte, typ oid.Oid) interface{} {
+	switch typ {
+	case oid.T_bytea:
+		return parseBytea(s)
+	case oid.T_timestamptz:
+		return parseTs(parameterStatus.currentLocation, string(s))
+	case oid.T_timestamp, oid.T_date:
+		return parseTs(nil, string(s))
+	case oid.T_time:
+		return mustParse("15:04:05", typ, s)
+	case oid.T_timetz:
+		return mustParse("15:04:05-07", typ, s)
+	case oid.T_bool:
+		return s[0] == 't'
+	case oid.T_int8, oid.T_int2, oid.T_int4:
+		i, err := strconv.ParseInt(string(s), 10, 64)
+		if err != nil {
+			errorf("%s", err)
+		}
+		return i
+	case oid.T_float4, oid.T_float8:
+		bits := 64
+		if typ == oid.T_float4 {
+			bits = 32
+		}
+		f, err := strconv.ParseFloat(string(s), bits)
+		if err != nil {
+			errorf("%s", err)
+		}
+		return f
+	}
+
+	return s
+}
+
+// appendEncodedText encodes item in text format as required by COPY
+// and appends to buf
+func appendEncodedText(parameterStatus *parameterStatus, buf []byte, x interface{}) []byte {
+	switch v := x.(type) {
+	case int64:
+		return strconv.AppendInt(buf, v, 10)
+	case float32:
+		return strconv.AppendFloat(buf, float64(v), 'f', -1, 32)
+	case float64:
+		return strconv.AppendFloat(buf, v, 'f', -1, 64)
+	case []byte:
+		encodedBytea := encodeBytea(parameterStatus.serverVersion, v)
+		return appendEscapedText(buf, string(encodedBytea))
+	case string:
+		return appendEscapedText(buf, v)
+	case bool:
+		return strconv.AppendBool(buf, v)
+	case time.Time:
+		return append(buf, formatTs(v)...)
+	case nil:
+		return append(buf, "\\N"...)
+	default:
+		errorf("encode: unknown type for %T", v)
+	}
+
+	panic("not reached")
+}
+
+func appendEscapedText(buf []byte, text string) []byte {
+	escapeNeeded := false
+	startPos := 0
+	var c byte
+
+	// check if we need to escape
+	for i := 0; i < len(text); i++ {
+		c = text[i]
+		if c == '\\' || c == '\n' || c == '\r' || c == '\t' {
+			escapeNeeded = true
+			startPos = i
+			break
+		}
+	}
+	if !escapeNeeded {
+		return append(buf, text...)
+	}
+
+	// copy till first char to escape, iterate the rest
+	result := append(buf, text[:startPos]...)
+	for i := startPos; i < len(text); i++ {
+		c = text[i]
+		switch c {
+		case '\\':
+			result = append(result, '\\', '\\')
+		case '\n':
+			result = append(result, '\\', 'n')
+		case '\r':
+			result = append(result, '\\', 'r')
+		case '\t':
+			result = append(result, '\\', 't')
+		default:
+			result = append(result, c)
+		}
+	}
+	return result
+}
+
+func mustParse(f string, typ oid.Oid, s []byte) time.Time {
+	str := string(s)
+
+	// Special case until time.Parse bug is fixed:
+	// http://code.google.com/p/go/issues/detail?id=3487
+	if str[len(str)-2] == '.' {
+		str += "0"
+	}
+
+	// check for a 30-minute-offset timezone
+	if (typ == oid.T_timestamptz || typ == oid.T_timetz) &&
+		str[len(str)-3] == ':' {
+		f += ":00"
+	}
+	t, err := time.Parse(f, str)
+	if err != nil {
+		errorf("decode: %s", err)
+	}
+	return t
+}
+
+func expect(str, char string, pos int) {
+	if c := str[pos : pos+1]; c != char {
+		errorf("expected '%v' at position %v; got '%v'", char, pos, c)
+	}
+}
+
+func mustAtoi(str string) int {
+	result, err := strconv.Atoi(str)
+	if err != nil {
+		errorf("expected number; got '%v'", str)
+	}
+	return result
+}
+
+// The location cache caches the time zones typically used by the client.
+type locationCache struct {
+	cache map[int]*time.Location
+	lock  sync.Mutex
+}
+
+// All connections share the same list of timezones. Benchmarking shows that
+// about 5% speed could be gained by putting the cache in the connection and
+// losing the mutex, at the cost of a small amount of memory and a somewhat
+// significant increase in code complexity.
+var globalLocationCache *locationCache = newLocationCache()
+
+func newLocationCache() *locationCache {
+	return &locationCache{cache: make(map[int]*time.Location)}
+}
+
+// Returns the cached timezone for the specified offset, creating and caching
+// it if necessary.
+func (c *locationCache) getLocation(offset int) *time.Location {
+	c.lock.Lock()
+	defer c.lock.Unlock()
+
+	location, ok := c.cache[offset]
+	if !ok {
+		location = time.FixedZone("", offset)
+		c.cache[offset] = location
+	}
+
+	return location
+}
+
+// This is a time function specific to the Postgres default DateStyle
+// setting ("ISO, MDY"), the only one we currently support. This
+// accounts for the discrepancies between the parsing available with
+// time.Parse and the Postgres date formatting quirks.
+func parseTs(currentLocation *time.Location, str string) (result time.Time) {
+	monSep := strings.IndexRune(str, '-')
+	year := mustAtoi(str[:monSep])
+	daySep := monSep + 3
+	month := mustAtoi(str[monSep+1 : daySep])
+	expect(str, "-", daySep)
+	timeSep := daySep + 3
+	day := mustAtoi(str[daySep+1 : timeSep])
+
+	var hour, minute, second int
+	if len(str) > monSep+len("01-01")+1 {
+		expect(str, " ", timeSep)
+		minSep := timeSep + 3
+		expect(str, ":", minSep)
+		hour = mustAtoi(str[timeSep+1 : minSep])
+		secSep := minSep + 3
+		expect(str, ":", secSep)
+		minute = mustAtoi(str[minSep+1 : secSep])
+		secEnd := secSep + 3
+		second = mustAtoi(str[secSep+1 : secEnd])
+	}
+	remainderIdx := monSep + len("01-01 00:00:00") + 1
+	// Three optional (but ordered) sections follow: the
+	// fractional seconds, the time zone offset, and the BC
+	// designation. We set them up here and adjust the other
+	// offsets if the preceding sections exist.
+
+	nanoSec := 0
+	tzOff := 0
+	bcSign := 1
+
+	if remainderIdx < len(str) && str[remainderIdx:remainderIdx+1] == "." {
+		fracStart := remainderIdx + 1
+		fracOff := strings.IndexAny(str[fracStart:], "-+ ")
+		if fracOff < 0 {
+			fracOff = len(str) - fracStart
+		}
+		fracSec := mustAtoi(str[fracStart : fracStart+fracOff])
+		nanoSec = fracSec * (1000000000 / int(math.Pow(10, float64(fracOff))))
+
+		remainderIdx += fracOff + 1
+	}
+	if tzStart := remainderIdx; tzStart < len(str) && (str[tzStart:tzStart+1] == "-" || str[tzStart:tzStart+1] == "+") {
+		// time zone separator is always '-' or '+' (UTC is +00)
+		var tzSign int
+		if c := str[tzStart : tzStart+1]; c == "-" {
+			tzSign = -1
+		} else if c == "+" {
+			tzSign = +1
+		} else {
+			errorf("expected '-' or '+' at position %v; got %v", tzStart, c)
+		}
+		tzHours := mustAtoi(str[tzStart+1 : tzStart+3])
+		remainderIdx += 3
+		var tzMin, tzSec int
+		if tzStart+3 < len(str) && str[tzStart+3:tzStart+4] == ":" {
+			tzMin = mustAtoi(str[tzStart+4 : tzStart+6])
+			remainderIdx += 3
+		}
+		if tzStart+6 < len(str) && str[tzStart+6:tzStart+7] == ":" {
+			tzSec = mustAtoi(str[tzStart+7 : tzStart+9])
+			remainderIdx += 3
+		}
+		tzOff = tzSign * ((tzHours * 60 * 60) + (tzMin * 60) + tzSec)
+	}
+	if remainderIdx < len(str) && str[remainderIdx:remainderIdx+3] == " BC" {
+		bcSign = -1
+		remainderIdx += 3
+	}
+	if remainderIdx < len(str) {
+		errorf("expected end of input, got %v", str[remainderIdx:])
+	}
+	t := time.Date(bcSign*year, time.Month(month), day,
+		hour, minute, second, nanoSec,
+		globalLocationCache.getLocation(tzOff))
+
+	if currentLocation != nil {
+		// Set the location of the returned Time based on the session's
+		// TimeZone value, but only if the local time zone database agrees with
+		// the remote database on the offset.
+		lt := t.In(currentLocation)
+		_, newOff := lt.Zone()
+		if newOff == tzOff {
+			t = lt
+		}
+	}
+
+	return t
+}
+
+// formatTs formats t as time.RFC3339Nano and appends time zone seconds if
+// needed.
+func formatTs(t time.Time) (b []byte) {
+	b = []byte(t.Format(time.RFC3339Nano))
+	// Need to send dates before 0001 A.D. with " BC" suffix, instead of the
+	// minus sign preferred by Go.
+	if b[0] == '-' {
+		b = append(b[1:], ' ', 'B', 'C')
+	}
+
+	_, offset := t.Zone()
+	offset = offset % 60
+	if offset == 0 {
+		return b
+	}
+
+	if offset < 0 {
+		offset = -offset
+	}
+
+	b = append(b, ':')
+	if offset < 10 {
+		b = append(b, '0')
+	}
+	return strconv.AppendInt(b, int64(offset), 10)
+}
+
+// Parse a bytea value received from the server.  Both "hex" and the legacy
+// "escape" format are supported.
+func parseBytea(s []byte) (result []byte) {
+	if len(s) >= 2 && bytes.Equal(s[:2], []byte("\\x")) {
+		// bytea_output = hex
+		s = s[2:] // trim off leading "\\x"
+		result = make([]byte, hex.DecodedLen(len(s)))
+		_, err := hex.Decode(result, s)
+		if err != nil {
+			errorf("%s", err)
+		}
+	} else {
+		// bytea_output = escape
+		for len(s) > 0 {
+			if s[0] == '\\' {
+				// escaped '\\'
+				if len(s) >= 2 && s[1] == '\\' {
+					result = append(result, '\\')
+					s = s[2:]
+					continue
+				}
+
+				// '\\' followed by an octal number
+				if len(s) < 4 {
+					errorf("invalid bytea sequence %v", s)
+				}
+				r, err := strconv.ParseInt(string(s[1:4]), 8, 9)
+				if err != nil {
+					errorf("could not parse bytea value: %s", err.Error())
+				}
+				result = append(result, byte(r))
+				s = s[4:]
+			} else {
+				// We hit an unescaped, raw byte.  Try to read in as many as
+				// possible in one go.
+				i := bytes.IndexByte(s, '\\')
+				if i == -1 {
+					result = append(result, s...)
+					break
+				}
+				result = append(result, s[:i]...)
+				s = s[i:]
+			}
+		}
+	}
+
+	return result
+}
+
+func encodeBytea(serverVersion int, v []byte) (result []byte) {
+	if serverVersion >= 90000 {
+		// Use the hex format if we know that the server supports it
+		result = []byte(fmt.Sprintf("\\x%x", v))
+	} else {
+		// .. or resort to "escape"
+		for _, b := range v {
+			if b == '\\' {
+				result = append(result, '\\', '\\')
+			} else if b < 0x20 || b > 0x7e {
+				result = append(result, []byte(fmt.Sprintf("\\%03o", b))...)
+			} else {
+				result = append(result, b)
+			}
+		}
+	}
+
+	return result
+}
+
+// NullTime represents a time.Time that may be null. NullTime implements the
+// sql.Scanner interface so it can be used as a scan destination, similar to
+// sql.NullString.
+type NullTime struct {
+	Time  time.Time
+	Valid bool // Valid is true if Time is not NULL
+}
+
+// Scan implements the Scanner interface.
+func (nt *NullTime) Scan(value interface{}) error {
+	nt.Time, nt.Valid = value.(time.Time)
+	return nil
+}
+
+// Value implements the driver Valuer interface.
+func (nt NullTime) Value() (driver.Value, error) {
+	if !nt.Valid {
+		return nil, nil
+	}
+	return nt.Time, nil
+}
diff --git a/Godeps/_workspace/src/github.com/lib/pq/encode_test.go b/Godeps/_workspace/src/github.com/lib/pq/encode_test.go
new file mode 100644
index 00000000..dddecbfc
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/lib/pq/encode_test.go
@@ -0,0 +1,427 @@
+package pq
+
+import (
+	"github.com/lib/pq/oid"
+
+	"bytes"
+	"fmt"
+	"testing"
+	"time"
+)
+
+func TestScanTimestamp(t *testing.T) {
+	var nt NullTime
+	tn := time.Now()
+	nt.Scan(tn)
+	if !nt.Valid {
+		t.Errorf("Expected Valid=false")
+	}
+	if nt.Time != tn {
+		t.Errorf("Time value mismatch")
+	}
+}
+
+func TestScanNilTimestamp(t *testing.T) {
+	var nt NullTime
+	nt.Scan(nil)
+	if nt.Valid {
+		t.Errorf("Expected Valid=false")
+	}
+}
+
+var timeTests = []struct {
+	str     string
+	timeval time.Time
+}{
+	{"22001-02-03", time.Date(22001, time.February, 3, 0, 0, 0, 0, time.FixedZone("", 0))},
+	{"2001-02-03", time.Date(2001, time.February, 3, 0, 0, 0, 0, time.FixedZone("", 0))},
+	{"2001-02-03 04:05:06", time.Date(2001, time.February, 3, 4, 5, 6, 0, time.FixedZone("", 0))},
+	{"2001-02-03 04:05:06.000001", time.Date(2001, time.February, 3, 4, 5, 6, 1000, time.FixedZone("", 0))},
+	{"2001-02-03 04:05:06.00001", time.Date(2001, time.February, 3, 4, 5, 6, 10000, time.FixedZone("", 0))},
+	{"2001-02-03 04:05:06.0001", time.Date(2001, time.February, 3, 4, 5, 6, 100000, time.FixedZone("", 0))},
+	{"2001-02-03 04:05:06.001", time.Date(2001, time.February, 3, 4, 5, 6, 1000000, time.FixedZone("", 0))},
+	{"2001-02-03 04:05:06.01", time.Date(2001, time.February, 3, 4, 5, 6, 10000000, time.FixedZone("", 0))},
+	{"2001-02-03 04:05:06.1", time.Date(2001, time.February, 3, 4, 5, 6, 100000000, time.FixedZone("", 0))},
+	{"2001-02-03 04:05:06.12", time.Date(2001, time.February, 3, 4, 5, 6, 120000000, time.FixedZone("", 0))},
+	{"2001-02-03 04:05:06.123", time.Date(2001, time.February, 3, 4, 5, 6, 123000000, time.FixedZone("", 0))},
+	{"2001-02-03 04:05:06.1234", time.Date(2001, time.February, 3, 4, 5, 6, 123400000, time.FixedZone("", 0))},
+	{"2001-02-03 04:05:06.12345", time.Date(2001, time.February, 3, 4, 5, 6, 123450000, time.FixedZone("", 0))},
+	{"2001-02-03 04:05:06.123456", time.Date(2001, time.February, 3, 4, 5, 6, 123456000, time.FixedZone("", 0))},
+	{"2001-02-03 04:05:06.123-07", time.Date(2001, time.February, 3, 4, 5, 6, 123000000,
+		time.FixedZone("", -7*60*60))},
+	{"2001-02-03 04:05:06-07", time.Date(2001, time.February, 3, 4, 5, 6, 0,
+		time.FixedZone("", -7*60*60))},
+	{"2001-02-03 04:05:06-07:42", time.Date(2001, time.February, 3, 4, 5, 6, 0,
+		time.FixedZone("", -(7*60*60+42*60)))},
+	{"2001-02-03 04:05:06-07:30:09", time.Date(2001, time.February, 3, 4, 5, 6, 0,
+		time.FixedZone("", -(7*60*60+30*60+9)))},
+	{"2001-02-03 04:05:06+07", time.Date(2001, time.February, 3, 4, 5, 6, 0,
+		time.FixedZone("", 7*60*60))},
+	//{"10000-02-03 04:05:06 BC", time.Date(-10000, time.February, 3, 4, 5, 6, 0, time.FixedZone("", 0))},
+	{"0010-02-03 04:05:06 BC", time.Date(-10, time.February, 3, 4, 5, 6, 0, time.FixedZone("", 0))},
+	{"0010-02-03 04:05:06.123 BC", time.Date(-10, time.February, 3, 4, 5, 6, 123000000, time.FixedZone("", 0))},
+	{"0010-02-03 04:05:06.123-07 BC", time.Date(-10, time.February, 3, 4, 5, 6, 123000000,
+		time.FixedZone("", -7*60*60))},
+}
+
+// Helper function for the two tests below
+func tryParse(str string) (t time.Time, err error) {
+	defer func() {
+		if p := recover(); p != nil {
+			err = fmt.Errorf("%v", p)
+			return
+		}
+	}()
+	t = parseTs(nil, str)
+	return
+}
+
+// Test that parsing the string results in the expected value.
+func TestParseTs(t *testing.T) {
+	for i, tt := range timeTests {
+		val, err := tryParse(tt.str)
+		if err != nil {
+			t.Errorf("%d: got error: %v", i, err)
+		} else if val.String() != tt.timeval.String() {
+			t.Errorf("%d: expected to parse %q into %q; got %q",
+				i, tt.str, tt.timeval, val)
+		}
+	}
+}
+
+// Now test that sending the value into the database and parsing it back
+// returns the same time.Time value.
+func TestEncodeAndParseTs(t *testing.T) {
+	db, err := openTestConnConninfo("timezone='Etc/UTC'")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer db.Close()
+
+	for i, tt := range timeTests {
+		var dbstr string
+		err = db.QueryRow("SELECT ($1::timestamptz)::text", tt.timeval).Scan(&dbstr)
+		if err != nil {
+			t.Errorf("%d: could not send value %q to the database: %s", i, tt.timeval, err)
+			continue
+		}
+
+		val, err := tryParse(dbstr)
+		if err != nil {
+			t.Errorf("%d: could not parse value %q: %s", i, dbstr, err)
+			continue
+		}
+		val = val.In(tt.timeval.Location())
+		if val.String() != tt.timeval.String() {
+			t.Errorf("%d: expected to parse %q into %q; got %q", i, dbstr, tt.timeval, val)
+		}
+	}
+}
+
+var formatTimeTests = []struct {
+	time     time.Time
+	expected string
+}{
+	{time.Time{}, "0001-01-01T00:00:00Z"},
+	{time.Date(2001, time.February, 3, 4, 5, 6, 123456789, time.FixedZone("", 0)), "2001-02-03T04:05:06.123456789Z"},
+	{time.Date(2001, time.February, 3, 4, 5, 6, 123456789, time.FixedZone("", 2*60*60)), "2001-02-03T04:05:06.123456789+02:00"},
+	{time.Date(2001, time.February, 3, 4, 5, 6, 123456789, time.FixedZone("", -6*60*60)), "2001-02-03T04:05:06.123456789-06:00"},
+	{time.Date(1, time.January, 1, 0, 0, 0, 0, time.FixedZone("", 19*60+32)), "0001-01-01T00:00:00+00:19:32"},
+	{time.Date(2001, time.February, 3, 4, 5, 6, 0, time.FixedZone("", -(7*60*60+30*60+9))), "2001-02-03T04:05:06-07:30:09"},
+}
+
+func TestFormatTs(t *testing.T) {
+	for i, tt := range formatTimeTests {
+		val := string(formatTs(tt.time))
+		if val != tt.expected {
+			t.Errorf("%d: incorrect time format %q, want %q", i, val, tt.expected)
+		}
+	}
+}
+
+func TestTimestampWithTimeZone(t *testing.T) {
+	db := openTestConn(t)
+	defer db.Close()
+
+	tx, err := db.Begin()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer tx.Rollback()
+
+	// try several different locations, all included in Go's zoneinfo.zip
+	for _, locName := range []string{
+		"UTC",
+		"America/Chicago",
+		"America/New_York",
+		"Australia/Darwin",
+		"Australia/Perth",
+	} {
+		loc, err := time.LoadLocation(locName)
+		if err != nil {
+			t.Logf("Could not load time zone %s - skipping", locName)
+			continue
+		}
+
+		// Postgres timestamps have a resolution of 1 microsecond, so don't
+		// use the full range of the Nanosecond argument
+		refTime := time.Date(2012, 11, 6, 10, 23, 42, 123456000, loc)
+
+		for _, pgTimeZone := range []string{"US/Eastern", "Australia/Darwin"} {
+			// Switch Postgres's timezone to test different output timestamp formats
+			_, err = tx.Exec(fmt.Sprintf("set time zone '%s'", pgTimeZone))
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			var gotTime time.Time
+			row := tx.QueryRow("select $1::timestamp with time zone", refTime)
+			err = row.Scan(&gotTime)
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			if !refTime.Equal(gotTime) {
+				t.Errorf("timestamps not equal: %s != %s", refTime, gotTime)
+			}
+
+			// check that the time zone is set correctly based on TimeZone
+			pgLoc, err := time.LoadLocation(pgTimeZone)
+			if err != nil {
+				t.Logf("Could not load time zone %s - skipping", pgLoc)
+				continue
+			}
+			translated := refTime.In(pgLoc)
+			if translated.String() != gotTime.String() {
+				t.Errorf("timestamps not equal: %s != %s", translated, gotTime)
+			}
+		}
+	}
+}
+
+func TestTimestampWithOutTimezone(t *testing.T) {
+	db := openTestConn(t)
+	defer db.Close()
+
+	test := func(ts, pgts string) {
+		r, err := db.Query("SELECT $1::timestamp", pgts)
+		if err != nil {
+			t.Fatalf("Could not run query: %v", err)
+		}
+
+		n := r.Next()
+
+		if n != true {
+			t.Fatal("Expected at least one row")
+		}
+
+		var result time.Time
+		err = r.Scan(&result)
+		if err != nil {
+			t.Fatalf("Did not expect error scanning row: %v", err)
+		}
+
+		expected, err := time.Parse(time.RFC3339, ts)
+		if err != nil {
+			t.Fatalf("Could not parse test time literal: %v", err)
+		}
+
+		if !result.Equal(expected) {
+			t.Fatalf("Expected time to match %v: got mismatch %v",
+				expected, result)
+		}
+
+		n = r.Next()
+		if n != false {
+			t.Fatal("Expected only one row")
+		}
+	}
+
+	test("2000-01-01T00:00:00Z", "2000-01-01T00:00:00")
+
+	// Test higher precision time
+	test("2013-01-04T20:14:58.80033Z", "2013-01-04 20:14:58.80033")
+}
+
+func TestStringWithNul(t *testing.T) {
+	db := openTestConn(t)
+	defer db.Close()
+
+	hello0world := string("hello\x00world")
+	_, err := db.Query("SELECT $1::text", &hello0world)
+	if err == nil {
+		t.Fatal("Postgres accepts a string with nul in it; " +
+			"injection attacks may be plausible")
+	}
+}
+
+func TestByteaToText(t *testing.T) {
+	db := openTestConn(t)
+	defer db.Close()
+
+	b := []byte("hello world")
+	row := db.QueryRow("SELECT $1::text", b)
+
+	var result []byte
+	err := row.Scan(&result)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if string(result) != string(b) {
+		t.Fatalf("expected %v but got %v", b, result)
+	}
+}
+
+func TestTextToBytea(t *testing.T) {
+	db := openTestConn(t)
+	defer db.Close()
+
+	b := "hello world"
+	row := db.QueryRow("SELECT $1::bytea", b)
+
+	var result []byte
+	err := row.Scan(&result)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if !bytes.Equal(result, []byte(b)) {
+		t.Fatalf("expected %v but got %v", b, result)
+	}
+}
+
+func TestByteaOutputFormatEncoding(t *testing.T) {
+	input := []byte("\\x\x00\x01\x02\xFF\xFEabcdefg0123")
+	want := []byte("\\x5c78000102fffe6162636465666730313233")
+	got := encode(&parameterStatus{serverVersion: 90000}, input, oid.T_bytea)
+	if !bytes.Equal(want, got) {
+		t.Errorf("invalid hex bytea output, got %v but expected %v", got, want)
+	}
+
+	want = []byte("\\\\x\\000\\001\\002\\377\\376abcdefg0123")
+	got = encode(&parameterStatus{serverVersion: 84000}, input, oid.T_bytea)
+	if !bytes.Equal(want, got) {
+		t.Errorf("invalid escape bytea output, got %v but expected %v", got, want)
+	}
+}
+
+func TestByteaOutputFormats(t *testing.T) {
+	db := openTestConn(t)
+	defer db.Close()
+
+	if getServerVersion(t, db) < 90000 {
+		// skip
+		return
+	}
+
+	testByteaOutputFormat := func(f string) {
+		expectedData := []byte("\x5c\x78\x00\xff\x61\x62\x63\x01\x08")
+		sqlQuery := "SELECT decode('5c7800ff6162630108', 'hex')"
+
+		var data []byte
+
+		// use a txn to avoid relying on getting the same connection
+		txn, err := db.Begin()
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer txn.Rollback()
+
+		_, err = txn.Exec("SET LOCAL bytea_output TO " + f)
+		if err != nil {
+			t.Fatal(err)
+		}
+		// use Query; QueryRow would hide the actual error
+		rows, err := txn.Query(sqlQuery)
+		if err != nil {
+			t.Fatal(err)
+		}
+		if !rows.Next() {
+			if rows.Err() != nil {
+				t.Fatal(rows.Err())
+			}
+			t.Fatal("shouldn't happen")
+		}
+		err = rows.Scan(&data)
+		if err != nil {
+			t.Fatal(err)
+		}
+		err = rows.Close()
+		if err != nil {
+			t.Fatal(err)
+		}
+		if !bytes.Equal(data, expectedData) {
+			t.Errorf("unexpected bytea value %v for format %s; expected %v", data, f, expectedData)
+		}
+	}
+
+	testByteaOutputFormat("hex")
+	testByteaOutputFormat("escape")
+}
+
+func TestAppendEncodedText(t *testing.T) {
+	var buf []byte
+
+	buf = appendEncodedText(&parameterStatus{serverVersion: 90000}, buf, int64(10))
+	buf = append(buf, '\t')
+	buf = appendEncodedText(&parameterStatus{serverVersion: 90000}, buf, float32(42.0000000001))
+	buf = append(buf, '\t')
+	buf = appendEncodedText(&parameterStatus{serverVersion: 90000}, buf, 42.0000000001)
+	buf = append(buf, '\t')
+	buf = appendEncodedText(&parameterStatus{serverVersion: 90000}, buf, "hello\tworld")
+	buf = append(buf, '\t')
+	buf = appendEncodedText(&parameterStatus{serverVersion: 90000}, buf, []byte{0, 128, 255})
+
+	if string(buf) != "10\t42\t42.0000000001\thello\\tworld\t\\\\x0080ff" {
+		t.Fatal(string(buf))
+	}
+}
+
+func TestAppendEscapedText(t *testing.T) {
+	if esc := appendEscapedText(nil, "hallo\tescape"); string(esc) != "hallo\\tescape" {
+		t.Fatal(string(esc))
+	}
+	if esc := appendEscapedText(nil, "hallo\\tescape\n"); string(esc) != "hallo\\\\tescape\\n" {
+		t.Fatal(string(esc))
+	}
+	if esc := appendEscapedText(nil, "\n\r\t\f"); string(esc) != "\\n\\r\\t\f" {
+		t.Fatal(string(esc))
+	}
+}
+
+func TestAppendEscapedTextExistingBuffer(t *testing.T) {
+	var buf []byte
+	buf = []byte("123\t")
+	if esc := appendEscapedText(buf, "hallo\tescape"); string(esc) != "123\thallo\\tescape" {
+		t.Fatal(string(esc))
+	}
+	buf = []byte("123\t")
+	if esc := appendEscapedText(buf, "hallo\\tescape\n"); string(esc) != "123\thallo\\\\tescape\\n" {
+		t.Fatal(string(esc))
+	}
+	buf = []byte("123\t")
+	if esc := appendEscapedText(buf, "\n\r\t\f"); string(esc) != "123\t\\n\\r\\t\f" {
+		t.Fatal(string(esc))
+	}
+}
+
+func BenchmarkAppendEscapedText(b *testing.B) {
+	longString := ""
+	for i := 0; i < 100; i++ {
+		longString += "123456789\n"
+	}
+	for i := 0; i < b.N; i++ {
+		appendEscapedText(nil, longString)
+	}
+}
+
+func BenchmarkAppendEscapedTextNoEscape(b *testing.B) {
+	longString := ""
+	for i := 0; i < 100; i++ {
+		longString += "1234567890"
+	}
+	for i := 0; i < b.N; i++ {
+		appendEscapedText(nil, longString)
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/lib/pq/error.go b/Godeps/_workspace/src/github.com/lib/pq/error.go
new file mode 100644
index 00000000..0a49364d
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/lib/pq/error.go
@@ -0,0 +1,495 @@
+package pq
+
+import (
+	"database/sql/driver"
+	"fmt"
+	"io"
+	"net"
+	"runtime"
+)
+
+// Error severities
+const (
+	Efatal   = "FATAL"
+	Epanic   = "PANIC"
+	Ewarning = "WARNING"
+	Enotice  = "NOTICE"
+	Edebug   = "DEBUG"
+	Einfo    = "INFO"
+	Elog     = "LOG"
+)
+
+// Error represents an error communicating with the server.
+//
+// See http://www.postgresql.org/docs/current/static/protocol-error-fields.html for details of the fields
+type Error struct {
+	Severity         string
+	Code             ErrorCode
+	Message          string
+	Detail           string
+	Hint             string
+	Position         string
+	InternalPosition string
+	InternalQuery    string
+	Where            string
+	Schema           string
+	Table            string
+	Column           string
+	DataTypeName     string
+	Constraint       string
+	File             string
+	Line             string
+	Routine          string
+}
+
+// ErrorCode is a five-character error code.
+type ErrorCode string
+
+// Name returns a more human friendly rendering of the error code, namely the
+// "condition name".
+//
+// See http://www.postgresql.org/docs/9.3/static/errcodes-appendix.html for
+// details.
+func (ec ErrorCode) Name() string {
+	return errorCodeNames[ec]
+}
+
+// ErrorClass is only the class part of an error code.
+type ErrorClass string
+
+// Name returns the condition name of an error class.  It is equivalent to the
+// condition name of the "standard" error code (i.e. the one having the last
+// three characters "000").
+func (ec ErrorClass) Name() string {
+	return errorCodeNames[ErrorCode(ec+"000")]
+}
+
+// Class returns the error class, e.g. "28".
+//
+// See http://www.postgresql.org/docs/9.3/static/errcodes-appendix.html for
+// details.
+func (ec ErrorCode) Class() ErrorClass {
+	return ErrorClass(ec[0:2])
+}
+
+// errorCodeNames is a mapping between the five-character error codes and the
+// human readable "condition names". It is derived from the list at
+// http://www.postgresql.org/docs/9.3/static/errcodes-appendix.html
+var errorCodeNames = map[ErrorCode]string{
+	// Class 00 - Successful Completion
+	"00000": "successful_completion",
+	// Class 01 - Warning
+	"01000": "warning",
+	"0100C": "dynamic_result_sets_returned",
+	"01008": "implicit_zero_bit_padding",
+	"01003": "null_value_eliminated_in_set_function",
+	"01007": "privilege_not_granted",
+	"01006": "privilege_not_revoked",
+	"01004": "string_data_right_truncation",
+	"01P01": "deprecated_feature",
+	// Class 02 - No Data (this is also a warning class per the SQL standard)
+	"02000": "no_data",
+	"02001": "no_additional_dynamic_result_sets_returned",
+	// Class 03 - SQL Statement Not Yet Complete
+	"03000": "sql_statement_not_yet_complete",
+	// Class 08 - Connection Exception
+	"08000": "connection_exception",
+	"08003": "connection_does_not_exist",
+	"08006": "connection_failure",
+	"08001": "sqlclient_unable_to_establish_sqlconnection",
+	"08004": "sqlserver_rejected_establishment_of_sqlconnection",
+	"08007": "transaction_resolution_unknown",
+	"08P01": "protocol_violation",
+	// Class 09 - Triggered Action Exception
+	"09000": "triggered_action_exception",
+	// Class 0A - Feature Not Supported
+	"0A000": "feature_not_supported",
+	// Class 0B - Invalid Transaction Initiation
+	"0B000": "invalid_transaction_initiation",
+	// Class 0F - Locator Exception
+	"0F000": "locator_exception",
+	"0F001": "invalid_locator_specification",
+	// Class 0L - Invalid Grantor
+	"0L000": "invalid_grantor",
+	"0LP01": "invalid_grant_operation",
+	// Class 0P - Invalid Role Specification
+	"0P000": "invalid_role_specification",
+	// Class 0Z - Diagnostics Exception
+	"0Z000": "diagnostics_exception",
+	"0Z002": "stacked_diagnostics_accessed_without_active_handler",
+	// Class 20 - Case Not Found
+	"20000": "case_not_found",
+	// Class 21 - Cardinality Violation
+	"21000": "cardinality_violation",
+	// Class 22 - Data Exception
+	"22000": "data_exception",
+	"2202E": "array_subscript_error",
+	"22021": "character_not_in_repertoire",
+	"22008": "datetime_field_overflow",
+	"22012": "division_by_zero",
+	"22005": "error_in_assignment",
+	"2200B": "escape_character_conflict",
+	"22022": "indicator_overflow",
+	"22015": "interval_field_overflow",
+	"2201E": "invalid_argument_for_logarithm",
+	"22014": "invalid_argument_for_ntile_function",
+	"22016": "invalid_argument_for_nth_value_function",
+	"2201F": "invalid_argument_for_power_function",
+	"2201G": "invalid_argument_for_width_bucket_function",
+	"22018": "invalid_character_value_for_cast",
+	"22007": "invalid_datetime_format",
+	"22019": "invalid_escape_character",
+	"2200D": "invalid_escape_octet",
+	"22025": "invalid_escape_sequence",
+	"22P06": "nonstandard_use_of_escape_character",
+	"22010": "invalid_indicator_parameter_value",
+	"22023": "invalid_parameter_value",
+	"2201B": "invalid_regular_expression",
+	"2201W": "invalid_row_count_in_limit_clause",
+	"2201X": "invalid_row_count_in_result_offset_clause",
+	"22009": "invalid_time_zone_displacement_value",
+	"2200C": "invalid_use_of_escape_character",
+	"2200G": "most_specific_type_mismatch",
+	"22004": "null_value_not_allowed",
+	"22002": "null_value_no_indicator_parameter",
+	"22003": "numeric_value_out_of_range",
+	"22026": "string_data_length_mismatch",
+	"22001": "string_data_right_truncation",
+	"22011": "substring_error",
+	"22027": "trim_error",
+	"22024": "unterminated_c_string",
+	"2200F": "zero_length_character_string",
+	"22P01": "floating_point_exception",
+	"22P02": "invalid_text_representation",
+	"22P03": "invalid_binary_representation",
+	"22P04": "bad_copy_file_format",
+	"22P05": "untranslatable_character",
+	"2200L": "not_an_xml_document",
+	"2200M": "invalid_xml_document",
+	"2200N": "invalid_xml_content",
+	"2200S": "invalid_xml_comment",
+	"2200T": "invalid_xml_processing_instruction",
+	// Class 23 - Integrity Constraint Violation
+	"23000": "integrity_constraint_violation",
+	"23001": "restrict_violation",
+	"23502": "not_null_violation",
+	"23503": "foreign_key_violation",
+	"23505": "unique_violation",
+	"23514": "check_violation",
+	"23P01": "exclusion_violation",
+	// Class 24 - Invalid Cursor State
+	"24000": "invalid_cursor_state",
+	// Class 25 - Invalid Transaction State
+	"25000": "invalid_transaction_state",
+	"25001": "active_sql_transaction",
+	"25002": "branch_transaction_already_active",
+	"25008": "held_cursor_requires_same_isolation_level",
+	"25003": "inappropriate_access_mode_for_branch_transaction",
+	"25004": "inappropriate_isolation_level_for_branch_transaction",
+	"25005": "no_active_sql_transaction_for_branch_transaction",
+	"25006": "read_only_sql_transaction",
+	"25007": "schema_and_data_statement_mixing_not_supported",
+	"25P01": "no_active_sql_transaction",
+	"25P02": "in_failed_sql_transaction",
+	// Class 26 - Invalid SQL Statement Name
+	"26000": "invalid_sql_statement_name",
+	// Class 27 - Triggered Data Change Violation
+	"27000": "triggered_data_change_violation",
+	// Class 28 - Invalid Authorization Specification
+	"28000": "invalid_authorization_specification",
+	"28P01": "invalid_password",
+	// Class 2B - Dependent Privilege Descriptors Still Exist
+	"2B000": "dependent_privilege_descriptors_still_exist",
+	"2BP01": "dependent_objects_still_exist",
+	// Class 2D - Invalid Transaction Termination
+	"2D000": "invalid_transaction_termination",
+	// Class 2F - SQL Routine Exception
+	"2F000": "sql_routine_exception",
+	"2F005": "function_executed_no_return_statement",
+	"2F002": "modifying_sql_data_not_permitted",
+	"2F003": "prohibited_sql_statement_attempted",
+	"2F004": "reading_sql_data_not_permitted",
+	// Class 34 - Invalid Cursor Name
+	"34000": "invalid_cursor_name",
+	// Class 38 - External Routine Exception
+	"38000": "external_routine_exception",
+	"38001": "containing_sql_not_permitted",
+	"38002": "modifying_sql_data_not_permitted",
+	"38003": "prohibited_sql_statement_attempted",
+	"38004": "reading_sql_data_not_permitted",
+	// Class 39 - External Routine Invocation Exception
+	"39000": "external_routine_invocation_exception",
+	"39001": "invalid_sqlstate_returned",
+	"39004": "null_value_not_allowed",
+	"39P01": "trigger_protocol_violated",
+	"39P02": "srf_protocol_violated",
+	// Class 3B - Savepoint Exception
+	"3B000": "savepoint_exception",
+	"3B001": "invalid_savepoint_specification",
+	// Class 3D - Invalid Catalog Name
+	"3D000": "invalid_catalog_name",
+	// Class 3F - Invalid Schema Name
+	"3F000": "invalid_schema_name",
+	// Class 40 - Transaction Rollback
+	"40000": "transaction_rollback",
+	"40002": "transaction_integrity_constraint_violation",
+	"40001": "serialization_failure",
+	"40003": "statement_completion_unknown",
+	"40P01": "deadlock_detected",
+	// Class 42 - Syntax Error or Access Rule Violation
+	"42000": "syntax_error_or_access_rule_violation",
+	"42601": "syntax_error",
+	"42501": "insufficient_privilege",
+	"42846": "cannot_coerce",
+	"42803": "grouping_error",
+	"42P20": "windowing_error",
+	"42P19": "invalid_recursion",
+	"42830": "invalid_foreign_key",
+	"42602": "invalid_name",
+	"42622": "name_too_long",
+	"42939": "reserved_name",
+	"42804": "datatype_mismatch",
+	"42P18": "indeterminate_datatype",
+	"42P21": "collation_mismatch",
+	"42P22": "indeterminate_collation",
+	"42809": "wrong_object_type",
+	"42703": "undefined_column",
+	"42883": "undefined_function",
+	"42P01": "undefined_table",
+	"42P02": "undefined_parameter",
+	"42704": "undefined_object",
+	"42701": "duplicate_column",
+	"42P03": "duplicate_cursor",
+	"42P04": "duplicate_database",
+	"42723": "duplicate_function",
+	"42P05": "duplicate_prepared_statement",
+	"42P06": "duplicate_schema",
+	"42P07": "duplicate_table",
+	"42712": "duplicate_alias",
+	"42710": "duplicate_object",
+	"42702": "ambiguous_column",
+	"42725": "ambiguous_function",
+	"42P08": "ambiguous_parameter",
+	"42P09": "ambiguous_alias",
+	"42P10": "invalid_column_reference",
+	"42611": "invalid_column_definition",
+	"42P11": "invalid_cursor_definition",
+	"42P12": "invalid_database_definition",
+	"42P13": "invalid_function_definition",
+	"42P14": "invalid_prepared_statement_definition",
+	"42P15": "invalid_schema_definition",
+	"42P16": "invalid_table_definition",
+	"42P17": "invalid_object_definition",
+	// Class 44 - WITH CHECK OPTION Violation
+	"44000": "with_check_option_violation",
+	// Class 53 - Insufficient Resources
+	"53000": "insufficient_resources",
+	"53100": "disk_full",
+	"53200": "out_of_memory",
+	"53300": "too_many_connections",
+	"53400": "configuration_limit_exceeded",
+	// Class 54 - Program Limit Exceeded
+	"54000": "program_limit_exceeded",
+	"54001": "statement_too_complex",
+	"54011": "too_many_columns",
+	"54023": "too_many_arguments",
+	// Class 55 - Object Not In Prerequisite State
+	"55000": "object_not_in_prerequisite_state",
+	"55006": "object_in_use",
+	"55P02": "cant_change_runtime_param",
+	"55P03": "lock_not_available",
+	// Class 57 - Operator Intervention
+	"57000": "operator_intervention",
+	"57014": "query_canceled",
+	"57P01": "admin_shutdown",
+	"57P02": "crash_shutdown",
+	"57P03": "cannot_connect_now",
+	"57P04": "database_dropped",
+	// Class 58 - System Error (errors external to PostgreSQL itself)
+	"58000": "system_error",
+	"58030": "io_error",
+	"58P01": "undefined_file",
+	"58P02": "duplicate_file",
+	// Class F0 - Configuration File Error
+	"F0000": "config_file_error",
+	"F0001": "lock_file_exists",
+	// Class HV - Foreign Data Wrapper Error (SQL/MED)
+	"HV000": "fdw_error",
+	"HV005": "fdw_column_name_not_found",
+	"HV002": "fdw_dynamic_parameter_value_needed",
+	"HV010": "fdw_function_sequence_error",
+	"HV021": "fdw_inconsistent_descriptor_information",
+	"HV024": "fdw_invalid_attribute_value",
+	"HV007": "fdw_invalid_column_name",
+	"HV008": "fdw_invalid_column_number",
+	"HV004": "fdw_invalid_data_type",
+	"HV006": "fdw_invalid_data_type_descriptors",
+	"HV091": "fdw_invalid_descriptor_field_identifier",
+	"HV00B": "fdw_invalid_handle",
+	"HV00C": "fdw_invalid_option_index",
+	"HV00D": "fdw_invalid_option_name",
+	"HV090": "fdw_invalid_string_length_or_buffer_length",
+	"HV00A": "fdw_invalid_string_format",
+	"HV009": "fdw_invalid_use_of_null_pointer",
+	"HV014": "fdw_too_many_handles",
+	"HV001": "fdw_out_of_memory",
+	"HV00P": "fdw_no_schemas",
+	"HV00J": "fdw_option_name_not_found",
+	"HV00K": "fdw_reply_handle",
+	"HV00Q": "fdw_schema_not_found",
+	"HV00R": "fdw_table_not_found",
+	"HV00L": "fdw_unable_to_create_execution",
+	"HV00M": "fdw_unable_to_create_reply",
+	"HV00N": "fdw_unable_to_establish_connection",
+	// Class P0 - PL/pgSQL Error
+	"P0000": "plpgsql_error",
+	"P0001": "raise_exception",
+	"P0002": "no_data_found",
+	"P0003": "too_many_rows",
+	// Class XX - Internal Error
+	"XX000": "internal_error",
+	"XX001": "data_corrupted",
+	"XX002": "index_corrupted",
+}
+
+func parseError(r *readBuf) *Error {
+	err := new(Error)
+	for t := r.byte(); t != 0; t = r.byte() {
+		msg := r.string()
+		switch t {
+		case 'S':
+			err.Severity = msg
+		case 'C':
+			err.Code = ErrorCode(msg)
+		case 'M':
+			err.Message = msg
+		case 'D':
+			err.Detail = msg
+		case 'H':
+			err.Hint = msg
+		case 'P':
+			err.Position = msg
+		case 'p':
+			err.InternalPosition = msg
+		case 'q':
+			err.InternalQuery = msg
+		case 'W':
+			err.Where = msg
+		case 's':
+			err.Schema = msg
+		case 't':
+			err.Table = msg
+		case 'c':
+			err.Column = msg
+		case 'd':
+			err.DataTypeName = msg
+		case 'n':
+			err.Constraint = msg
+		case 'F':
+			err.File = msg
+		case 'L':
+			err.Line = msg
+		case 'R':
+			err.Routine = msg
+		}
+	}
+	return err
+}
+
+// Fatal returns true if the Error Severity is fatal.
+func (err *Error) Fatal() bool {
+	return err.Severity == Efatal
+}
+
+// Get implements the legacy PGError interface. New code should use the fields
+// of the Error struct directly.
+func (err *Error) Get(k byte) (v string) {
+	switch k {
+	case 'S':
+		return err.Severity
+	case 'C':
+		return string(err.Code)
+	case 'M':
+		return err.Message
+	case 'D':
+		return err.Detail
+	case 'H':
+		return err.Hint
+	case 'P':
+		return err.Position
+	case 'p':
+		return err.InternalPosition
+	case 'q':
+		return err.InternalQuery
+	case 'W':
+		return err.Where
+	case 's':
+		return err.Schema
+	case 't':
+		return err.Table
+	case 'c':
+		return err.Column
+	case 'd':
+		return err.DataTypeName
+	case 'n':
+		return err.Constraint
+	case 'F':
+		return err.File
+	case 'L':
+		return err.Line
+	case 'R':
+		return err.Routine
+	}
+	return ""
+}
+
+func (err Error) Error() string {
+	return "pq: " + err.Message
+}
+
+// PGError is an interface used by previous versions of pq. It is provided
+// only to support legacy code. New code should use the Error type.
+type PGError interface {
+	Error() string
+	Fatal() bool
+	Get(k byte) (v string)
+}
+
+func errorf(s string, args ...interface{}) {
+	panic(fmt.Errorf("pq: %s", fmt.Sprintf(s, args...)))
+}
+
+func (c *conn) errRecover(err *error) {
+	e := recover()
+	switch v := e.(type) {
+	case nil:
+		// Do nothing
+	case runtime.Error:
+		c.bad = true
+		panic(v)
+	case *Error:
+		if v.Fatal() {
+			*err = driver.ErrBadConn
+		} else {
+			*err = v
+		}
+	case *net.OpError:
+		*err = driver.ErrBadConn
+	case error:
+		if v == io.EOF || v.(error).Error() == "remote error: handshake failure" {
+			*err = driver.ErrBadConn
+		} else {
+			*err = v
+		}
+
+	default:
+		c.bad = true
+		panic(fmt.Sprintf("unknown error: %#v", e))
+	}
+
+	// Any time we return ErrBadConn, we need to remember it since *Tx doesn't
+	// mark the connection bad in database/sql.
+	if *err == driver.ErrBadConn {
+		c.bad = true
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/lib/pq/hstore/hstore.go b/Godeps/_workspace/src/github.com/lib/pq/hstore/hstore.go
new file mode 100644
index 00000000..72d5abf5
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/lib/pq/hstore/hstore.go
@@ -0,0 +1,118 @@
+package hstore
+
+import (
+	"database/sql"
+	"database/sql/driver"
+	"strings"
+)
+
+// A wrapper for transferring Hstore values back and forth easily.
+type Hstore struct {
+	Map map[string]sql.NullString
+}
+
+// escapes and quotes hstore keys/values
+// s should be a sql.NullString or string
+func hQuote(s interface{}) string {
+	var str string
+	switch v := s.(type) {
+	case sql.NullString:
+		if !v.Valid {
+			return "NULL"
+		}
+		str = v.String
+	case string:
+		str = v
+	default:
+		panic("not a string or sql.NullString")
+	}
+
+	str = strings.Replace(str, "\\", "\\\\", -1)
+	return `"` + strings.Replace(str, "\"", "\\\"", -1) + `"`
+}
+
+// Scan implements the Scanner interface.
+//
+// Note h.Map is reallocated before the scan to clear existing values. If the
+// hstore column's database value is NULL, then h.Map is set to nil instead.
+func (h *Hstore) Scan(value interface{}) error {
+	if value == nil {
+		h.Map = nil
+		return nil
+	}
+	h.Map = make(map[string]sql.NullString)
+	var b byte
+	pair := [][]byte{{}, {}}
+	pi := 0
+	inQuote := false
+	didQuote := false
+	sawSlash := false
+	bindex := 0
+	for bindex, b = range value.([]byte) {
+		if sawSlash {
+			pair[pi] = append(pair[pi], b)
+			sawSlash = false
+			continue
+		}
+
+		switch b {
+		case '\\':
+			sawSlash = true
+			continue
+		case '"':
+			inQuote = !inQuote
+			if !didQuote {
+				didQuote = true
+			}
+			continue
+		default:
+			if !inQuote {
+				switch b {
+				case ' ', '\t', '\n', '\r':
+					continue
+				case '=':
+					continue
+				case '>':
+					pi = 1
+					didQuote = false
+					continue
+				case ',':
+					s := string(pair[1])
+					if !didQuote && len(s) == 4 && strings.ToLower(s) == "null" {
+						h.Map[string(pair[0])] = sql.NullString{String: "", Valid: false}
+					} else {
+						h.Map[string(pair[0])] = sql.NullString{String: string(pair[1]), Valid: true}
+					}
+					pair[0] = []byte{}
+					pair[1] = []byte{}
+					pi = 0
+					continue
+				}
+			}
+		}
+		pair[pi] = append(pair[pi], b)
+	}
+	if bindex > 0 {
+		s := string(pair[1])
+		if !didQuote && len(s) == 4 && strings.ToLower(s) == "null" {
+			h.Map[string(pair[0])] = sql.NullString{String: "", Valid: false}
+		} else {
+			h.Map[string(pair[0])] = sql.NullString{String: string(pair[1]), Valid: true}
+		}
+	}
+	return nil
+}
+
+// Value implements the driver Valuer interface. Note if h.Map is nil, the
+// database column value will be set to NULL.
+func (h Hstore) Value() (driver.Value, error) {
+	if h.Map == nil {
+		return nil, nil
+	}
+	parts := []string{}
+	for key, val := range h.Map {
+		thispart := hQuote(key) + "=>" + hQuote(val)
+		parts = append(parts, thispart)
+	}
+	return []byte(strings.Join(parts, ",")), nil
+}
diff --git a/Godeps/_workspace/src/github.com/lib/pq/hstore/hstore_test.go b/Godeps/_workspace/src/github.com/lib/pq/hstore/hstore_test.go
new file mode 100644
index 00000000..73a988f9
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/lib/pq/hstore/hstore_test.go
@@ -0,0 +1,148 @@
+package hstore
+
+import (
+	"database/sql"
+	_ "github.com/lib/pq"
+	"os"
+	"testing"
+)
+
+type Fatalistic interface {
+	Fatal(args ...interface{})
+}
+
+func openTestConn(t Fatalistic) *sql.DB {
+	datname := os.Getenv("PGDATABASE")
+	sslmode := os.Getenv("PGSSLMODE")
+
+	if datname == "" {
+		os.Setenv("PGDATABASE", "pqgotest")
+	}
+
+	if sslmode == "" {
+		os.Setenv("PGSSLMODE", "disable")
+	}
+
+	conn, err := sql.Open("postgres", "")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	return conn
+}
+
+func TestHstore(t *testing.T) {
+	db := openTestConn(t)
+	defer db.Close()
+
+	// quitely create hstore if it doesn't exist
+	_, err := db.Exec("CREATE EXTENSION IF NOT EXISTS hstore")
+	if err != nil {
+		t.Log("Skipping hstore tests - hstore extension create failed. " + err.Error())
+		return
+	}
+
+	hs := Hstore{}
+
+	// test for null-valued hstores
+	err = db.QueryRow("SELECT NULL::hstore").Scan(&hs)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if hs.Map != nil {
+		t.Fatalf("expected null map")
+	}
+
+	err = db.QueryRow("SELECT $1::hstore", hs).Scan(&hs)
+	if err != nil {
+		t.Fatalf("re-query null map failed: %s", err.Error())
+	}
+	if hs.Map != nil {
+		t.Fatalf("expected null map")
+	}
+
+	// test for empty hstores
+	err = db.QueryRow("SELECT ''::hstore").Scan(&hs)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if hs.Map == nil {
+		t.Fatalf("expected empty map, got null map")
+	}
+	if len(hs.Map) != 0 {
+		t.Fatalf("expected empty map, got len(map)=%d", len(hs.Map))
+	}
+
+	err = db.QueryRow("SELECT $1::hstore", hs).Scan(&hs)
+	if err != nil {
+		t.Fatalf("re-query empty map failed: %s", err.Error())
+	}
+	if hs.Map == nil {
+		t.Fatalf("expected empty map, got null map")
+	}
+	if len(hs.Map) != 0 {
+		t.Fatalf("expected empty map, got len(map)=%d", len(hs.Map))
+	}
+
+	// a few example maps to test out
+	hsOnePair := Hstore{
+		Map: map[string]sql.NullString{
+			"key1": {"value1", true},
+		},
+	}
+
+	hsThreePairs := Hstore{
+		Map: map[string]sql.NullString{
+			"key1": {"value1", true},
+			"key2": {"value2", true},
+			"key3": {"value3", true},
+		},
+	}
+
+	hsSmorgasbord := Hstore{
+		Map: map[string]sql.NullString{
+			"nullstring":             {"NULL", true},
+			"actuallynull":           {"", false},
+			"NULL":                   {"NULL string key", true},
+			"withbracket":            {"value>42", true},
+			"withequal":              {"value=42", true},
+			`"withquotes1"`:          {`this "should" be fine`, true},
+			`"withquotes"2"`:         {`this "should\" also be fine`, true},
+			"embedded1":              {"value1=>x1", true},
+			"embedded2":              {`"value2"=>x2`, true},
+			"withnewlines":           {"\n\nvalue\t=>2", true},
+			"<<all sorts of crazy>>": {`this, "should,\" also, => be fine`, true},
+		},
+	}
+
+	// test encoding in query params, then decoding during Scan
+	testBidirectional := func(h Hstore) {
+		err = db.QueryRow("SELECT $1::hstore", h).Scan(&hs)
+		if err != nil {
+			t.Fatalf("re-query %d-pair map failed: %s", len(h.Map), err.Error())
+		}
+		if hs.Map == nil {
+			t.Fatalf("expected %d-pair map, got null map", len(h.Map))
+		}
+		if len(hs.Map) != len(h.Map) {
+			t.Fatalf("expected %d-pair map, got len(map)=%d", len(h.Map), len(hs.Map))
+		}
+
+		for key, val := range hs.Map {
+			otherval, found := h.Map[key]
+			if !found {
+				t.Fatalf("  key '%v' not found in %d-pair map", key, len(h.Map))
+			}
+			if otherval.Valid != val.Valid {
+				t.Fatalf("  value %v <> %v in %d-pair map", otherval, val, len(h.Map))
+			}
+			if otherval.String != val.String {
+				t.Fatalf("  value '%v' <> '%v' in %d-pair map", otherval.String, val.String, len(h.Map))
+			}
+		}
+	}
+
+	testBidirectional(hsOnePair)
+	testBidirectional(hsThreePairs)
+	testBidirectional(hsSmorgasbord)
+}
diff --git a/Godeps/_workspace/src/github.com/lib/pq/listen_example/doc.go b/Godeps/_workspace/src/github.com/lib/pq/listen_example/doc.go
new file mode 100644
index 00000000..34496f4f
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/lib/pq/listen_example/doc.go
@@ -0,0 +1,102 @@
+/*
+
+Below you will find a self-contained Go program which uses the LISTEN / NOTIFY
+mechanism to avoid polling the database while waiting for more work to arrive.
+
+    //
+    // You can see the program in action by defining a function similar to
+    // the following:
+    //
+    // CREATE OR REPLACE FUNCTION public.get_work()
+    //   RETURNS bigint
+    //   LANGUAGE sql
+    //   AS $$
+    //     SELECT CASE WHEN random() >= 0.2 THEN int8 '1' END
+    //   $$
+    // ;
+
+    package main
+
+    import (
+        "github.com/lib/pq"
+
+        "database/sql"
+        "fmt"
+        "time"
+    )
+
+    func doWork(db *sql.DB, work int64) {
+        // work here
+    }
+
+    func getWork(db *sql.DB) {
+        for {
+            // get work from the database here
+            var work sql.NullInt64
+            err := db.QueryRow("SELECT get_work()").Scan(&work)
+            if err != nil {
+                fmt.Println("call to get_work() failed: ", err)
+                time.Sleep(10 * time.Second)
+                continue
+            }
+            if !work.Valid {
+                // no more work to do
+                fmt.Println("ran out of work")
+                return
+            }
+
+            fmt.Println("starting work on ", work.Int64)
+            go doWork(db, work.Int64)
+        }
+    }
+
+    func waitForNotification(l *pq.Listener) {
+        for {
+            select {
+                case <-l.Notify:
+                    fmt.Println("received notification, new work available")
+                    return
+                case <-time.After(90 * time.Second):
+                    go func() {
+                        l.Ping()
+                    }()
+                    // Check if there's more work available, just in case it takes
+                    // a while for the Listener to notice connection loss and
+                    // reconnect.
+                    fmt.Println("received no work for 90 seconds, checking for new work")
+                    return
+            }
+        }
+    }
+
+    func main() {
+        var conninfo string = ""
+
+        db, err := sql.Open("postgres", conninfo)
+        if err != nil {
+            panic(err)
+        }
+
+        reportProblem := func(ev pq.ListenerEventType, err error) {
+            if err != nil {
+                fmt.Println(err.Error())
+            }
+        }
+
+        listener := pq.NewListener(conninfo, 10 * time.Second, time.Minute, reportProblem)
+        err = listener.Listen("getwork")
+        if err != nil {
+            panic(err)
+        }
+
+        fmt.Println("entering main loop")
+        for {
+            // process all available work before waiting for notifications
+            getWork(db)
+            waitForNotification(listener)
+        }
+    }
+
+
+*/
+package listen_example
diff --git a/Godeps/_workspace/src/github.com/lib/pq/notify.go b/Godeps/_workspace/src/github.com/lib/pq/notify.go
new file mode 100644
index 00000000..21aafbc3
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/lib/pq/notify.go
@@ -0,0 +1,751 @@
+package pq
+
+// Package pq is a pure Go Postgres driver for the database/sql package.
+// This module contains support for Postgres LISTEN/NOTIFY.
+
+import (
+	"errors"
+	"fmt"
+	"io"
+	"sync"
+	"sync/atomic"
+	"time"
+)
+
+// Notification represents a single notification from the database.
+type Notification struct {
+	// Process ID (PID) of the notifying postgres backend.
+	BePid int
+	// Name of the channel the notification was sent on.
+	Channel string
+	// Payload, or the empty string if unspecified.
+	Extra string
+}
+
+func recvNotification(r *readBuf) *Notification {
+	bePid := r.int32()
+	channel := r.string()
+	extra := r.string()
+
+	return &Notification{bePid, channel, extra}
+}
+
+const (
+	connStateIdle int32 = iota
+	connStateExpectResponse
+	connStateExpectReadyForQuery
+)
+
+type message struct {
+	typ byte
+	err error
+}
+
+var errListenerConnClosed = errors.New("pq: ListenerConn has been closed")
+
+// ListenerConn is a low-level interface for waiting for notifications.  You
+// should use Listener instead.
+type ListenerConn struct {
+	// guards cn and err
+	connectionLock sync.Mutex
+	cn             *conn
+	err            error
+
+	connState int32
+
+	// the sending goroutine will be holding this lock
+	senderLock sync.Mutex
+
+	notificationChan chan<- *Notification
+
+	replyChan chan message
+}
+
+// Creates a new ListenerConn.  Use NewListener instead.
+func NewListenerConn(name string, notificationChan chan<- *Notification) (*ListenerConn, error) {
+	cn, err := Open(name)
+	if err != nil {
+		return nil, err
+	}
+
+	l := &ListenerConn{
+		cn:               cn.(*conn),
+		notificationChan: notificationChan,
+		connState:        connStateIdle,
+		replyChan:        make(chan message, 2),
+	}
+
+	go l.listenerConnMain()
+
+	return l, nil
+}
+
+// We can only allow one goroutine at a time to be running a query on the
+// connection for various reasons, so the goroutine sending on the connection
+// must be holding senderLock.
+//
+// Returns an error if an unrecoverable error has occurred and the ListenerConn
+// should be abandoned.
+func (l *ListenerConn) acquireSenderLock() error {
+	l.connectionLock.Lock()
+	defer l.connectionLock.Unlock()
+	if l.err != nil {
+		return l.err
+	}
+	l.senderLock.Lock()
+	return nil
+}
+
+func (l *ListenerConn) releaseSenderLock() {
+	l.senderLock.Unlock()
+}
+
+// setState advances the protocol state to newState.  Returns false if moving
+// to that state from the current state is not allowed.
+func (l *ListenerConn) setState(newState int32) bool {
+	var expectedState int32
+
+	switch newState {
+	case connStateIdle:
+		expectedState = connStateExpectReadyForQuery
+	case connStateExpectResponse:
+		expectedState = connStateIdle
+	case connStateExpectReadyForQuery:
+		expectedState = connStateExpectResponse
+	default:
+		panic(fmt.Sprintf("unexpected listenerConnState %d", newState))
+	}
+
+	return atomic.CompareAndSwapInt32(&l.connState, expectedState, newState)
+}
+
+// Main logic is here: receive messages from the postgres backend, forward
+// notifications and query replies and keep the internal state in sync with the
+// protocol state.  Returns when the connection has been lost, is about to go
+// away or should be discarded because we couldn't agree on the state with the
+// server backend.
+func (l *ListenerConn) listenerConnLoop() (err error) {
+	defer l.cn.errRecover(&err)
+
+	r := &readBuf{}
+	for {
+		t, err := l.cn.recvMessage(r)
+		if err != nil {
+			return err
+		}
+
+		switch t {
+		case 'A':
+			// recvNotification copies all the data so we don't need to worry
+			// about the scratch buffer being overwritten.
+			l.notificationChan <- recvNotification(r)
+
+		case 'E':
+			// We might receive an ErrorResponse even when not in a query; it
+			// is expected that the server will close the connection after
+			// that, but we should make sure that the error we display is the
+			// one from the stray ErrorResponse, not io.ErrUnexpectedEOF.
+			if !l.setState(connStateExpectReadyForQuery) {
+				return parseError(r)
+			}
+			l.replyChan <- message{t, parseError(r)}
+
+		case 'C', 'I':
+			if !l.setState(connStateExpectReadyForQuery) {
+				// protocol out of sync
+				return fmt.Errorf("unexpected CommandComplete")
+			}
+			// ExecSimpleQuery doesn't need to know about this message
+
+		case 'Z':
+			if !l.setState(connStateIdle) {
+				// protocol out of sync
+				return fmt.Errorf("unexpected ReadyForQuery")
+			}
+			l.replyChan <- message{t, nil}
+
+		case 'N', 'S':
+			// ignore
+		default:
+			return fmt.Errorf("unexpected message %q from server in listenerConnLoop", t)
+		}
+	}
+
+	panic("not reached")
+}
+
+// This is the main routine for the goroutine receiving on the database
+// connection.  Most of the main logic is in listenerConnLoop.
+func (l *ListenerConn) listenerConnMain() {
+	err := l.listenerConnLoop()
+
+	// listenerConnLoop terminated; we're done, but we still have to clean up.
+	// Make sure nobody tries to start any new queries by making sure the err
+	// pointer is set.  It is important that we do not overwrite its value; a
+	// connection could be closed by either this goroutine or one sending on
+	// the connection -- whoever closes the connection is assumed to have the
+	// more meaningful error message (as the other one will probably get
+	// net.errClosed), so that goroutine sets the error we expose while the
+	// other error is discarded.  If the connection is lost while two
+	// goroutines are operating on the socket, it probably doesn't matter which
+	// error we expose so we don't try to do anything more complex.
+	l.connectionLock.Lock()
+	if l.err == nil {
+		l.err = err
+	}
+	l.cn.Close()
+	l.connectionLock.Unlock()
+
+	// There might be a query in-flight; make sure nobody's waiting for a
+	// response to it, since there's not going to be one.
+	close(l.replyChan)
+
+	// let the listener know we're done
+	close(l.notificationChan)
+
+	// this ListenerConn is done
+}
+
+// Send a LISTEN query to the server.  See ExecSimpleQuery.
+func (l *ListenerConn) Listen(channel string) (bool, error) {
+	return l.ExecSimpleQuery("LISTEN " + QuoteIdentifier(channel))
+}
+
+// Send an UNLISTEN query to the server.  See ExecSimpleQuery.
+func (l *ListenerConn) Unlisten(channel string) (bool, error) {
+	return l.ExecSimpleQuery("UNLISTEN " + QuoteIdentifier(channel))
+}
+
+// Send `UNLISTEN *` to the server.  See ExecSimpleQuery.
+func (l *ListenerConn) UnlistenAll() (bool, error) {
+	return l.ExecSimpleQuery("UNLISTEN *")
+}
+
+// Ping the remote server to make sure it's alive.  Non-nil error means the
+// connection has failed and should be abandoned.
+func (l *ListenerConn) Ping() error {
+	sent, err := l.ExecSimpleQuery("")
+	if !sent {
+		return err
+	}
+	if err != nil {
+		// shouldn't happen
+		panic(err)
+	}
+	return nil
+}
+
+// Attempt to send a query on the connection.  Returns an error if sending the
+// query failed, and the caller should initiate closure of this connection.
+// The caller must be holding senderLock (see acquireSenderLock and
+// releaseSenderLock).
+func (l *ListenerConn) sendSimpleQuery(q string) (err error) {
+	defer l.cn.errRecover(&err)
+
+	// must set connection state before sending the query
+	if !l.setState(connStateExpectResponse) {
+		panic("two queries running at the same time")
+	}
+
+	// Can't use l.cn.writeBuf here because it uses the scratch buffer which
+	// might get overwritten by listenerConnLoop.
+	data := writeBuf([]byte("Q\x00\x00\x00\x00"))
+	b := &data
+	b.string(q)
+	l.cn.send(b)
+
+	return nil
+}
+
+// Execute a "simple query" (i.e. one with no bindable parameters) on the
+// connection.  The possible return values are:
+//   1) "executed" is true; the query was executed to completion on the
+//      database server.  If the query failed, err will be set to the error
+//      returned by the database, otherwise err will be nil.
+//   2) If "executed" is false, the query could not be executed on the remote
+//      server.  err will be non-nil.
+//
+// After a call to ExecSimpleQuery has returned an executed=false value, the
+// connection has either been closed or will be closed shortly thereafter, and
+// all subsequently executed queries will return an error.
+func (l *ListenerConn) ExecSimpleQuery(q string) (executed bool, err error) {
+	if err = l.acquireSenderLock(); err != nil {
+		return false, err
+	}
+	defer l.releaseSenderLock()
+
+	err = l.sendSimpleQuery(q)
+	if err != nil {
+		// We can't know what state the protocol is in, so we need to abandon
+		// this connection.
+		l.connectionLock.Lock()
+		defer l.connectionLock.Unlock()
+		// Set the error pointer if it hasn't been set already; see
+		// listenerConnMain.
+		if l.err == nil {
+			l.err = err
+		}
+		l.cn.Close()
+		return false, err
+	}
+
+	// now we just wait for a reply..
+	for {
+		m, ok := <-l.replyChan
+		if !ok {
+			// We lost the connection to server, don't bother waiting for a
+			// a response.
+			return false, io.EOF
+		}
+		switch m.typ {
+		case 'Z':
+			// sanity check
+			if m.err != nil {
+				panic("m.err != nil")
+			}
+			// done; err might or might not be set
+			return true, err
+
+		case 'E':
+			// sanity check
+			if m.err == nil {
+				panic("m.err == nil")
+			}
+			// server responded with an error; ReadyForQuery to follow
+			err = m.err
+
+		default:
+			return false, fmt.Errorf("unknown response for simple query: %q", m.typ)
+		}
+	}
+
+	panic("not reached")
+}
+
+func (l *ListenerConn) Close() error {
+	l.connectionLock.Lock()
+	defer l.connectionLock.Unlock()
+	if l.err != nil {
+		return errListenerConnClosed
+	}
+	l.err = errListenerConnClosed
+	return l.cn.Close()
+}
+
+// Err() returns the reason the connection was closed.  It is not safe to call
+// this function until l.Notify has been closed.
+func (l *ListenerConn) Err() error {
+	return l.err
+}
+
+var errListenerClosed = errors.New("pq: Listener has been closed")
+
+var ErrChannelAlreadyOpen = errors.New("pq: channel is already open")
+var ErrChannelNotOpen = errors.New("pq: channel is not open")
+
+type ListenerEventType int
+
+const (
+	// Emitted only when the database connection has been initially
+	// initialized.  err will always be nil.
+	ListenerEventConnected ListenerEventType = iota
+
+	// Emitted after a database connection has been lost, either because of an
+	// error or because Close has been called.  err will be set to the reason
+	// the database connection was lost.
+	ListenerEventDisconnected
+
+	// Emitted after a database connection has been re-established after
+	// connection loss.  err will always be nil.  After this event has been
+	// emitted, a nil pq.Notification is sent on the Listener.Notify channel.
+	ListenerEventReconnected
+
+	// Emitted after a connection to the database was attempted, but failed.
+	// err will be set to an error describing why the connection attempt did
+	// not succeed.
+	ListenerEventConnectionAttemptFailed
+)
+
+type EventCallbackType func(event ListenerEventType, err error)
+
+// Listener provides an interface for listening to notifications from a
+// PostgreSQL database.  For general usage information, see section
+// "Notifications".
+//
+// Listener can safely be used from concurrently running goroutines.
+type Listener struct {
+	// Channel for receiving notifications from the database.  In some cases a
+	// nil value will be sent.  See section "Notifications" above.
+	Notify chan *Notification
+
+	name                 string
+	minReconnectInterval time.Duration
+	maxReconnectInterval time.Duration
+	eventCallback        EventCallbackType
+
+	lock                 sync.Mutex
+	isClosed             bool
+	reconnectCond        *sync.Cond
+	cn                   *ListenerConn
+	connNotificationChan <-chan *Notification
+	channels             map[string]struct{}
+}
+
+// NewListener creates a new database connection dedicated to LISTEN / NOTIFY.
+//
+// name should be set to a connection string to be used to establish the
+// database connection (see section "Connection String Parameters" above).
+//
+// minReconnectInterval controls the duration to wait before trying to
+// re-establish the database connection after connection loss.  After each
+// consecutive failure this interval is doubled, until maxReconnectInterval is
+// reached.  Successfully completing the connection establishment procedure
+// resets the interval back to minReconnectInterval.
+//
+// The last parameter eventCallback can be set to a function which will be
+// called by the Listener when the state of the underlying database connection
+// changes.  This callback will be called by the goroutine which dispatches the
+// notifications over the Notify channel, so you should try to avoid doing
+// potentially time-consuming operations from the callback.
+func NewListener(name string,
+	minReconnectInterval time.Duration,
+	maxReconnectInterval time.Duration,
+	eventCallback EventCallbackType) *Listener {
+	l := &Listener{
+		name:                 name,
+		minReconnectInterval: minReconnectInterval,
+		maxReconnectInterval: maxReconnectInterval,
+		eventCallback:        eventCallback,
+
+		channels: make(map[string]struct{}),
+
+		Notify: make(chan *Notification, 32),
+	}
+	l.reconnectCond = sync.NewCond(&l.lock)
+
+	go l.listenerMain()
+
+	return l
+}
+
+// Listen starts listening for notifications on a channel.  Calls to this
+// function will block until an acknowledgement has been received from the
+// server.  Note that Listener automatically re-establishes the connection
+// after connection loss, so this function may block indefinitely if the
+// connection can not be re-established.
+//
+// Listen will only fail in three conditions:
+//   1) The channel is already open.  The returned error will be
+//      ErrChannelAlreadyOpen.
+//   2) The query was executed on the remote server, but PostgreSQL returned an
+//      error message in response to the query.  The returned error will be a
+//      pq.Error containing the information the server supplied.
+//   3) Close is called on the Listener before the request could be completed.
+//
+// The channel name is case-sensitive.
+func (l *Listener) Listen(channel string) error {
+	l.lock.Lock()
+	defer l.lock.Unlock()
+
+	if l.isClosed {
+		return errListenerClosed
+	}
+
+	// The server allows you to issue a LISTEN on a channel which is already
+	// open, but it seems useful to be able to detect this case to spot for
+	// mistakes in application logic.  If the application genuinely does't
+	// care, it can check the exported error and ignore it.
+	_, exists := l.channels[channel]
+	if exists {
+		return ErrChannelAlreadyOpen
+	}
+
+	if l.cn != nil {
+		// If gotResponse is true but error is set, the query was executed on
+		// the remote server, but resulted in an error.  This should be
+		// relatively rare, so it's fine if we just pass the error to our
+		// caller.  However, if gotResponse is false, we could not complete the
+		// query on the remote server and our underlying connection is about
+		// to go away, so we only add relname to l.channels, and wait for
+		// resync() to take care of the rest.
+		gotResponse, err := l.cn.Listen(channel)
+		if gotResponse && err != nil {
+			return err
+		}
+	}
+
+	l.channels[channel] = struct{}{}
+	for l.cn == nil {
+		l.reconnectCond.Wait()
+		// we let go of the mutex for a while
+		if l.isClosed {
+			return errListenerClosed
+		}
+	}
+
+	return nil
+}
+
+// Unlisten removes a channel from the Listener's channel list.  Returns
+// ErrChannelNotOpen if the Listener is not listening on the specified channel.
+// Returns immediately with no error if there is no connection.  Note that you
+// might still get notifications for this channel even after Unlisten has
+// returned.
+//
+// The channel name is case-sensitive.
+func (l *Listener) Unlisten(channel string) error {
+	l.lock.Lock()
+	defer l.lock.Unlock()
+
+	if l.isClosed {
+		return errListenerClosed
+	}
+
+	// Similarly to LISTEN, this is not an error in Postgres, but it seems
+	// useful to distinguish from the normal conditions.
+	_, exists := l.channels[channel]
+	if !exists {
+		return ErrChannelNotOpen
+	}
+
+	if l.cn != nil {
+		// Similarly to Listen (see comment in that function), the caller
+		// should only be bothered with an error if it came from the backend as
+		// a response to our query.
+		gotResponse, err := l.cn.Unlisten(channel)
+		if gotResponse && err != nil {
+			return err
+		}
+	}
+
+	// Don't bother waiting for resync if there's no connection.
+	delete(l.channels, channel)
+	return nil
+}
+
+// UnlistenAll removes all channels from the Listener's channel list.  Returns
+// immediately with no error if there is no connection.  Note that you might
+// still get notifications for any of the deleted channels even after
+// UnlistenAll has returned.
+func (l *Listener) UnlistenAll() error {
+	l.lock.Lock()
+	defer l.lock.Unlock()
+
+	if l.isClosed {
+		return errListenerClosed
+	}
+
+	if l.cn != nil {
+		// Similarly to Listen (see comment in that function), the caller
+		// should only be bothered with an error if it came from the backend as
+		// a response to our query.
+		gotResponse, err := l.cn.UnlistenAll()
+		if gotResponse && err != nil {
+			return err
+		}
+	}
+
+	// Don't bother waiting for resync if there's no connection.
+	l.channels = make(map[string]struct{})
+	return nil
+}
+
+// Ping the remote server to make sure it's alive.  Non-nil return value means
+// that there is no active connection.
+func (l *Listener) Ping() error {
+	l.lock.Lock()
+	defer l.lock.Unlock()
+
+	if l.isClosed {
+		return errListenerClosed
+	}
+	if l.cn == nil {
+		return errors.New("no connection")
+	}
+
+	return l.cn.Ping()
+}
+
+// Clean up after losing the server connection.  Returns l.cn.Err(), which
+// should have the reason the connection was lost.
+func (l *Listener) disconnectCleanup() error {
+	l.lock.Lock()
+	defer l.lock.Unlock()
+
+	// sanity check; can't look at Err() until the channel has been closed
+	select {
+	case _, ok := <-l.connNotificationChan:
+		if ok {
+			panic("connNotificationChan not closed")
+		}
+	default:
+		panic("connNotificationChan not closed")
+	}
+
+	err := l.cn.Err()
+	l.cn.Close()
+	l.cn = nil
+	return err
+}
+
+// Synchronize the list of channels we want to be listening on with the server
+// after the connection has been established.
+func (l *Listener) resync(cn *ListenerConn, notificationChan <-chan *Notification) error {
+	doneChan := make(chan error)
+	go func() {
+		for channel := range l.channels {
+			// If we got a response, return that error to our caller as it's
+			// going to be more descriptive than cn.Err().
+			gotResponse, err := cn.Listen(channel)
+			if gotResponse && err != nil {
+				doneChan <- err
+				return
+			}
+
+			// If we couldn't reach the server, wait for notificationChan to
+			// close and then return the error message from the connection, as
+			// per ListenerConn's interface.
+			if err != nil {
+				for _ = range notificationChan {
+				}
+				doneChan <- cn.Err()
+				return
+			}
+		}
+		doneChan <- nil
+	}()
+
+	// Ignore notifications while synchronization is going on to avoid
+	// deadlocks.  We have to send a nil notification over Notify anyway as
+	// we can't possibly know which notifications (if any) were lost while
+	// the connection was down, so there's no reason to try and process
+	// these messages at all.
+	for {
+		select {
+		case _, ok := <-notificationChan:
+			if !ok {
+				notificationChan = nil
+			}
+
+		case err := <-doneChan:
+			return err
+		}
+	}
+
+	panic("not reached")
+}
+
+// caller should NOT be holding l.lock
+func (l *Listener) closed() bool {
+	l.lock.Lock()
+	defer l.lock.Unlock()
+
+	return l.isClosed
+}
+
+func (l *Listener) connect() error {
+	notificationChan := make(chan *Notification, 32)
+	cn, err := NewListenerConn(l.name, notificationChan)
+	if err != nil {
+		return err
+	}
+
+	l.lock.Lock()
+	defer l.lock.Unlock()
+
+	err = l.resync(cn, notificationChan)
+	if err != nil {
+		cn.Close()
+		return err
+	}
+
+	l.cn = cn
+	l.connNotificationChan = notificationChan
+	l.reconnectCond.Broadcast()
+
+	return nil
+}
+
+// Close disconnects the Listener from the database and shuts it down.
+// Subsequent calls to its methods will return an error.  Close returns an
+// error if the connection has already been closed.
+func (l *Listener) Close() error {
+	l.lock.Lock()
+	defer l.lock.Unlock()
+
+	if l.isClosed {
+		return errListenerClosed
+	}
+
+	if l.cn != nil {
+		l.cn.Close()
+	}
+	l.isClosed = true
+
+	return nil
+}
+
+func (l *Listener) emitEvent(event ListenerEventType, err error) {
+	if l.eventCallback != nil {
+		l.eventCallback(event, err)
+	}
+}
+
+// Main logic here: maintain a connection to the server when possible, wait
+// for notifications and emit events.
+func (l *Listener) listenerConnLoop() {
+	var nextReconnect time.Time
+
+	reconnectInterval := l.minReconnectInterval
+	for {
+		for {
+			err := l.connect()
+			if err == nil {
+				break
+			}
+
+			if l.closed() {
+				return
+			}
+			l.emitEvent(ListenerEventConnectionAttemptFailed, err)
+
+			time.Sleep(reconnectInterval)
+			reconnectInterval *= 2
+			if reconnectInterval > l.maxReconnectInterval {
+				reconnectInterval = l.maxReconnectInterval
+			}
+		}
+
+		if nextReconnect.IsZero() {
+			l.emitEvent(ListenerEventConnected, nil)
+		} else {
+			l.emitEvent(ListenerEventReconnected, nil)
+			l.Notify <- nil
+		}
+
+		reconnectInterval = l.minReconnectInterval
+		nextReconnect = time.Now().Add(reconnectInterval)
+
+		for {
+			notification, ok := <-l.connNotificationChan
+			if !ok {
+				// lost connection, loop again
+				break
+			}
+			l.Notify <- notification
+		}
+
+		err := l.disconnectCleanup()
+		if l.closed() {
+			return
+		}
+		l.emitEvent(ListenerEventDisconnected, err)
+
+		time.Sleep(nextReconnect.Sub(time.Now()))
+	}
+}
+
+func (l *Listener) listenerMain() {
+	l.listenerConnLoop()
+	close(l.Notify)
+}
diff --git a/Godeps/_workspace/src/github.com/lib/pq/notify_test.go b/Godeps/_workspace/src/github.com/lib/pq/notify_test.go
new file mode 100644
index 00000000..b7422181
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/lib/pq/notify_test.go
@@ -0,0 +1,507 @@
+package pq
+
+import (
+	"errors"
+	"fmt"
+	"io"
+	"os"
+	"testing"
+	"time"
+)
+
+var errNilNotification = errors.New("nil notification")
+
+func expectNotification(t *testing.T, ch <-chan *Notification, relname string, extra string) error {
+	select {
+	case n := <-ch:
+		if n == nil {
+			return errNilNotification
+		}
+		if n.Channel != relname || n.Extra != extra {
+			return fmt.Errorf("unexpected notification %v", n)
+		}
+		return nil
+	case <-time.After(1500 * time.Millisecond):
+		return fmt.Errorf("timeout")
+	}
+	panic("not reached")
+}
+
+func expectNoNotification(t *testing.T, ch <-chan *Notification) error {
+	select {
+	case n := <-ch:
+		return fmt.Errorf("unexpected notification %v", n)
+	case <-time.After(100 * time.Millisecond):
+		return nil
+	}
+	panic("not reached")
+}
+
+func expectEvent(t *testing.T, eventch <-chan ListenerEventType, et ListenerEventType) error {
+	select {
+	case e := <-eventch:
+		if e != et {
+			return fmt.Errorf("unexpected event %v", e)
+		}
+		return nil
+	case <-time.After(1500 * time.Millisecond):
+		return fmt.Errorf("timeout")
+	}
+	panic("not reached")
+}
+
+func expectNoEvent(t *testing.T, eventch <-chan ListenerEventType) error {
+	select {
+	case e := <-eventch:
+		return fmt.Errorf("unexpected event %v", e)
+	case <-time.After(100 * time.Millisecond):
+		return nil
+	}
+	panic("not reached")
+}
+
+func newTestListenerConn(t *testing.T) (*ListenerConn, <-chan *Notification) {
+	datname := os.Getenv("PGDATABASE")
+	sslmode := os.Getenv("PGSSLMODE")
+
+	if datname == "" {
+		os.Setenv("PGDATABASE", "pqgotest")
+	}
+
+	if sslmode == "" {
+		os.Setenv("PGSSLMODE", "disable")
+	}
+
+	notificationChan := make(chan *Notification)
+	l, err := NewListenerConn("", notificationChan)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	return l, notificationChan
+}
+
+func TestNewListenerConn(t *testing.T) {
+	l, _ := newTestListenerConn(t)
+
+	defer l.Close()
+}
+
+func TestConnListen(t *testing.T) {
+	l, channel := newTestListenerConn(t)
+
+	defer l.Close()
+
+	db := openTestConn(t)
+	defer db.Close()
+
+	ok, err := l.Listen("notify_test")
+	if !ok || err != nil {
+		t.Fatal(err)
+	}
+
+	_, err = db.Exec("NOTIFY notify_test")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = expectNotification(t, channel, "notify_test", "")
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestConnUnlisten(t *testing.T) {
+	l, channel := newTestListenerConn(t)
+
+	defer l.Close()
+
+	db := openTestConn(t)
+	defer db.Close()
+
+	ok, err := l.Listen("notify_test")
+	if !ok || err != nil {
+		t.Fatal(err)
+	}
+
+	_, err = db.Exec("NOTIFY notify_test")
+
+	err = expectNotification(t, channel, "notify_test", "")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	ok, err = l.Unlisten("notify_test")
+	if !ok || err != nil {
+		t.Fatal(err)
+	}
+
+	_, err = db.Exec("NOTIFY notify_test")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = expectNoNotification(t, channel)
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestConnUnlistenAll(t *testing.T) {
+	l, channel := newTestListenerConn(t)
+
+	defer l.Close()
+
+	db := openTestConn(t)
+	defer db.Close()
+
+	ok, err := l.Listen("notify_test")
+	if !ok || err != nil {
+		t.Fatal(err)
+	}
+
+	_, err = db.Exec("NOTIFY notify_test")
+
+	err = expectNotification(t, channel, "notify_test", "")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	ok, err = l.UnlistenAll()
+	if !ok || err != nil {
+		t.Fatal(err)
+	}
+
+	_, err = db.Exec("NOTIFY notify_test")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = expectNoNotification(t, channel)
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestConnClose(t *testing.T) {
+	l, _ := newTestListenerConn(t)
+	defer l.Close()
+
+	err := l.Close()
+	if err != nil {
+		t.Fatal(err)
+	}
+	err = l.Close()
+	if err != errListenerConnClosed {
+		t.Fatalf("expected errListenerConnClosed; got %v", err)
+	}
+}
+
+func TestConnPing(t *testing.T) {
+	l, _ := newTestListenerConn(t)
+	defer l.Close()
+	err := l.Ping()
+	if err != nil {
+		t.Fatal(err)
+	}
+	err = l.Close()
+	if err != nil {
+		t.Fatal(err)
+	}
+	err = l.Ping()
+	if err != errListenerConnClosed {
+		t.Fatalf("expected errListenerConnClosed; got %v", err)
+	}
+}
+
+func TestNotifyExtra(t *testing.T) {
+	db := openTestConn(t)
+	defer db.Close()
+
+	if getServerVersion(t, db) < 90000 {
+		t.Log("skipping test due to old PG version")
+		return
+	}
+
+	l, channel := newTestListenerConn(t)
+	defer l.Close()
+
+	ok, err := l.Listen("notify_test")
+	if !ok || err != nil {
+		t.Fatal(err)
+	}
+
+	_, err = db.Exec("NOTIFY notify_test, 'something'")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = expectNotification(t, channel, "notify_test", "something")
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+// create a new test listener and also set the timeouts
+func newTestListenerTimeout(t *testing.T, min time.Duration, max time.Duration) (*Listener, <-chan ListenerEventType) {
+	datname := os.Getenv("PGDATABASE")
+	sslmode := os.Getenv("PGSSLMODE")
+
+	if datname == "" {
+		os.Setenv("PGDATABASE", "pqgotest")
+	}
+
+	if sslmode == "" {
+		os.Setenv("PGSSLMODE", "disable")
+	}
+
+	eventch := make(chan ListenerEventType, 16)
+	l := NewListener("", min, max, func(t ListenerEventType, err error) { eventch <- t })
+	err := expectEvent(t, eventch, ListenerEventConnected)
+	if err != nil {
+		t.Fatal(err)
+	}
+	return l, eventch
+}
+
+func newTestListener(t *testing.T) (*Listener, <-chan ListenerEventType) {
+	return newTestListenerTimeout(t, time.Hour, time.Hour)
+}
+
+func TestListenerListen(t *testing.T) {
+	l, _ := newTestListener(t)
+	defer l.Close()
+
+	db := openTestConn(t)
+	defer db.Close()
+
+	err := l.Listen("notify_listen_test")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	_, err = db.Exec("NOTIFY notify_listen_test")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = expectNotification(t, l.Notify, "notify_listen_test", "")
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestListenerUnlisten(t *testing.T) {
+	l, _ := newTestListener(t)
+	defer l.Close()
+
+	db := openTestConn(t)
+	defer db.Close()
+
+	err := l.Listen("notify_listen_test")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	_, err = db.Exec("NOTIFY notify_listen_test")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = l.Unlisten("notify_listen_test")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = expectNotification(t, l.Notify, "notify_listen_test", "")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	_, err = db.Exec("NOTIFY notify_listen_test")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = expectNoNotification(t, l.Notify)
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestListenerUnlistenAll(t *testing.T) {
+	l, _ := newTestListener(t)
+	defer l.Close()
+
+	db := openTestConn(t)
+	defer db.Close()
+
+	err := l.Listen("notify_listen_test")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	_, err = db.Exec("NOTIFY notify_listen_test")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = l.UnlistenAll()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = expectNotification(t, l.Notify, "notify_listen_test", "")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	_, err = db.Exec("NOTIFY notify_listen_test")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = expectNoNotification(t, l.Notify)
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestListenerFailedQuery(t *testing.T) {
+	l, eventch := newTestListener(t)
+	defer l.Close()
+
+	db := openTestConn(t)
+	defer db.Close()
+
+	err := l.Listen("notify_listen_test")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	_, err = db.Exec("NOTIFY notify_listen_test")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = expectNotification(t, l.Notify, "notify_listen_test", "")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// shouldn't cause a disconnect
+	ok, err := l.cn.ExecSimpleQuery("SELECT error")
+	if !ok {
+		t.Fatalf("could not send query to server: %v", err)
+	}
+	_, ok = err.(PGError)
+	if !ok {
+		t.Fatalf("unexpected error %v", err)
+	}
+	err = expectNoEvent(t, eventch)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// should still work
+	_, err = db.Exec("NOTIFY notify_listen_test")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = expectNotification(t, l.Notify, "notify_listen_test", "")
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestListenerReconnect(t *testing.T) {
+	l, eventch := newTestListenerTimeout(t, 20*time.Millisecond, time.Hour)
+	defer l.Close()
+
+	db := openTestConn(t)
+	defer db.Close()
+
+	err := l.Listen("notify_listen_test")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	_, err = db.Exec("NOTIFY notify_listen_test")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = expectNotification(t, l.Notify, "notify_listen_test", "")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// kill the connection and make sure it comes back up
+	ok, err := l.cn.ExecSimpleQuery("SELECT pg_terminate_backend(pg_backend_pid())")
+	if ok {
+		t.Fatalf("could not kill the connection: %v", err)
+	}
+	if err != io.EOF {
+		t.Fatalf("unexpected error %v", err)
+	}
+	err = expectEvent(t, eventch, ListenerEventDisconnected)
+	if err != nil {
+		t.Fatal(err)
+	}
+	err = expectEvent(t, eventch, ListenerEventReconnected)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// should still work
+	_, err = db.Exec("NOTIFY notify_listen_test")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// should get nil after Reconnected
+	err = expectNotification(t, l.Notify, "", "")
+	if err != errNilNotification {
+		t.Fatal(err)
+	}
+
+	err = expectNotification(t, l.Notify, "notify_listen_test", "")
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestListenerClose(t *testing.T) {
+	l, _ := newTestListenerTimeout(t, 20*time.Millisecond, time.Hour)
+	defer l.Close()
+
+	err := l.Close()
+	if err != nil {
+		t.Fatal(err)
+	}
+	err = l.Close()
+	if err != errListenerClosed {
+		t.Fatalf("expected errListenerClosed; got %v", err)
+	}
+}
+
+func TestListenerPing(t *testing.T) {
+	l, _ := newTestListenerTimeout(t, 20*time.Millisecond, time.Hour)
+	defer l.Close()
+
+	err := l.Ping()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = l.Close()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = l.Ping()
+	if err != errListenerClosed {
+		t.Fatalf("expected errListenerClosed; got %v", err)
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/lib/pq/oid/doc.go b/Godeps/_workspace/src/github.com/lib/pq/oid/doc.go
new file mode 100644
index 00000000..caaede24
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/lib/pq/oid/doc.go
@@ -0,0 +1,6 @@
+// Package oid contains OID constants
+// as defined by the Postgres server.
+package oid
+
+// Oid is a Postgres Object ID.
+type Oid uint32
diff --git a/Godeps/_workspace/src/github.com/lib/pq/oid/gen.go b/Godeps/_workspace/src/github.com/lib/pq/oid/gen.go
new file mode 100644
index 00000000..f16a51c0
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/lib/pq/oid/gen.go
@@ -0,0 +1,74 @@
+// +build ignore
+
+// Generate the table of OID values
+// Run with 'go run gen.go'.
+package main
+
+import (
+	"fmt"
+	"log"
+	"os"
+	"os/exec"
+
+	"database/sql"
+	_ "github.com/lib/pq"
+)
+
+func main() {
+	datname := os.Getenv("PGDATABASE")
+	sslmode := os.Getenv("PGSSLMODE")
+
+	if datname == "" {
+		os.Setenv("PGDATABASE", "pqgotest")
+	}
+
+	if sslmode == "" {
+		os.Setenv("PGSSLMODE", "disable")
+	}
+
+	db, err := sql.Open("postgres", "")
+	if err != nil {
+		log.Fatal(err)
+	}
+	cmd := exec.Command("gofmt")
+	cmd.Stderr = os.Stderr
+	w, err := cmd.StdinPipe()
+	if err != nil {
+		log.Fatal(err)
+	}
+	f, err := os.Create("types.go")
+	if err != nil {
+		log.Fatal(err)
+	}
+	cmd.Stdout = f
+	err = cmd.Start()
+	if err != nil {
+		log.Fatal(err)
+	}
+	fmt.Fprintln(w, "// generated by 'go run gen.go'; do not edit")
+	fmt.Fprintln(w, "\npackage oid")
+	fmt.Fprintln(w, "const (")
+	rows, err := db.Query(`
+		SELECT typname, oid
+		FROM pg_type WHERE oid < 10000
+		ORDER BY oid;
+	`)
+	if err != nil {
+		log.Fatal(err)
+	}
+	var name string
+	var oid int
+	for rows.Next() {
+		err = rows.Scan(&name, &oid)
+		if err != nil {
+			log.Fatal(err)
+		}
+		fmt.Fprintf(w, "T_%s Oid = %d\n", name, oid)
+	}
+	if err = rows.Err(); err != nil {
+		log.Fatal(err)
+	}
+	fmt.Fprintln(w, ")")
+	w.Close()
+	cmd.Wait()
+}
diff --git a/Godeps/_workspace/src/github.com/lib/pq/oid/types.go b/Godeps/_workspace/src/github.com/lib/pq/oid/types.go
new file mode 100644
index 00000000..03df05a6
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/lib/pq/oid/types.go
@@ -0,0 +1,161 @@
+// generated by 'go run gen.go'; do not edit
+
+package oid
+
+const (
+	T_bool             Oid = 16
+	T_bytea            Oid = 17
+	T_char             Oid = 18
+	T_name             Oid = 19
+	T_int8             Oid = 20
+	T_int2             Oid = 21
+	T_int2vector       Oid = 22
+	T_int4             Oid = 23
+	T_regproc          Oid = 24
+	T_text             Oid = 25
+	T_oid              Oid = 26
+	T_tid              Oid = 27
+	T_xid              Oid = 28
+	T_cid              Oid = 29
+	T_oidvector        Oid = 30
+	T_pg_type          Oid = 71
+	T_pg_attribute     Oid = 75
+	T_pg_proc          Oid = 81
+	T_pg_class         Oid = 83
+	T_json             Oid = 114
+	T_xml              Oid = 142
+	T__xml             Oid = 143
+	T_pg_node_tree     Oid = 194
+	T__json            Oid = 199
+	T_smgr             Oid = 210
+	T_point            Oid = 600
+	T_lseg             Oid = 601
+	T_path             Oid = 602
+	T_box              Oid = 603
+	T_polygon          Oid = 604
+	T_line             Oid = 628
+	T__line            Oid = 629
+	T_cidr             Oid = 650
+	T__cidr            Oid = 651
+	T_float4           Oid = 700
+	T_float8           Oid = 701
+	T_abstime          Oid = 702
+	T_reltime          Oid = 703
+	T_tinterval        Oid = 704
+	T_unknown          Oid = 705
+	T_circle           Oid = 718
+	T__circle          Oid = 719
+	T_money            Oid = 790
+	T__money           Oid = 791
+	T_macaddr          Oid = 829
+	T_inet             Oid = 869
+	T__bool            Oid = 1000
+	T__bytea           Oid = 1001
+	T__char            Oid = 1002
+	T__name            Oid = 1003
+	T__int2            Oid = 1005
+	T__int2vector      Oid = 1006
+	T__int4            Oid = 1007
+	T__regproc         Oid = 1008
+	T__text            Oid = 1009
+	T__tid             Oid = 1010
+	T__xid             Oid = 1011
+	T__cid             Oid = 1012
+	T__oidvector       Oid = 1013
+	T__bpchar          Oid = 1014
+	T__varchar         Oid = 1015
+	T__int8            Oid = 1016
+	T__point           Oid = 1017
+	T__lseg            Oid = 1018
+	T__path            Oid = 1019
+	T__box             Oid = 1020
+	T__float4          Oid = 1021
+	T__float8          Oid = 1022
+	T__abstime         Oid = 1023
+	T__reltime         Oid = 1024
+	T__tinterval       Oid = 1025
+	T__polygon         Oid = 1027
+	T__oid             Oid = 1028
+	T_aclitem          Oid = 1033
+	T__aclitem         Oid = 1034
+	T__macaddr         Oid = 1040
+	T__inet            Oid = 1041
+	T_bpchar           Oid = 1042
+	T_varchar          Oid = 1043
+	T_date             Oid = 1082
+	T_time             Oid = 1083
+	T_timestamp        Oid = 1114
+	T__timestamp       Oid = 1115
+	T__date            Oid = 1182
+	T__time            Oid = 1183
+	T_timestamptz      Oid = 1184
+	T__timestamptz     Oid = 1185
+	T_interval         Oid = 1186
+	T__interval        Oid = 1187
+	T__numeric         Oid = 1231
+	T_pg_database      Oid = 1248
+	T__cstring         Oid = 1263
+	T_timetz           Oid = 1266
+	T__timetz          Oid = 1270
+	T_bit              Oid = 1560
+	T__bit             Oid = 1561
+	T_varbit           Oid = 1562
+	T__varbit          Oid = 1563
+	T_numeric          Oid = 1700
+	T_refcursor        Oid = 1790
+	T__refcursor       Oid = 2201
+	T_regprocedure     Oid = 2202
+	T_regoper          Oid = 2203
+	T_regoperator      Oid = 2204
+	T_regclass         Oid = 2205
+	T_regtype          Oid = 2206
+	T__regprocedure    Oid = 2207
+	T__regoper         Oid = 2208
+	T__regoperator     Oid = 2209
+	T__regclass        Oid = 2210
+	T__regtype         Oid = 2211
+	T_record           Oid = 2249
+	T_cstring          Oid = 2275
+	T_any              Oid = 2276
+	T_anyarray         Oid = 2277
+	T_void             Oid = 2278
+	T_trigger          Oid = 2279
+	T_language_handler Oid = 2280
+	T_internal         Oid = 2281
+	T_opaque           Oid = 2282
+	T_anyelement       Oid = 2283
+	T__record          Oid = 2287
+	T_anynonarray      Oid = 2776
+	T_pg_authid        Oid = 2842
+	T_pg_auth_members  Oid = 2843
+	T__txid_snapshot   Oid = 2949
+	T_uuid             Oid = 2950
+	T__uuid            Oid = 2951
+	T_txid_snapshot    Oid = 2970
+	T_fdw_handler      Oid = 3115
+	T_anyenum          Oid = 3500
+	T_tsvector         Oid = 3614
+	T_tsquery          Oid = 3615
+	T_gtsvector        Oid = 3642
+	T__tsvector        Oid = 3643
+	T__gtsvector       Oid = 3644
+	T__tsquery         Oid = 3645
+	T_regconfig        Oid = 3734
+	T__regconfig       Oid = 3735
+	T_regdictionary    Oid = 3769
+	T__regdictionary   Oid = 3770
+	T_anyrange         Oid = 3831
+	T_event_trigger    Oid = 3838
+	T_int4range        Oid = 3904
+	T__int4range       Oid = 3905
+	T_numrange         Oid = 3906
+	T__numrange        Oid = 3907
+	T_tsrange          Oid = 3908
+	T__tsrange         Oid = 3909
+	T_tstzrange        Oid = 3910
+	T__tstzrange       Oid = 3911
+	T_daterange        Oid = 3912
+	T__daterange       Oid = 3913
+	T_int8range        Oid = 3926
+	T__int8range       Oid = 3927
+)
diff --git a/Godeps/_workspace/src/github.com/lib/pq/ssl_test.go b/Godeps/_workspace/src/github.com/lib/pq/ssl_test.go
new file mode 100644
index 00000000..8efabe4c
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/lib/pq/ssl_test.go
@@ -0,0 +1,244 @@
+package pq
+
+// This file contains SSL tests
+
+import (
+	_ "crypto/sha256"
+	"crypto/x509"
+	"database/sql"
+	"fmt"
+	"os"
+	"path/filepath"
+	"testing"
+)
+
+func shouldSkipSSLTests(t *testing.T) bool {
+	// Require some special variables for testing certificates
+	if os.Getenv("PQSSLCERTTEST_PATH") == "" {
+		return true
+	}
+
+	value := os.Getenv("PQGOSSLTESTS")
+	if value == "" || value == "0" {
+		return true
+	} else if value == "1" {
+		return false
+	} else {
+		t.Fatalf("unexpected value %q for PQGOSSLTESTS", value)
+	}
+	panic("not reached")
+}
+
+func openSSLConn(t *testing.T, conninfo string) (*sql.DB, error) {
+	db, err := openTestConnConninfo(conninfo)
+	if err != nil {
+		// should never fail
+		t.Fatal(err)
+	}
+	// Do something with the connection to see whether it's working or not.
+	tx, err := db.Begin()
+	if err == nil {
+		return db, tx.Rollback()
+	}
+	_ = db.Close()
+	return nil, err
+}
+
+func checkSSLSetup(t *testing.T, conninfo string) {
+	db, err := openSSLConn(t, conninfo)
+	if err == nil {
+		db.Close()
+		t.Fatal("expected error with conninfo=%q", conninfo)
+	}
+}
+
+// Connect over SSL and run a simple query to test the basics
+func TestSSLConnection(t *testing.T) {
+	if shouldSkipSSLTests(t) {
+		t.Log("skipping SSL test")
+		return
+	}
+	// Environment sanity check: should fail without SSL
+	checkSSLSetup(t, "sslmode=disable user=pqgossltest")
+
+	db, err := openSSLConn(t, "sslmode=require user=pqgossltest")
+	if err != nil {
+		t.Fatal(err)
+	}
+	rows, err := db.Query("SELECT 1")
+	if err != nil {
+		t.Fatal(err)
+	}
+	rows.Close()
+}
+
+// Test sslmode=verify-full
+func TestSSLVerifyFull(t *testing.T) {
+	if shouldSkipSSLTests(t) {
+		t.Log("skipping SSL test")
+		return
+	}
+	// Environment sanity check: should fail without SSL
+	checkSSLSetup(t, "sslmode=disable user=pqgossltest")
+
+	// Not OK according to the system CA
+	_, err := openSSLConn(t, "host=postgres sslmode=verify-full user=pqgossltest")
+	if err == nil {
+		t.Fatal("expected error")
+	}
+	_, ok := err.(x509.UnknownAuthorityError)
+	if !ok {
+		t.Fatalf("expected x509.UnknownAuthorityError, got %#+v", err)
+	}
+
+	rootCertPath := filepath.Join(os.Getenv("PQSSLCERTTEST_PATH"), "root.crt")
+	rootCert := "sslrootcert=" + rootCertPath + " "
+	// No match on Common Name
+	_, err = openSSLConn(t, rootCert+"host=127.0.0.1 sslmode=verify-full user=pqgossltest")
+	if err == nil {
+		t.Fatal("expected error")
+	}
+	_, ok = err.(x509.HostnameError)
+	if !ok {
+		t.Fatalf("expected x509.HostnameError, got %#+v", err)
+	}
+	// OK
+	_, err = openSSLConn(t, rootCert+"host=postgres sslmode=verify-full user=pqgossltest")
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+// Test sslmode=verify-ca
+func TestSSLVerifyCA(t *testing.T) {
+	if shouldSkipSSLTests(t) {
+		t.Log("skipping SSL test")
+		return
+	}
+	// Environment sanity check: should fail without SSL
+	checkSSLSetup(t, "sslmode=disable user=pqgossltest")
+
+	// Not OK according to the system CA
+	_, err := openSSLConn(t, "host=postgres sslmode=verify-ca user=pqgossltest")
+	if err == nil {
+		t.Fatal("expected error")
+	}
+	_, ok := err.(x509.UnknownAuthorityError)
+	if !ok {
+		t.Fatalf("expected x509.UnknownAuthorityError, got %#+v", err)
+	}
+
+	rootCertPath := filepath.Join(os.Getenv("PQSSLCERTTEST_PATH"), "root.crt")
+	rootCert := "sslrootcert=" + rootCertPath + " "
+	// No match on Common Name, but that's OK
+	_, err = openSSLConn(t, rootCert+"host=127.0.0.1 sslmode=verify-ca user=pqgossltest")
+	if err != nil {
+		t.Fatal(err)
+	}
+	// Everything OK
+	_, err = openSSLConn(t, rootCert+"host=postgres sslmode=verify-ca user=pqgossltest")
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+func getCertConninfo(t *testing.T, source string) string {
+	var sslkey string
+	var sslcert string
+
+	certpath := os.Getenv("PQSSLCERTTEST_PATH")
+
+	switch source {
+	case "missingkey":
+		sslkey = "/tmp/filedoesnotexist"
+		sslcert = filepath.Join(certpath, "postgresql.crt")
+	case "missingcert":
+		sslkey = filepath.Join(certpath, "postgresql.key")
+		sslcert = "/tmp/filedoesnotexist"
+	case "certtwice":
+		sslkey = filepath.Join(certpath, "postgresql.crt")
+		sslcert = filepath.Join(certpath, "postgresql.crt")
+	case "valid":
+		sslkey = filepath.Join(certpath, "postgresql.key")
+		sslcert = filepath.Join(certpath, "postgresql.crt")
+	default:
+		t.Fatalf("invalid source %q", source)
+	}
+	return fmt.Sprintf("sslmode=require user=pqgosslcert sslkey=%s sslcert=%s", sslkey, sslcert)
+}
+
+// Authenticate over SSL using client certificates
+func TestSSLClientCertificates(t *testing.T) {
+	if shouldSkipSSLTests(t) {
+		t.Log("skipping SSL test")
+		return
+	}
+	// Environment sanity check: should fail without SSL
+	checkSSLSetup(t, "sslmode=disable user=pqgossltest")
+
+	// Should also fail without a valid certificate
+	db, err := openSSLConn(t, "sslmode=require user=pqgosslcert")
+	if err == nil {
+		db.Close()
+		t.Fatal("expected error")
+	}
+	pge, ok := err.(*Error)
+	if !ok {
+		t.Fatal("expected pq.Error")
+	}
+	if pge.Code.Name() != "invalid_authorization_specification" {
+		t.Fatalf("unexpected error code %q", pge.Code.Name())
+	}
+
+	// Should work
+	db, err = openSSLConn(t, getCertConninfo(t, "valid"))
+	if err != nil {
+		t.Fatal(err)
+	}
+	rows, err := db.Query("SELECT 1")
+	if err != nil {
+		t.Fatal(err)
+	}
+	rows.Close()
+}
+
+// Test errors with ssl certificates
+func TestSSLClientCertificatesMissingFiles(t *testing.T) {
+	if shouldSkipSSLTests(t) {
+		t.Log("skipping SSL test")
+		return
+	}
+	// Environment sanity check: should fail without SSL
+	checkSSLSetup(t, "sslmode=disable user=pqgossltest")
+
+	// Key missing, should fail
+	_, err := openSSLConn(t, getCertConninfo(t, "missingkey"))
+	if err == nil {
+		t.Fatal("expected error")
+	}
+	// should be a PathError
+	_, ok := err.(*os.PathError)
+	if !ok {
+		t.Fatalf("expected PathError, got %#+v", err)
+	}
+
+	// Cert missing, should fail
+	_, err = openSSLConn(t, getCertConninfo(t, "missingcert"))
+	if err == nil {
+		t.Fatal("expected error")
+	}
+	// should be a PathError
+	_, ok = err.(*os.PathError)
+	if !ok {
+		t.Fatalf("expected PathError, got %#+v", err)
+	}
+
+	// Key has wrong permissions, should fail
+	_, err = openSSLConn(t, getCertConninfo(t, "certtwice"))
+	if err == nil {
+		t.Fatal("expected error")
+	}
+	if err != ErrSSLKeyHasWorldPermissions {
+		t.Fatalf("expected ErrSSLKeyHasWorldPermissions, got %#+v", err)
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/lib/pq/url.go b/Godeps/_workspace/src/github.com/lib/pq/url.go
new file mode 100644
index 00000000..b83e806b
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/lib/pq/url.go
@@ -0,0 +1,76 @@
+package pq
+
+import (
+	"fmt"
+	nurl "net/url"
+	"sort"
+	"strings"
+)
+
+// ParseURL no longer needs to be used by clients of this library since supplying a URL as a
+// connection string to sql.Open() is now supported:
+//
+//	sql.Open("postgres", "postgres://bob:secret@1.2.3.4:5432/mydb?sslmode=verify-full")
+//
+// It remains exported here for backwards-compatibility.
+//
+// ParseURL converts a url to a connection string for driver.Open.
+// Example:
+//
+//	"postgres://bob:secret@1.2.3.4:5432/mydb?sslmode=verify-full"
+//
+// converts to:
+//
+//	"user=bob password=secret host=1.2.3.4 port=5432 dbname=mydb sslmode=verify-full"
+//
+// A minimal example:
+//
+//	"postgres://"
+//
+// This will be blank, causing driver.Open to use all of the defaults
+func ParseURL(url string) (string, error) {
+	u, err := nurl.Parse(url)
+	if err != nil {
+		return "", err
+	}
+
+	if u.Scheme != "postgres" {
+		return "", fmt.Errorf("invalid connection protocol: %s", u.Scheme)
+	}
+
+	var kvs []string
+	escaper := strings.NewReplacer(` `, `\ `, `'`, `\'`, `\`, `\\`)
+	accrue := func(k, v string) {
+		if v != "" {
+			kvs = append(kvs, k+"="+escaper.Replace(v))
+		}
+	}
+
+	if u.User != nil {
+		v := u.User.Username()
+		accrue("user", v)
+
+		v, _ = u.User.Password()
+		accrue("password", v)
+	}
+
+	i := strings.Index(u.Host, ":")
+	if i < 0 {
+		accrue("host", u.Host)
+	} else {
+		accrue("host", u.Host[:i])
+		accrue("port", u.Host[i+1:])
+	}
+
+	if u.Path != "" {
+		accrue("dbname", u.Path[1:])
+	}
+
+	q := u.Query()
+	for k := range q {
+		accrue(k, q.Get(k))
+	}
+
+	sort.Strings(kvs) // Makes testing easier (not a performance concern)
+	return strings.Join(kvs, " "), nil
+}
diff --git a/Godeps/_workspace/src/github.com/lib/pq/url_test.go b/Godeps/_workspace/src/github.com/lib/pq/url_test.go
new file mode 100644
index 00000000..29f4a7c7
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/lib/pq/url_test.go
@@ -0,0 +1,54 @@
+package pq
+
+import (
+	"testing"
+)
+
+func TestSimpleParseURL(t *testing.T) {
+	expected := "host=hostname.remote"
+	str, err := ParseURL("postgres://hostname.remote")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if str != expected {
+		t.Fatalf("unexpected result from ParseURL:\n+ %v\n- %v", str, expected)
+	}
+}
+
+func TestFullParseURL(t *testing.T) {
+	expected := `dbname=database host=hostname.remote password=top\ secret port=1234 user=username`
+	str, err := ParseURL("postgres://username:top%20secret@hostname.remote:1234/database")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if str != expected {
+		t.Fatalf("unexpected result from ParseURL:\n+ %s\n- %s", str, expected)
+	}
+}
+
+func TestInvalidProtocolParseURL(t *testing.T) {
+	_, err := ParseURL("http://hostname.remote")
+	switch err {
+	case nil:
+		t.Fatal("Expected an error from parsing invalid protocol")
+	default:
+		msg := "invalid connection protocol: http"
+		if err.Error() != msg {
+			t.Fatalf("Unexpected error message:\n+ %s\n- %s",
+				err.Error(), msg)
+		}
+	}
+}
+
+func TestMinimalURL(t *testing.T) {
+	cs, err := ParseURL("postgres://")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if cs != "" {
+		t.Fatalf("expected blank connection string, got: %q", cs)
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/lib/pq/user_posix.go b/Godeps/_workspace/src/github.com/lib/pq/user_posix.go
new file mode 100644
index 00000000..aa5a3da3
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/lib/pq/user_posix.go
@@ -0,0 +1,15 @@
+// Package pq is a pure Go Postgres driver for the database/sql package.
+
+// +build darwin freebsd linux nacl netbsd openbsd solaris
+
+package pq
+
+import "os/user"
+
+func userCurrent() (string, error) {
+	u, err := user.Current()
+	if err != nil {
+		return "", err
+	}
+	return u.Username, nil
+}
diff --git a/Godeps/_workspace/src/github.com/lib/pq/user_windows.go b/Godeps/_workspace/src/github.com/lib/pq/user_windows.go
new file mode 100644
index 00000000..a7593ffb
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/lib/pq/user_windows.go
@@ -0,0 +1,27 @@
+// Package pq is a pure Go Postgres driver for the database/sql package.
+package pq
+
+import (
+	"path/filepath"
+	"syscall"
+)
+
+// Perform Windows user name lookup identically to libpq.
+//
+// The PostgreSQL code makes use of the legacy Win32 function
+// GetUserName, and that function has not been imported into stock Go.
+// GetUserNameEx is available though, the difference being that a
+// wider range of names are available.  To get the output to be the
+// same as GetUserName, only the base (or last) component of the
+// result is returned.
+func userCurrent() (string, error) {
+	pw_name := make([]uint16, 128)
+	pwname_size := uint32(len(pw_name)) - 1
+	err := syscall.GetUserNameEx(syscall.NameSamCompatible, &pw_name[0], &pwname_size)
+	if err != nil {
+		return "", err
+	}
+	s := syscall.UTF16ToString(pw_name)
+	u := filepath.Base(s)
+	return u, nil
+}
diff --git a/Godeps/_workspace/src/github.com/mailgun/mailgun-go/.travis.yml b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/.travis.yml
new file mode 100644
index 00000000..baf33419
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/.travis.yml
@@ -0,0 +1,10 @@
+language: go
+go:
+  - 1.1.2
+  - 1.2
+  - tip
+env:
+  - GOARCH=amd64
+  - GOARCH=386
+script:
+  - go test
diff --git a/Godeps/_workspace/src/github.com/mailgun/mailgun-go/LICENSE b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/LICENSE
new file mode 100644
index 00000000..24b24c4e
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2013-2014, Michael Banzon
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice, this
+  list of conditions and the following disclaimer in the documentation and/or
+  other materials provided with the distribution.
+
+* Neither the names of Mailgun, Michael Banzon, nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/mailgun/mailgun-go/README.md b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/README.md
new file mode 100644
index 00000000..0931fbcc
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/README.md
@@ -0,0 +1,20 @@
+Mailgun with Go
+===============
+
+[![Build Status](https://travis-ci.org/mbanzon/mailgun.png?branch=master)](https://travis-ci.org/mbanzon/mailgun)
+[![GoDoc](https://godoc.org/github.com/mailgun/mailgun-go?status.svg)](https://godoc.org/github.com/mailgun/mailgun-go)
+
+Go library for sending mail with the Mailgun API.
+
+
+See these examples on how how to use use the library with various parts of the Mailgun API:
+
+* [Messages](https://gist.github.com/mbanzon/8179682 "mailgun-message-example.go")
+* [E-mail validation](https://gist.github.com/mbanzon/8179989 "mailgun-validation-example.go")
+* [Bounces](https://gist.github.com/mbanzon/8179951 "mailgun-bounces-example.go")
+* [Stats](https://gist.github.com/mbanzon/8206266 "mailgun-stats-example.go")
+* [File Attachment from Memory](https://gist.github.com/sym3tri/8a29ddecd65ec4f8ccfc)
+
+More examples are coming soon.
+
+The code is released under a 3-clause BSD license. See the LICENSE file for more information.
diff --git a/Godeps/_workspace/src/github.com/mailgun/mailgun-go/acceptance/acceptance.go b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/acceptance/acceptance.go
new file mode 100644
index 00000000..13c55067
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/acceptance/acceptance.go
@@ -0,0 +1,29 @@
+// +build acceptance
+
+// The acceptance test package includes utilities supporting acceptance tests in *_test.go
+// files.  To execute these acceptance tests, you must invoke them using the acceptance
+// build tag, like so:
+//
+// $ go test -tags acceptance github.com/mailgun/mailgun-go
+//
+// Note that some API calls may potentially cost the user money!  By default, such tests
+// do NOT run.  However, you will then not be testing the full capability of Mailgun.
+// To run them, you'll also need to specify the spendMoney build tag:
+//
+// $ go test -tags "acceptance spendMoney" github.com/mailgun/mailgun-go
+package acceptance
+
+import (
+	"os"
+	"testing"
+)
+
+// Many tests require configuration settings unique to the user, passed in via
+// environment variables.  If these variables aren't set, we need to fail the test early.
+func reqEnv(t *testing.T, variableName string) string {
+	value := os.Getenv(variableName)
+	if value == "" {
+		t.Fatalf("Expected environment variable %s to be set", variableName)
+	}
+	return value
+}
diff --git a/Godeps/_workspace/src/github.com/mailgun/mailgun-go/acceptance/bounces_test.go b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/acceptance/bounces_test.go
new file mode 100644
index 00000000..15f323aa
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/acceptance/bounces_test.go
@@ -0,0 +1,119 @@
+// +build acceptance
+
+package acceptance
+
+import (
+	"fmt"
+	mailgun "github.com/mailgun/mailgun-go"
+	"testing"
+)
+
+func TestGetBounces(t *testing.T) {
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_API_KEY")
+	mg := mailgun.NewMailgun(domain, apiKey, "")
+	n, bounces, err := mg.GetBounces(-1, -1)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if n > 0 {
+		t.Fatal("Expected no bounces for what should be a clean domain.")
+	}
+	if n != len(bounces) {
+		t.Fatalf("Expected length of bounces %d to equal returned length %d", len(bounces), n)
+	}
+}
+
+func TestGetSingleBounce(t *testing.T) {
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_API_KEY")
+	mg := mailgun.NewMailgun(domain, apiKey, "")
+	exampleEmail := fmt.Sprintf("baz@%s", domain)
+	_, err := mg.GetSingleBounce(exampleEmail)
+	if err == nil {
+		t.Fatal("Did not expect a bounce to exist")
+	}
+	ure, ok := err.(*mailgun.UnexpectedResponseError)
+	if !ok {
+		t.Fatal("Expected UnexpectedResponseError")
+	}
+	if ure.Actual != 404 {
+		t.Fatalf("Expected 404 response code; got %d", ure.Actual)
+	}
+}
+
+func TestAddDelBounces(t *testing.T) {
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_API_KEY")
+	mg := mailgun.NewMailgun(domain, apiKey, "")
+
+	// Compute an e-mail address for our domain.
+
+	exampleEmail := fmt.Sprintf("baz@%s", domain)
+
+	// First, basic sanity check.
+	// Fail early if we have bounces for a fictitious e-mail address.
+
+	n, _, err := mg.GetBounces(-1, -1)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if n > 0 {
+		t.Fatal("Expected no bounces for what should be a clean domain.")
+	}
+
+	bounce, err := mg.GetSingleBounce(exampleEmail)
+	if err == nil {
+		t.Fatalf("Expected no bounces for %s", exampleEmail)
+	}
+
+	// Add the bounce for our address.
+
+	err = mg.AddBounce(exampleEmail, "550", "TestAddDelBounces-generated error")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// We should now have one bounce listed when we query the API.
+
+	n, bounces, err := mg.GetBounces(-1, -1)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if n != 1 {
+		t.Fatal("Expected one bounce for this domain.")
+	}
+	if bounces[0].Address != exampleEmail {
+		t.Fatalf("Expected bounce for address %s; got %s", exampleEmail, bounces[0].Address)
+	}
+
+	bounce, err = mg.GetSingleBounce(exampleEmail)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if bounce.CreatedAt == "" {
+		t.Fatalf("Expected at least one bounce for %s", exampleEmail)
+	}
+
+	// Delete it.  This should put us back the way we were.
+
+	err = mg.DeleteBounce(exampleEmail)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Make sure we're back to the way we were.
+
+	n, _, err = mg.GetBounces(-1, -1)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if n > 0 {
+		t.Fatal("Expected no bounces for what should be a clean domain.")
+	}
+
+	_, err = mg.GetSingleBounce(exampleEmail)
+	if err == nil {
+		t.Fatalf("Expected no bounces for %s", exampleEmail)
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/mailgun/mailgun-go/acceptance/credentials_test.go b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/acceptance/credentials_test.go
new file mode 100644
index 00000000..5b90484a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/acceptance/credentials_test.go
@@ -0,0 +1,53 @@
+// +build acceptance
+
+package acceptance
+
+import (
+	"fmt"
+	mailgun "github.com/mailgun/mailgun-go"
+	"os"
+	"testing"
+	"text/tabwriter"
+)
+
+func TestGetCredentials(t *testing.T) {
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_API_KEY")
+	mg := mailgun.NewMailgun(domain, apiKey, "")
+	n, cs, err := mg.GetCredentials(mailgun.DefaultLimit, mailgun.DefaultSkip)
+	if err != nil {
+		t.Fatal(err)
+	}
+	tw := &tabwriter.Writer{}
+	tw.Init(os.Stdout, 2, 8, 2, ' ', 0)
+	fmt.Fprintf(tw, "Login\tCreated At\t\n")
+	for _, c := range cs {
+		fmt.Fprintf(tw, "%s\t%s\t\n", c.Login, c.CreatedAt)
+	}
+	tw.Flush()
+	fmt.Printf("%d credentials listed out of %d\n", len(cs), n)
+}
+
+func TestCreateDeleteCredentials(t *testing.T) {
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_API_KEY")
+	mg := mailgun.NewMailgun(domain, apiKey, "")
+	randomPassword := randomString(16, "pw")
+	randomID := randomString(16, "usr")
+	randomLogin := fmt.Sprintf("%s@%s", randomID, domain)
+
+	err := mg.CreateCredential(randomLogin, randomPassword)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = mg.ChangeCredentialPassword(randomID, randomString(16, "pw2"))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = mg.DeleteCredential(randomID)
+	if err != nil {
+		t.Fatal(err)
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/mailgun/mailgun-go/acceptance/domains_test.go b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/acceptance/domains_test.go
new file mode 100644
index 00000000..323dc8ab
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/acceptance/domains_test.go
@@ -0,0 +1,96 @@
+// +build acceptance
+
+package acceptance
+
+import (
+	"crypto/rand"
+	"fmt"
+	"github.com/mailgun/mailgun-go"
+	"testing"
+)
+
+func TestGetDomains(t *testing.T) {
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_API_KEY")
+	mg := mailgun.NewMailgun(domain, apiKey, "")
+	n, domains, err := mg.GetDomains(mailgun.DefaultLimit, mailgun.DefaultSkip)
+	if err != nil {
+		t.Fatal(err)
+	}
+	fmt.Printf("TestGetDomains: %d domains retrieved\n", n)
+	for _, d := range domains {
+		fmt.Printf("TestGetDomains: %#v\n", d)
+	}
+}
+
+func TestGetSingleDomain(t *testing.T) {
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_API_KEY")
+	mg := mailgun.NewMailgun(domain, apiKey, "")
+	_, domains, err := mg.GetDomains(mailgun.DefaultLimit, mailgun.DefaultSkip)
+	if err != nil {
+		t.Fatal(err)
+	}
+	dr, rxDnsRecords, txDnsRecords, err := mg.GetSingleDomain(domains[0].Name)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	fmt.Printf("TestGetSingleDomain: %#v\n", dr)
+	for _, rxd := range rxDnsRecords {
+		fmt.Printf("TestGetSingleDomains:   %#v\n", rxd)
+	}
+	for _, txd := range txDnsRecords {
+		fmt.Printf("TestGetSingleDomains:   %#v\n", txd)
+	}
+}
+
+func TestGetSingleDomainNotExist(t *testing.T) {
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_API_KEY")
+	mg := mailgun.NewMailgun(domain, apiKey, "")
+	_, _, _, err := mg.GetSingleDomain(randomString(32, "com.edu.org.") + ".com")
+	if err == nil {
+		t.Fatal("Did not expect a domain to exist")
+	}
+	ure, ok := err.(*mailgun.UnexpectedResponseError)
+	if !ok {
+		t.Fatal("Expected UnexpectedResponseError")
+	}
+	if ure.Actual != 404 {
+		t.Fatalf("Expected 404 response code; got %d", ure.Actual)
+	}
+}
+
+func TestAddDeleteDomain(t *testing.T) {
+	// First, we need to add the domain.
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_API_KEY")
+	mg := mailgun.NewMailgun(domain, apiKey, "")
+	randomDomainName := randomString(16, "DOMAIN") + ".example.com"
+	randomPassword := randomString(16, "PASSWD")
+	err := mg.CreateDomain(randomDomainName, randomPassword, mailgun.Tag, false)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Next, we delete it.
+	err = mg.DeleteDomain(randomDomainName)
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+// randomString generates a string of given length, but random content.
+// All content will be within the ASCII graphic character set.
+// (Implementation from Even Shaw's contribution on
+// http://stackoverflow.com/questions/12771930/what-is-the-fastest-way-to-generate-a-long-random-string-in-go).
+func randomString(n int, prefix string) string {
+	const alphanum = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
+	var bytes = make([]byte, n)
+	rand.Read(bytes)
+	for i, b := range bytes {
+		bytes[i] = alphanum[b%byte(len(alphanum))]
+	}
+	return prefix + string(bytes)
+}
diff --git a/Godeps/_workspace/src/github.com/mailgun/mailgun-go/acceptance/email_validation_test.go b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/acceptance/email_validation_test.go
new file mode 100644
index 00000000..76fc2770
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/acceptance/email_validation_test.go
@@ -0,0 +1,52 @@
+// +build acceptance
+
+package acceptance
+
+import (
+	"github.com/mailgun/mailgun-go"
+	"testing"
+)
+
+func TestEmailValidation(t *testing.T) {
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_PUBLIC_API_KEY")
+	mg := mailgun.NewMailgun(domain, "", apiKey)
+	ev, err := mg.ValidateEmail("foo@mailgun.com")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if ev.IsValid != true {
+		t.Fatal("Expected a valid e-mail address")
+	}
+	if ev.Parts.DisplayName != "" {
+		t.Fatal("No display name should exist")
+	}
+	if ev.Parts.LocalPart != "foo" {
+		t.Fatal("Expected local part of foo; got ", ev.Parts.LocalPart)
+	}
+	if ev.Parts.Domain != "mailgun.com" {
+		t.Fatal("Expected mailgun.com domain; got ", ev.Parts.Domain)
+	}
+}
+
+func TestParseAddresses(t *testing.T) {
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_PUBLIC_API_KEY")
+	mg := mailgun.NewMailgun(domain, "", apiKey)
+	addressesThatParsed, unparsableAddresses, err := mg.ParseAddresses("Alice <alice@example.com>", "bob@example.com", "example.com")
+	if err != nil {
+		t.Fatal(err)
+	}
+	hittest := map[string]bool{
+		"Alice <alice@example.com>": true,
+		"bob@example.com":           true,
+	}
+	for _, a := range addressesThatParsed {
+		if !hittest[a] {
+			t.Fatalf("Expected %s to be parsable", a)
+		}
+	}
+	if len(unparsableAddresses) != 1 {
+		t.Fatalf("Expected 1 address to be unparsable; got %d", len(unparsableAddresses))
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/mailgun/mailgun-go/acceptance/events_test.go b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/acceptance/events_test.go
new file mode 100644
index 00000000..7f756aff
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/acceptance/events_test.go
@@ -0,0 +1,41 @@
+// +build acceptance
+
+package acceptance
+
+import (
+	"fmt"
+	"github.com/mailgun/mailgun-go"
+	"os"
+	"testing"
+	"text/tabwriter"
+)
+
+func TestEventIterator(t *testing.T) {
+	// Grab the list of events (as many as we can get)
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_API_KEY")
+	mg := mailgun.NewMailgun(domain, apiKey, "")
+	ei := mg.NewEventIterator()
+	err := ei.GetFirstPage(mailgun.GetEventsOptions{})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Print out the kind of event and timestamp.
+	// Specifics about each event will depend on the "event" type.
+	events := ei.Events()
+	tw := &tabwriter.Writer{}
+	tw.Init(os.Stdout, 2, 8, 2, ' ', tabwriter.AlignRight)
+	fmt.Fprintln(tw, "Event\tTimestamp\t")
+	for _, event := range events {
+		fmt.Fprintf(tw, "%s\t%v\t\n", event["event"], event["timestamp"])
+	}
+	tw.Flush()
+	fmt.Printf("%d events dumped\n\n", len(events))
+
+	// We're on the first page.  We must at the beginning.
+	ei.GetPrevious()
+	if len(ei.Events()) != 0 {
+		t.Fatal("Expected to be at the beginning")
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/mailgun/mailgun-go/acceptance/mailing_lists_test.go b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/acceptance/mailing_lists_test.go
new file mode 100644
index 00000000..69286bb4
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/acceptance/mailing_lists_test.go
@@ -0,0 +1,205 @@
+// +build acceptance,spendMoney
+
+package acceptance
+
+import (
+	"fmt"
+	mailgun "github.com/mailgun/mailgun-go"
+	"testing"
+)
+
+func setup(t *testing.T) (mailgun.Mailgun, string) {
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_API_KEY")
+	mg := mailgun.NewMailgun(domain, apiKey, "")
+
+	address := fmt.Sprintf("list5@%s", domain)
+	_, err := mg.CreateList(mailgun.List{
+		Address:     address,
+		Name:        address,
+		Description: "TestMailingListMembers-related mailing list",
+		AccessLevel: mailgun.Members,
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	return mg, address
+}
+
+func teardown(t *testing.T, mg mailgun.Mailgun, address string) {
+	err := mg.DeleteList(address)
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestMailingListMembers(t *testing.T) {
+	mg, address := setup(t)
+	defer teardown(t, mg, address)
+
+	var countPeople = func() int {
+		n, _, err := mg.GetMembers(mailgun.DefaultLimit, mailgun.DefaultSkip, mailgun.All, address)
+		if err != nil {
+			t.Fatal(err)
+		}
+		return n
+	}
+
+	startCount := countPeople()
+	protoJoe := mailgun.Member{
+		Address:    "joe@example.com",
+		Name:       "Joe Example",
+		Subscribed: mailgun.Subscribed,
+	}
+	err := mg.CreateMember(true, address, protoJoe)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	newCount := countPeople()
+	if newCount <= startCount {
+		t.Fatalf("Expected %d people subscribed; got %d", startCount+1, newCount)
+	}
+
+	theMember, err := mg.GetMemberByAddress("joe@example.com", address)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if (theMember.Address != protoJoe.Address) ||
+		(theMember.Name != protoJoe.Name) ||
+		(*theMember.Subscribed != *protoJoe.Subscribed) ||
+		(len(theMember.Vars) != 0) {
+		t.Fatalf("Unexpected Member: Expected [%#v], Got [%#v]", protoJoe, theMember)
+	}
+
+	_, err = mg.UpdateMember("joe@example.com", address, mailgun.Member{
+		Name: "Joe Cool",
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	theMember, err = mg.GetMemberByAddress("joe@example.com", address)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if theMember.Name != "Joe Cool" {
+		t.Fatal("Expected Joe Cool; got " + theMember.Name)
+	}
+
+	err = mg.DeleteMember("joe@example.com", address)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if countPeople() != startCount {
+		t.Fatalf("Expected %d people; got %d instead", startCount, countPeople())
+	}
+
+	err = mg.CreateMemberList(nil, address, []interface{}{
+		mailgun.Member{
+			Address:    "joe.user1@example.com",
+			Name:       "Joe's debugging account",
+			Subscribed: mailgun.Unsubscribed,
+		},
+		mailgun.Member{
+			Address:    "Joe Cool <joe.user2@example.com>",
+			Name:       "Joe's Cool Account",
+			Subscribed: mailgun.Subscribed,
+		},
+		mailgun.Member{
+			Address: "joe.user3@example.com",
+			Vars: map[string]interface{}{
+				"packet-email": "KW9ABC @ BOGBBS-4.#NCA.CA.USA.NOAM",
+			},
+		},
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	theMember, err = mg.GetMemberByAddress("joe.user2@example.com", address)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if theMember.Name != "Joe's Cool Account" {
+		t.Fatalf("Expected Joe's Cool Account; got %s", theMember.Name)
+	}
+	if theMember.Subscribed != nil {
+		if *theMember.Subscribed != true {
+			t.Fatalf("Expected subscribed to be true; got %v", *theMember.Subscribed)
+		}
+	} else {
+		t.Fatal("Expected some kind of subscription status; got nil.")
+	}
+}
+
+func TestMailingLists(t *testing.T) {
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_API_KEY")
+	mg := mailgun.NewMailgun(domain, apiKey, "")
+	listAddr := fmt.Sprintf("list2@%s", domain)
+	protoList := mailgun.List{
+		Address:     listAddr,
+		Name:        "List1",
+		Description: "A list created by an acceptance test.",
+		AccessLevel: mailgun.Members,
+	}
+
+	var countLists = func() int {
+		total, _, err := mg.GetLists(mailgun.DefaultLimit, mailgun.DefaultSkip, "")
+		if err != nil {
+			t.Fatal(err)
+		}
+		return total
+	}
+
+	startCount := countLists()
+
+	_, err := mg.CreateList(protoList)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer func() {
+		err = mg.DeleteList(listAddr)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		newCount := countLists()
+		if newCount != startCount {
+			t.Fatalf("Expected %d lists defined; got %d", startCount, newCount)
+		}
+	}()
+
+	newCount := countLists()
+	if newCount <= startCount {
+		t.Fatalf("Expected %d lists defined; got %d", startCount+1, newCount)
+	}
+
+	theList, err := mg.GetListByAddress(listAddr)
+	if err != nil {
+		t.Fatal(err)
+	}
+	protoList.CreatedAt = theList.CreatedAt // ignore this field when comparing.
+	if theList != protoList {
+		t.Fatalf("Unexpected list descriptor: Expected [%#v], Got [%#v]", protoList, theList)
+	}
+
+	_, err = mg.UpdateList(listAddr, mailgun.List{
+		Description: "A list whose description changed",
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	theList, err = mg.GetListByAddress(listAddr)
+	if err != nil {
+		t.Fatal(err)
+	}
+	newList := protoList
+	newList.Description = "A list whose description changed"
+	if theList != newList {
+		t.Fatalf("Expected [%#v], Got [%#v]", newList, theList)
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/mailgun/mailgun-go/acceptance/messages_test.go b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/acceptance/messages_test.go
new file mode 100644
index 00000000..d03e779f
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/acceptance/messages_test.go
@@ -0,0 +1,329 @@
+// +build acceptance,spendMoney
+
+package acceptance
+
+import (
+	"fmt"
+	mailgun "github.com/mailgun/mailgun-go"
+	"io/ioutil"
+	"strings"
+	"testing"
+	"time"
+)
+
+const (
+	fromUser       = "=?utf-8?q?Katie_Brewer=2C_CFP=C2=AE?= <joe@example.com>"
+	exampleSubject = "Joe's Example Subject"
+	exampleText    = "Testing some Mailgun awesomeness!"
+	exampleHtml    = "<html><head /><body><p>Testing some <a href=\"http://google.com?q=abc&r=def&s=ghi\">Mailgun HTML awesomeness!</a> at www.kc5tja@yahoo.com</p></body></html>"
+
+	exampleMime = `Content-Type: text/plain; charset="ascii"
+Subject: Joe's Example Subject
+From: Joe Example <joe@example.com>
+To: BARGLEGARF <sam.falvo@rackspace.com>
+Content-Transfer-Encoding: 7bit
+Date: Thu, 6 Mar 2014 00:37:52 +0000
+
+Testing some Mailgun MIME awesomeness!
+`
+	templateText = "Greetings %recipient.name%!  Your reserved seat is at table %recipient.table%."
+)
+
+func TestSendLegacyPlain(t *testing.T) {
+	toUser := reqEnv(t, "MG_EMAIL_TO")
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_API_KEY")
+	publicApiKey := reqEnv(t, "MG_PUBLIC_API_KEY")
+	mg := mailgun.NewMailgun(domain, apiKey, publicApiKey)
+	m := mailgun.NewMessage(fromUser, exampleSubject, exampleText, toUser)
+	msg, id, err := mg.Send(m)
+	if err != nil {
+		t.Fatal(err)
+	}
+	fmt.Println("TestSendPlain:MSG(" + msg + "),ID(" + id + ")")
+}
+
+func TestSendLegacyPlainWithTracking(t *testing.T) {
+	toUser := reqEnv(t, "MG_EMAIL_TO")
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_API_KEY")
+	publicApiKey := reqEnv(t, "MG_PUBLIC_API_KEY")
+	mg := mailgun.NewMailgun(domain, apiKey, publicApiKey)
+	m := mailgun.NewMessage(fromUser, exampleSubject, exampleText, toUser)
+	m.SetTracking(true)
+	msg, id, err := mg.Send(m)
+	if err != nil {
+		t.Fatal(err)
+	}
+	fmt.Println("TestSendPlainWithTracking:MSG(" + msg + "),ID(" + id + ")")
+}
+
+func TestSendLegacyPlainAt(t *testing.T) {
+	toUser := reqEnv(t, "MG_EMAIL_TO")
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_API_KEY")
+	publicApiKey := reqEnv(t, "MG_PUBLIC_API_KEY")
+	mg := mailgun.NewMailgun(domain, apiKey, publicApiKey)
+	m := mailgun.NewMessage(fromUser, exampleSubject, exampleText, toUser)
+	m.SetDeliveryTime(time.Now().Add(5 * time.Minute))
+	msg, id, err := mg.Send(m)
+	if err != nil {
+		t.Fatal(err)
+	}
+	fmt.Println("TestSendPlainAt:MSG(" + msg + "),ID(" + id + ")")
+}
+
+func TestSendLegacyHtml(t *testing.T) {
+	toUser := reqEnv(t, "MG_EMAIL_TO")
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_API_KEY")
+	publicApiKey := reqEnv(t, "MG_PUBLIC_API_KEY")
+	mg := mailgun.NewMailgun(domain, apiKey, publicApiKey)
+	m := mailgun.NewMessage(fromUser, exampleSubject, exampleText, toUser)
+	m.SetHtml(exampleHtml)
+	msg, id, err := mg.Send(m)
+	if err != nil {
+		t.Fatal(err)
+	}
+	fmt.Println("TestSendHtml:MSG(" + msg + "),ID(" + id + ")")
+}
+
+func TestSendLegacyTracking(t *testing.T) {
+	toUser := reqEnv(t, "MG_EMAIL_TO")
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_API_KEY")
+	publicApiKey := reqEnv(t, "MG_PUBLIC_API_KEY")
+	mg := mailgun.NewMailgun(domain, apiKey, publicApiKey)
+	m := mailgun.NewMessage(fromUser, exampleSubject, exampleText+"Tracking!\n", toUser)
+	m.SetTracking(false)
+	msg, id, err := mg.Send(m)
+	if err != nil {
+		t.Fatal(err)
+	}
+	fmt.Println("TestSendTracking:MSG(" + msg + "),ID(" + id + ")")
+}
+
+func TestSendLegacyTag(t *testing.T) {
+	toUser := reqEnv(t, "MG_EMAIL_TO")
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_API_KEY")
+	publicApiKey := reqEnv(t, "MG_PUBLIC_API_KEY")
+	mg := mailgun.NewMailgun(domain, apiKey, publicApiKey)
+	m := mailgun.NewMessage(fromUser, exampleSubject, exampleText+"Tags Galore!\n", toUser)
+	m.AddTag("FooTag")
+	m.AddTag("BarTag")
+	m.AddTag("BlortTag")
+	msg, id, err := mg.Send(m)
+	if err != nil {
+		t.Fatal(err)
+	}
+	fmt.Println("TestSendTag:MSG(" + msg + "),ID(" + id + ")")
+}
+
+func TestSendLegacyMIME(t *testing.T) {
+	toUser := reqEnv(t, "MG_EMAIL_TO")
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_API_KEY")
+	mg := mailgun.NewMailgun(domain, apiKey, "")
+	m := mailgun.NewMIMEMessage(ioutil.NopCloser(strings.NewReader(exampleMime)), toUser)
+	msg, id, err := mg.Send(m)
+	if err != nil {
+		t.Fatal(err)
+	}
+	fmt.Println("TestSendMIME:MSG(" + msg + "),ID(" + id + ")")
+}
+
+func TestGetStoredMessage(t *testing.T) {
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_API_KEY")
+	mg := mailgun.NewMailgun(domain, apiKey, "")
+	id, err := findStoredMessageID(mg) // somehow...
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// First, get our stored message.
+	msg, err := mg.GetStoredMessage(id)
+	if err != nil {
+		t.Fatal(err)
+	}
+	fields := map[string]string{
+		"       From": msg.From,
+		"     Sender": msg.Sender,
+		"    Subject": msg.Subject,
+		"Attachments": fmt.Sprintf("%d", len(msg.Attachments)),
+		"    Headers": fmt.Sprintf("%d", len(msg.MessageHeaders)),
+	}
+	for k, v := range fields {
+		fmt.Printf("%13s: %s\n", k, v)
+	}
+
+	// We're done with it; now delete it.
+	err = mg.DeleteStoredMessage(id)
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+// Tries to locate the first stored event type, returning the associated stored message key.
+func findStoredMessageID(mg mailgun.Mailgun) (string, error) {
+	ei := mg.NewEventIterator()
+	err := ei.GetFirstPage(mailgun.GetEventsOptions{})
+	for {
+		if err != nil {
+			return "", err
+		}
+		if len(ei.Events()) == 0 {
+			break
+		}
+		for _, event := range ei.Events() {
+			if event["event"] == "stored" {
+				s := event["storage"].(map[string]interface{})
+				k := s["key"]
+				return k.(string), nil
+			}
+		}
+		err = ei.GetNext()
+	}
+	return "", fmt.Errorf("No stored messages found.  Try changing MG_EMAIL_TO to an address that stores messages and try again.")
+}
+
+func TestSendMGPlain(t *testing.T) {
+	toUser := reqEnv(t, "MG_EMAIL_TO")
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_API_KEY")
+	publicApiKey := reqEnv(t, "MG_PUBLIC_API_KEY")
+	mg := mailgun.NewMailgun(domain, apiKey, publicApiKey)
+	m := mg.NewMessage(fromUser, exampleSubject, exampleText, toUser)
+	msg, id, err := mg.Send(m)
+	if err != nil {
+		t.Fatal(err)
+	}
+	fmt.Println("TestSendPlain:MSG(" + msg + "),ID(" + id + ")")
+}
+
+func TestSendMGPlainWithTracking(t *testing.T) {
+	toUser := reqEnv(t, "MG_EMAIL_TO")
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_API_KEY")
+	publicApiKey := reqEnv(t, "MG_PUBLIC_API_KEY")
+	mg := mailgun.NewMailgun(domain, apiKey, publicApiKey)
+	m := mg.NewMessage(fromUser, exampleSubject, exampleText, toUser)
+	m.SetTracking(true)
+	msg, id, err := mg.Send(m)
+	if err != nil {
+		t.Fatal(err)
+	}
+	fmt.Println("TestSendPlainWithTracking:MSG(" + msg + "),ID(" + id + ")")
+}
+
+func TestSendMGPlainAt(t *testing.T) {
+	toUser := reqEnv(t, "MG_EMAIL_TO")
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_API_KEY")
+	publicApiKey := reqEnv(t, "MG_PUBLIC_API_KEY")
+	mg := mailgun.NewMailgun(domain, apiKey, publicApiKey)
+	m := mg.NewMessage(fromUser, exampleSubject, exampleText, toUser)
+	m.SetDeliveryTime(time.Now().Add(5 * time.Minute))
+	msg, id, err := mg.Send(m)
+	if err != nil {
+		t.Fatal(err)
+	}
+	fmt.Println("TestSendPlainAt:MSG(" + msg + "),ID(" + id + ")")
+}
+
+func TestSendMGHtml(t *testing.T) {
+	toUser := reqEnv(t, "MG_EMAIL_TO")
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_API_KEY")
+	publicApiKey := reqEnv(t, "MG_PUBLIC_API_KEY")
+	mg := mailgun.NewMailgun(domain, apiKey, publicApiKey)
+	m := mg.NewMessage(fromUser, exampleSubject, exampleText, toUser)
+	m.SetHtml(exampleHtml)
+	msg, id, err := mg.Send(m)
+	if err != nil {
+		t.Fatal(err)
+	}
+	fmt.Println("TestSendHtml:MSG(" + msg + "),ID(" + id + ")")
+}
+
+func TestSendMGTracking(t *testing.T) {
+	toUser := reqEnv(t, "MG_EMAIL_TO")
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_API_KEY")
+	publicApiKey := reqEnv(t, "MG_PUBLIC_API_KEY")
+	mg := mailgun.NewMailgun(domain, apiKey, publicApiKey)
+	m := mg.NewMessage(fromUser, exampleSubject, exampleText+"Tracking!\n", toUser)
+	m.SetTracking(false)
+	msg, id, err := mg.Send(m)
+	if err != nil {
+		t.Fatal(err)
+	}
+	fmt.Println("TestSendTracking:MSG(" + msg + "),ID(" + id + ")")
+}
+
+func TestSendMGTag(t *testing.T) {
+	toUser := reqEnv(t, "MG_EMAIL_TO")
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_API_KEY")
+	publicApiKey := reqEnv(t, "MG_PUBLIC_API_KEY")
+	mg := mailgun.NewMailgun(domain, apiKey, publicApiKey)
+	m := mg.NewMessage(fromUser, exampleSubject, exampleText+"Tags Galore!\n", toUser)
+	m.AddTag("FooTag")
+	m.AddTag("BarTag")
+	m.AddTag("BlortTag")
+	msg, id, err := mg.Send(m)
+	if err != nil {
+		t.Fatal(err)
+	}
+	fmt.Println("TestSendTag:MSG(" + msg + "),ID(" + id + ")")
+}
+
+func TestSendMGMIME(t *testing.T) {
+	toUser := reqEnv(t, "MG_EMAIL_TO")
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_API_KEY")
+	mg := mailgun.NewMailgun(domain, apiKey, "")
+	m := mg.NewMIMEMessage(ioutil.NopCloser(strings.NewReader(exampleMime)), toUser)
+	msg, id, err := mg.Send(m)
+	if err != nil {
+		t.Fatal(err)
+	}
+	fmt.Println("TestSendMIME:MSG(" + msg + "),ID(" + id + ")")
+}
+
+func TestSendMGBatchFailRecipients(t *testing.T) {
+	toUser := reqEnv(t, "MG_EMAIL_TO")
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_API_KEY")
+	mg := mailgun.NewMailgun(domain, apiKey, "")
+	m := mg.NewMessage(fromUser, exampleSubject, exampleText+"Batch\n")
+	for i := 0; i < mailgun.MaxNumberOfRecipients; i++ {
+		m.AddRecipient("") // We expect this to indicate a failure at the API
+	}
+	err := m.AddRecipientAndVariables(toUser, nil)
+	if err == nil {
+		// If we're here, either the SDK didn't send the message,
+		// OR the API didn't check for empty To: headers.
+		t.Fatal("Expected to fail!!")
+	}
+}
+
+func TestSendMGBatchRecipientVariables(t *testing.T) {
+	toUser := reqEnv(t, "MG_EMAIL_TO")
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_API_KEY")
+	mg := mailgun.NewMailgun(domain, apiKey, "")
+	m := mg.NewMessage(fromUser, exampleSubject, templateText)
+	err := m.AddRecipientAndVariables(toUser, map[string]interface{}{
+		"name":  "Joe Cool Example",
+		"table": 42,
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	_, _, err = mg.Send(m)
+	if err != nil {
+		t.Fatal(err)
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/mailgun/mailgun-go/acceptance/routes_test.go b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/acceptance/routes_test.go
new file mode 100644
index 00000000..3763b997
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/acceptance/routes_test.go
@@ -0,0 +1,87 @@
+// +build acceptance
+
+package acceptance
+
+import (
+	"github.com/mailgun/mailgun-go"
+	"testing"
+)
+
+func TestRouteCRUD(t *testing.T) {
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_API_KEY")
+	mg := mailgun.NewMailgun(domain, apiKey, "")
+
+	var countRoutes = func() int {
+		count, _, err := mg.GetRoutes(mailgun.DefaultLimit, mailgun.DefaultSkip)
+		if err != nil {
+			t.Fatal(err)
+		}
+		return count
+	}
+
+	routeCount := countRoutes()
+
+	newRoute, err := mg.CreateRoute(mailgun.Route{
+		Priority:    1,
+		Description: "Sample Route",
+		Expression:  "match_recipient(\".*@samples.mailgun.org\")",
+		Actions: []string{
+			"forward(\"http://example.com/messages/\")",
+			"stop()",
+		},
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if newRoute.ID == "" {
+		t.Fatal("I expected the route created to have an ID associated with it.")
+	}
+	defer func() {
+		err = mg.DeleteRoute(newRoute.ID)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		newCount := countRoutes()
+		if newCount != routeCount {
+			t.Fatalf("Expected %d routes defined; got %d", routeCount, newCount)
+		}
+	}()
+
+	newCount := countRoutes()
+	if newCount <= routeCount {
+		t.Fatalf("Expected %d routes defined; got %d", routeCount+1, newCount)
+	}
+
+	theRoute, err := mg.GetRouteByID(newRoute.ID)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if ((newRoute.Priority) != (theRoute.Priority)) ||
+		((newRoute.Description) != (theRoute.Description)) ||
+		((newRoute.Expression) != (theRoute.Expression)) ||
+		(len(newRoute.Actions) != len(theRoute.Actions)) ||
+		((newRoute.CreatedAt) != (theRoute.CreatedAt)) ||
+		((newRoute.ID) != (theRoute.ID)) {
+		t.Fatalf("Expected %#v, got %#v", newRoute, theRoute)
+	}
+	for i, action := range newRoute.Actions {
+		if action != theRoute.Actions[i] {
+			t.Fatalf("Expected %#v, got %#v", newRoute, theRoute)
+		}
+	}
+
+	changedRoute, err := mg.UpdateRoute(newRoute.ID, mailgun.Route{
+		Priority: 2,
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if changedRoute.Priority != 2 {
+		t.Fatalf("Expected a priority of 2; got %d", changedRoute.Priority)
+	}
+	if len(changedRoute.Actions) != 2 {
+		t.Fatalf("Expected actions to not be touched; got %d entries now", len(changedRoute.Actions))
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/mailgun/mailgun-go/acceptance/spam_complaints_test.go b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/acceptance/spam_complaints_test.go
new file mode 100644
index 00000000..676d8a1b
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/acceptance/spam_complaints_test.go
@@ -0,0 +1,71 @@
+// +build acceptance
+
+package acceptance
+
+import (
+	"github.com/mailgun/mailgun-go"
+	"testing"
+)
+
+func TestGetComplaints(t *testing.T) {
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_API_KEY")
+	publicApiKey := reqEnv(t, "MG_PUBLIC_API_KEY")
+	mg := mailgun.NewMailgun(domain, apiKey, publicApiKey)
+	n, complaints, err := mg.GetComplaints(-1, -1)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(complaints) != n {
+		t.Fatalf("Expected %d complaints; got %d", n, len(complaints))
+	}
+}
+
+func TestGetComplaintFromBazNoComplaint(t *testing.T) {
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_API_KEY")
+	publicApiKey := reqEnv(t, "MG_PUBLIC_API_KEY")
+	mg := mailgun.NewMailgun(domain, apiKey, publicApiKey)
+	_, err := mg.GetSingleComplaint("baz@example.com")
+	if err == nil {
+		t.Fatal("Expected not-found error for missing complaint")
+	}
+	ure, ok := err.(*mailgun.UnexpectedResponseError)
+	if !ok {
+		t.Fatal("Expected UnexpectedResponseError")
+	}
+	if ure.Actual != 404 {
+		t.Fatalf("Expected 404 response code; got %d", ure.Actual)
+	}
+}
+
+func TestCreateDeleteComplaint(t *testing.T) {
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_API_KEY")
+	mg := mailgun.NewMailgun(domain, apiKey, "")
+	var check = func(count int) {
+		c, _, err := mg.GetComplaints(mailgun.DefaultLimit, mailgun.DefaultSkip)
+		if err != nil {
+			t.Fatal(err)
+		}
+		if c != count {
+			t.Fatalf("Expected baz@example.com to have %d complaints; got %d", count, c)
+		}
+	}
+
+	check(0)
+
+	err := mg.CreateComplaint("baz@example.com")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	check(1)
+
+	err = mg.DeleteComplaint("baz@example.com")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	check(0)
+}
diff --git a/Godeps/_workspace/src/github.com/mailgun/mailgun-go/acceptance/stats_test.go b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/acceptance/stats_test.go
new file mode 100644
index 00000000..cc47e96d
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/acceptance/stats_test.go
@@ -0,0 +1,40 @@
+// +build acceptance
+
+package acceptance
+
+import (
+	"fmt"
+	mailgun "github.com/mailgun/mailgun-go"
+	"os"
+	"testing"
+	"text/tabwriter"
+)
+
+func TestGetStats(t *testing.T) {
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_API_KEY")
+	mg := mailgun.NewMailgun(domain, apiKey, "")
+
+	totalCount, stats, err := mg.GetStats(-1, -1, nil, "sent", "opened")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	fmt.Printf("Total Count: %d\n", totalCount)
+	tw := tabwriter.NewWriter(os.Stdout, 2, 8, 2, ' ', tabwriter.AlignRight)
+	fmt.Fprintf(tw, "Id\tEvent\tCreatedAt\tTotalCount\t\n")
+	for _, stat := range stats {
+		fmt.Fprintf(tw, "%s\t%s\t%s\t%d\t\n", stat.Id, stat.Event, stat.CreatedAt, stat.TotalCount)
+	}
+	tw.Flush()
+}
+
+func TestDeleteTag(t *testing.T) {
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_API_KEY")
+	mg := mailgun.NewMailgun(domain, apiKey, "")
+	err := mg.DeleteTag("newsletter")
+	if err != nil {
+		t.Fatal(err)
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/mailgun/mailgun-go/acceptance/unsubscribes_test.go b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/acceptance/unsubscribes_test.go
new file mode 100644
index 00000000..cef72292
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/acceptance/unsubscribes_test.go
@@ -0,0 +1,71 @@
+// +build acceptance
+
+package acceptance
+
+import (
+	"fmt"
+	mailgun "github.com/mailgun/mailgun-go"
+	"os"
+	"testing"
+	"text/tabwriter"
+)
+
+func TestGetUnsubscribes(t *testing.T) {
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_API_KEY")
+	mg := mailgun.NewMailgun(domain, apiKey, "")
+	n, us, err := mg.GetUnsubscribes(mailgun.DefaultLimit, mailgun.DefaultSkip)
+	if err != nil {
+		t.Fatal(err)
+	}
+	fmt.Printf("Received %d out of %d unsubscribe records.\n", len(us), n)
+	if len(us) > 0 {
+		tw := &tabwriter.Writer{}
+		tw.Init(os.Stdout, 2, 8, 2, ' ', 0)
+		fmt.Fprintln(tw, "ID\tAddress\tCreated At\tTag\t")
+		for _, u := range us {
+			fmt.Fprintf(tw, "%s\t%s\t%s\t%s\t\n", u.ID, u.Address, u.CreatedAt, u.Tag)
+		}
+		tw.Flush()
+	}
+}
+
+func TestGetUnsubscriptionByAddress(t *testing.T) {
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_API_KEY")
+	email := reqEnv(t, "MG_EMAIL_ADDR")
+	mg := mailgun.NewMailgun(domain, apiKey, "")
+	n, us, err := mg.GetUnsubscribesByAddress(email)
+	if err != nil {
+		t.Fatal(err)
+	}
+	fmt.Printf("Received %d out of %d unsubscribe records.\n", len(us), n)
+	if len(us) > 0 {
+		tw := &tabwriter.Writer{}
+		tw.Init(os.Stdout, 2, 8, 2, ' ', 0)
+		fmt.Fprintln(tw, "ID\tAddress\tCreated At\tTag\t")
+		for _, u := range us {
+			fmt.Fprintf(tw, "%s\t%s\t%s\t%s\t\n", u.ID, u.Address, u.CreatedAt, u.Tag)
+		}
+		tw.Flush()
+	}
+}
+
+func TestCreateDestroyUnsubscription(t *testing.T) {
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_API_KEY")
+	email := reqEnv(t, "MG_EMAIL_ADDR")
+	mg := mailgun.NewMailgun(domain, apiKey, "")
+
+	// Create unsubscription record
+	err := mg.Unsubscribe(email, "*")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Destroy the unsubscription record
+	err = mg.RemoveUnsubscribe(email)
+	if err != nil {
+		t.Fatal(err)
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/mailgun/mailgun-go/acceptance/webhooks_test.go b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/acceptance/webhooks_test.go
new file mode 100644
index 00000000..1663d7ae
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/acceptance/webhooks_test.go
@@ -0,0 +1,66 @@
+// +build acceptance
+
+package acceptance
+
+import (
+	"github.com/mailgun/mailgun-go"
+	"testing"
+)
+
+func TestWebhookCRUD(t *testing.T) {
+	domain := reqEnv(t, "MG_DOMAIN")
+	apiKey := reqEnv(t, "MG_API_KEY")
+	mg := mailgun.NewMailgun(domain, apiKey, "")
+
+	var countHooks = func() int {
+		hooks, err := mg.GetWebhooks()
+		if err != nil {
+			t.Fatal(err)
+		}
+		return len(hooks)
+	}
+
+	hookCount := countHooks()
+
+	err := mg.CreateWebhook("deliver", "http://www.example.com")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer func() {
+		err = mg.DeleteWebhook("deliver")
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		newCount := countHooks()
+		if newCount != hookCount {
+			t.Fatalf("Expected %d routes defined; got %d", hookCount, newCount)
+		}
+	}()
+
+	newCount := countHooks()
+	if newCount <= hookCount {
+		t.Fatalf("Expected %d routes defined; got %d", hookCount+1, newCount)
+	}
+
+	theURL, err := mg.GetWebhookByType("deliver")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if theURL != "http://www.example.com" {
+		t.Fatalf("Expected http://www.example.com, got %#v", theURL)
+	}
+
+	err = mg.UpdateWebhook("deliver", "http://api.example.com")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	hooks, err := mg.GetWebhooks()
+	if err != nil {
+		t.Fatal(err)
+	}
+	if hooks["deliver"] != "http://api.example.com" {
+		t.Fatalf("Expected http://api.example.com, got %#v", hooks["deliver"])
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/mailgun/mailgun-go/bounces.go b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/bounces.go
new file mode 100644
index 00000000..f12076a1
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/bounces.go
@@ -0,0 +1,122 @@
+package mailgun
+
+import (
+	"github.com/mbanzon/simplehttp"
+	"strconv"
+	"time"
+)
+
+// Bounce aggregates data relating to undeliverable messages to a specific intended recipient,
+// identified by Address.
+// Code provides the SMTP error code causing the bounce,
+// while Error provides a human readable reason why.
+// CreatedAt provides the time at which Mailgun detected the bounce.
+type Bounce struct {
+	CreatedAt string      `json:"created_at"`
+	code      interface{} `json:"code"`
+	Address   string      `json:"address"`
+	Error     string      `json:"error"`
+}
+
+type bounceEnvelope struct {
+	TotalCount int      `json:"total_count"`
+	Items      []Bounce `json:"items"`
+}
+
+type singleBounceEnvelope struct {
+	Bounce Bounce `json:"bounce"`
+}
+
+// GetCreatedAt parses the textual, RFC-822 timestamp into a standard Go-compatible
+// Time structure.
+func (i Bounce) GetCreatedAt() (t time.Time, err error) {
+	return parseMailgunTime(i.CreatedAt)
+}
+
+// GetCode will return the bounce code for the message, regardless if it was
+// returned as a string or as an integer.  This method overcomes a protocol
+// bug in the Mailgun API.
+func (b Bounce) GetCode() (int, error) {
+	switch c := b.code.(type) {
+	case int:
+		return c, nil
+	case string:
+		return strconv.Atoi(c)
+	default:
+		return -1, strconv.ErrSyntax
+	}
+}
+
+// GetBounces returns a complete set of bounces logged against the sender's domain, if any.
+// The results include the total number of bounces (regardless of skip or limit settings),
+// and the slice of bounces specified, if successful.
+// Note that the length of the slice may be smaller than the total number of bounces.
+func (m *MailgunImpl) GetBounces(limit, skip int) (int, []Bounce, error) {
+	r := simplehttp.NewHTTPRequest(generateApiUrl(m, bouncesEndpoint))
+	if limit != -1 {
+		r.AddParameter("limit", strconv.Itoa(limit))
+	}
+	if skip != -1 {
+		r.AddParameter("skip", strconv.Itoa(skip))
+	}
+
+	r.SetBasicAuth(basicAuthUser, m.ApiKey())
+
+	var response bounceEnvelope
+	err := getResponseFromJSON(r, &response)
+	if err != nil {
+		return -1, nil, err
+	}
+
+	return response.TotalCount, response.Items, nil
+}
+
+// GetSingleBounce retrieves a single bounce record, if any exist, for the given recipient address.
+func (m *MailgunImpl) GetSingleBounce(address string) (Bounce, error) {
+	r := simplehttp.NewHTTPRequest(generateApiUrl(m, bouncesEndpoint) + "/" + address)
+	r.SetBasicAuth(basicAuthUser, m.ApiKey())
+
+	var response singleBounceEnvelope
+	err := getResponseFromJSON(r, &response)
+	return response.Bounce, err
+}
+
+// AddBounce files a bounce report.
+// Address identifies the intended recipient of the message that bounced.
+// Code corresponds to the numeric response given by the e-mail server which rejected the message.
+// Error providees the corresponding human readable reason for the problem.
+// For example,
+// here's how the these two fields relate.
+// Suppose the SMTP server responds with an error, as below.
+// Then, . . .
+//
+//      550  Requested action not taken: mailbox unavailable
+//     \___/\_______________________________________________/
+//       |                         |
+//       `-- Code                  `-- Error
+//
+// Note that both code and error exist as strings, even though
+// code will report as a number.
+func (m *MailgunImpl) AddBounce(address, code, error string) error {
+	r := simplehttp.NewHTTPRequest(generateApiUrl(m, bouncesEndpoint))
+	r.SetBasicAuth(basicAuthUser, m.ApiKey())
+
+	payload := simplehttp.NewUrlEncodedPayload()
+	payload.AddValue("address", address)
+	if code != "" {
+		payload.AddValue("code", code)
+	}
+	if error != "" {
+		payload.AddValue("error", error)
+	}
+	_, err := makePostRequest(r, payload)
+	return err
+}
+
+// DeleteBounce removes all bounces associted with the provided e-mail address.
+func (m *MailgunImpl) DeleteBounce(address string) error {
+	r := simplehttp.NewHTTPRequest(generateApiUrl(m, bouncesEndpoint) + "/" + address)
+	r.SetBasicAuth(basicAuthUser, m.ApiKey())
+	_, err := makeDeleteRequest(r)
+	return err
+}
diff --git a/Godeps/_workspace/src/github.com/mailgun/mailgun-go/campaigns.go b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/campaigns.go
new file mode 100644
index 00000000..c90d0c59
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/campaigns.go
@@ -0,0 +1,79 @@
+package mailgun
+
+import (
+	"github.com/mbanzon/simplehttp"
+)
+
+// Campaigns have been deprecated since development work on this SDK commenced.
+// Please refer to http://documentation.mailgun.com/api_reference .
+type Campaign struct {
+	Id                string `json:"id"`
+	Name              string `json:"name"`
+	CreatedAt         string `json:"created_at"`
+	DeliveredCount    int    `json:"delivered_count"`
+	ClickedCount      int    `json:"clicked_count"`
+	OpenedCount       int    `json:"opened_count"`
+	SubmittedCount    int    `json:"submitted_count"`
+	UnsubscribedCount int    `json:"unsubscribed_count"`
+	BouncedCount      int    `json:"bounced_count"`
+	ComplainedCount   int    `json:"complained_count"`
+	DroppedCount      int    `json:"dropped_count"`
+}
+
+type campaignsEnvelope struct {
+	TotalCount int        `json:"total_count"`
+	Items      []Campaign `json:"items"`
+}
+
+// Campaigns have been deprecated since development work on this SDK commenced.
+// Please refer to http://documentation.mailgun.com/api_reference .
+func (m *MailgunImpl) GetCampaigns() (int, []Campaign, error) {
+	r := simplehttp.NewHTTPRequest(generateApiUrl(m, campaignsEndpoint))
+	r.SetBasicAuth(basicAuthUser, m.ApiKey())
+
+	var envelope campaignsEnvelope
+	err := getResponseFromJSON(r, &envelope)
+	if err != nil {
+		return -1, nil, err
+	}
+	return envelope.TotalCount, envelope.Items, nil
+}
+
+// Campaigns have been deprecated since development work on this SDK commenced.
+// Please refer to http://documentation.mailgun.com/api_reference .
+func (m *MailgunImpl) CreateCampaign(name, id string) error {
+	r := simplehttp.NewHTTPRequest(generateApiUrl(m, campaignsEndpoint))
+	r.SetBasicAuth(basicAuthUser, m.ApiKey())
+
+	payload := simplehttp.NewUrlEncodedPayload()
+	payload.AddValue("name", name)
+	if id != "" {
+		payload.AddValue("id", id)
+	}
+	_, err := makePostRequest(r, payload)
+	return err
+}
+
+// Campaigns have been deprecated since development work on this SDK commenced.
+// Please refer to http://documentation.mailgun.com/api_reference .
+func (m *MailgunImpl) UpdateCampaign(oldId, name, newId string) error {
+	r := simplehttp.NewHTTPRequest(generateApiUrl(m, campaignsEndpoint) + "/" + oldId)
+	r.SetBasicAuth(basicAuthUser, m.ApiKey())
+
+	payload := simplehttp.NewUrlEncodedPayload()
+	payload.AddValue("name", name)
+	if newId != "" {
+		payload.AddValue("id", newId)
+	}
+	_, err := makePostRequest(r, payload)
+	return err
+}
+
+// Campaigns have been deprecated since development work on this SDK commenced.
+// Please refer to http://documentation.mailgun.com/api_reference .
+func (m *MailgunImpl) DeleteCampaign(id string) error {
+	r := simplehttp.NewHTTPRequest(generateApiUrl(m, campaignsEndpoint) + "/" + id)
+	r.SetBasicAuth(basicAuthUser, m.ApiKey())
+	_, err := makeDeleteRequest(r)
+	return err
+}
diff --git a/Godeps/_workspace/src/github.com/mailgun/mailgun-go/credentials.go b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/credentials.go
new file mode 100644
index 00000000..f5be9efb
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/credentials.go
@@ -0,0 +1,76 @@
+package mailgun
+
+import (
+	"fmt"
+	"github.com/mbanzon/simplehttp"
+	"strconv"
+)
+
+// A Credential structure describes a principle allowed to send or receive mail at the domain.
+type Credential struct {
+	CreatedAt string `json:"created_at"`
+	Login     string `json:"login"`
+	Password  string `json:"password"`
+}
+
+// ErrEmptyParam results occur when a required parameter is missing.
+var ErrEmptyParam = fmt.Errorf("empty or illegal parameter")
+
+// GetCredentials returns the (possibly zero-length) list of credentials associated with your domain.
+func (mg *MailgunImpl) GetCredentials(limit, skip int) (int, []Credential, error) {
+	r := simplehttp.NewHTTPRequest(generateCredentialsUrl(mg, ""))
+	if limit != DefaultLimit {
+		r.AddParameter("limit", strconv.Itoa(limit))
+	}
+	if skip != DefaultSkip {
+		r.AddParameter("skip", strconv.Itoa(skip))
+	}
+	r.SetBasicAuth(basicAuthUser, mg.ApiKey())
+	var envelope struct {
+		TotalCount int          `json:"total_count"`
+		Items      []Credential `json:"items"`
+	}
+	err := getResponseFromJSON(r, &envelope)
+	if err != nil {
+		return -1, nil, err
+	}
+	return envelope.TotalCount, envelope.Items, nil
+}
+
+// CreateCredential attempts to create associate a new principle with your domain.
+func (mg *MailgunImpl) CreateCredential(login, password string) error {
+	if (login == "") || (password == "") {
+		return ErrEmptyParam
+	}
+	r := simplehttp.NewHTTPRequest(generateCredentialsUrl(mg, ""))
+	r.SetBasicAuth(basicAuthUser, mg.ApiKey())
+	p := simplehttp.NewUrlEncodedPayload()
+	p.AddValue("login", login)
+	p.AddValue("password", password)
+	_, err := makePostRequest(r, p)
+	return err
+}
+
+// ChangeCredentialPassword attempts to alter the indicated credential's password.
+func (mg *MailgunImpl) ChangeCredentialPassword(id, password string) error {
+	if (id == "") || (password == "") {
+		return ErrEmptyParam
+	}
+	r := simplehttp.NewHTTPRequest(generateCredentialsUrl(mg, id))
+	r.SetBasicAuth(basicAuthUser, mg.ApiKey())
+	p := simplehttp.NewUrlEncodedPayload()
+	p.AddValue("password", password)
+	_, err := makePutRequest(r, p)
+	return err
+}
+
+// DeleteCredential attempts to remove the indicated principle from the domain.
+func (mg *MailgunImpl) DeleteCredential(id string) error {
+	if id == "" {
+		return ErrEmptyParam
+	}
+	r := simplehttp.NewHTTPRequest(generateCredentialsUrl(mg, id))
+	r.SetBasicAuth(basicAuthUser, mg.ApiKey())
+	_, err := makeDeleteRequest(r)
+	return err
+}
diff --git a/Godeps/_workspace/src/github.com/mailgun/mailgun-go/domains.go b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/domains.go
new file mode 100644
index 00000000..28071748
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/domains.go
@@ -0,0 +1,121 @@
+package mailgun
+
+import (
+	"github.com/mbanzon/simplehttp"
+	"strconv"
+	"time"
+)
+
+// DefaultLimit and DefaultSkip instruct the SDK to rely on Mailgun's reasonable defaults for pagination settings.
+const (
+	DefaultLimit = -1
+	DefaultSkip  = -1
+)
+
+// Disabled, Tag, and Delete indicate spam actions.
+// Disabled prevents Mailgun from taking any action on what it perceives to be spam.
+// Tag instruments the received message with headers providing a measure of its spamness.
+// Delete instructs Mailgun to just block or delete the message all-together.
+const (
+	Tag      = "tag"
+	Disabled = "disabled"
+	Delete   = "delete"
+)
+
+// A Domain structure holds information about a domain used when sending mail.
+// The SpamAction field must be one of Tag, Disabled, or Delete.
+type Domain struct {
+	CreatedAt    string `json:"created_at"`
+	SMTPLogin    string `json:"smtp_login"`
+	Name         string `json:"name"`
+	SMTPPassword string `json:"smtp_password"`
+	Wildcard     bool   `json:"wildcard"`
+	SpamAction   string `json:"spam_action"`
+}
+
+// DNSRecord structures describe intended records to properly configure your domain for use with Mailgun.
+// Note that Mailgun does not host DNS records.
+type DNSRecord struct {
+	Priority   string
+	RecordType string `json:"record_type"`
+	Valid      string
+	Name       string
+	Value      string
+}
+
+type domainsEnvelope struct {
+	TotalCount int      `json:"total_count"`
+	Items      []Domain `json:"items"`
+}
+
+type singleDomainEnvelope struct {
+	Domain              Domain      `json:"domain"`
+	ReceivingDNSRecords []DNSRecord `json:"receiving_dns_records"`
+	SendingDNSRecords   []DNSRecord `json:"sending_dns_records"`
+}
+
+// GetCreatedAt returns the time the domain was created as a normal Go time.Time type.
+func (d Domain) GetCreatedAt() (t time.Time, err error) {
+	t, err = parseMailgunTime(d.CreatedAt)
+	return
+}
+
+// GetDomains retrieves a set of domains from Mailgun.
+//
+// Assuming no error, both the number of items retrieved and a slice of Domain instances.
+// The number of items returned may be less than the specified limit, if it's specified.
+// Note that zero items and a zero-length slice do not necessarily imply an error occurred.
+// Except for the error itself, all results are undefined in the event of an error.
+func (m *MailgunImpl) GetDomains(limit, skip int) (int, []Domain, error) {
+	r := simplehttp.NewHTTPRequest(generatePublicApiUrl(domainsEndpoint))
+	if limit != DefaultLimit {
+		r.AddParameter("limit", strconv.Itoa(limit))
+	}
+	if skip != DefaultSkip {
+		r.AddParameter("skip", strconv.Itoa(skip))
+	}
+	r.SetBasicAuth(basicAuthUser, m.ApiKey())
+
+	var envelope domainsEnvelope
+	err := getResponseFromJSON(r, &envelope)
+	if err != nil {
+		return -1, nil, err
+	}
+	return envelope.TotalCount, envelope.Items, nil
+}
+
+// Retrieve detailed information about the named domain.
+func (m *MailgunImpl) GetSingleDomain(domain string) (Domain, []DNSRecord, []DNSRecord, error) {
+	r := simplehttp.NewHTTPRequest(generatePublicApiUrl(domainsEndpoint) + "/" + domain)
+	r.SetBasicAuth(basicAuthUser, m.ApiKey())
+	var envelope singleDomainEnvelope
+	err := getResponseFromJSON(r, &envelope)
+	return envelope.Domain, envelope.ReceivingDNSRecords, envelope.SendingDNSRecords, err
+}
+
+// CreateDomain instructs Mailgun to create a new domain for your account.
+// The name parameter identifies the domain.
+// The smtpPassword parameter provides an access credential for the domain.
+// The spamAction domain must be one of Delete, Tag, or Disabled.
+// The wildcard parameter instructs Mailgun to treat all subdomains of this domain uniformly if true,
+// and as different domains if false.
+func (m *MailgunImpl) CreateDomain(name string, smtpPassword string, spamAction string, wildcard bool) error {
+	r := simplehttp.NewHTTPRequest(generatePublicApiUrl(domainsEndpoint))
+	r.SetBasicAuth(basicAuthUser, m.ApiKey())
+
+	payload := simplehttp.NewUrlEncodedPayload()
+	payload.AddValue("name", name)
+	payload.AddValue("smtp_password", smtpPassword)
+	payload.AddValue("spam_action", spamAction)
+	payload.AddValue("wildcard", strconv.FormatBool(wildcard))
+	_, err := makePostRequest(r, payload)
+	return err
+}
+
+// DeleteDomain instructs Mailgun to dispose of the named domain name.
+func (m *MailgunImpl) DeleteDomain(name string) error {
+	r := simplehttp.NewHTTPRequest(generatePublicApiUrl(domainsEndpoint) + "/" + name)
+	r.SetBasicAuth(basicAuthUser, m.ApiKey())
+	_, err := makeDeleteRequest(r)
+	return err
+}
diff --git a/Godeps/_workspace/src/github.com/mailgun/mailgun-go/email_validation.go b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/email_validation.go
new file mode 100644
index 00000000..918453a6
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/email_validation.go
@@ -0,0 +1,71 @@
+package mailgun
+
+import (
+	"github.com/mbanzon/simplehttp"
+	"strings"
+)
+
+// The EmailVerificationParts structure breaks out the basic elements of an email address.
+// LocalPart includes everything up to the '@' in an e-mail address.
+// Domain includes everything after the '@'.
+// DisplayName is no longer used, and will appear as "".
+type EmailVerificationParts struct {
+	LocalPart   string `json:"local_part"`
+	Domain      string `json:"domain"`
+	DisplayName string `json:"display_name"`
+}
+
+// EmailVerification records basic facts about a validated e-mail address.
+// See the ValidateEmail method and example for more details.
+//
+// IsValid indicates whether an email address conforms to IETF RFC standards.
+// Parts records the different subfields of an email address.
+// Address echoes the address provided.
+// DidYouMean provides a simple recommendation in case the address is invalid or
+// Mailgun thinks you might have a typo.
+// DidYouMean may be empty (""), in which case Mailgun has no recommendation to give.
+// The existence of DidYouMean does NOT imply the email provided has anything wrong with it.
+type EmailVerification struct {
+	IsValid    bool                   `json:"is_valid"`
+	Parts      EmailVerificationParts `json:"parts"`
+	Address    string                 `json:"address"`
+	DidYouMean string                 `json:"did_you_mean"`
+}
+
+type addressParseResult struct {
+	Parsed      []string `json:"parsed"`
+	Unparseable []string `json:"unparseable"`
+}
+
+// ValidateEmail performs various checks on the email address provided to ensure it's correctly formatted.
+// It may also be used to break an email address into its sub-components.  (See example.)
+// NOTE: Use of this function requires a proper public API key.  The private API key will not work.
+func (m *MailgunImpl) ValidateEmail(email string) (EmailVerification, error) {
+	r := simplehttp.NewHTTPRequest(generatePublicApiUrl(addressValidateEndpoint))
+	r.AddParameter("address", email)
+	r.SetBasicAuth(basicAuthUser, m.PublicApiKey())
+
+	var response EmailVerification
+	err := getResponseFromJSON(r, &response)
+	if err != nil {
+		return EmailVerification{}, err
+	}
+
+	return response, nil
+}
+
+// ParseAddresses takes a list of addresses and sorts them into valid and invalid address categories.
+// NOTE: Use of this function requires a proper public API key.  The private API key will not work.
+func (m *MailgunImpl) ParseAddresses(addresses ...string) ([]string, []string, error) {
+	r := simplehttp.NewHTTPRequest(generatePublicApiUrl(addressParseEndpoint))
+	r.AddParameter("addresses", strings.Join(addresses, ","))
+	r.SetBasicAuth(basicAuthUser, m.PublicApiKey())
+
+	var response addressParseResult
+	err := getResponseFromJSON(r, &response)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	return response.Parsed, response.Unparseable, nil
+}
diff --git a/Godeps/_workspace/src/github.com/mailgun/mailgun-go/events.go b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/events.go
new file mode 100644
index 00000000..833a2b4f
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/events.go
@@ -0,0 +1,130 @@
+package mailgun
+
+import (
+	"fmt"
+	"github.com/mbanzon/simplehttp"
+	"time"
+)
+
+// Events are open-ended, loosely-defined JSON documents.
+// They will always have an event and a timestamp field, however.
+type Event map[string]interface{}
+
+// noTime always equals an uninitialized Time structure.
+// It's used to detect when a time parameter is provided.
+var noTime time.Time
+
+// GetEventsOptions lets the caller of GetEvents() specify how the results are to be returned.
+// Begin and End time-box the results returned.
+// ForceAscending and ForceDescending are used to force Mailgun to use a given traversal order of the events.
+// If both ForceAscending and ForceDescending are true, an error will result.
+// If none, the default will be inferred from the Begin and End parameters.
+// Limit caps the number of results returned.  If left unspecified, Mailgun assumes 100.
+// Compact, if true, compacts the returned JSON to minimize transmission bandwidth.
+// Otherwise, the JSON is spaced appropriately for human consumption.
+// Filter allows the caller to provide more specialized filters on the query.
+// Consult the Mailgun documentation for more details.
+type GetEventsOptions struct {
+	Begin, End                               time.Time
+	ForceAscending, ForceDescending, Compact bool
+	Limit                                    int
+	Filter                                   map[string]string
+}
+
+// EventIterator maintains the state necessary for paging though small parcels of a larger set of events.
+type EventIterator struct {
+	events           []Event
+	nextURL, prevURL string
+	mg               Mailgun
+}
+
+// NewEventIterator creates a new iterator for events.
+// Use GetFirstPage to retrieve the first batch of events.
+// Use Next and Previous thereafter as appropriate to iterate through sets of data.
+func (mg *MailgunImpl) NewEventIterator() *EventIterator {
+	return &EventIterator{mg: mg}
+}
+
+// Events returns the most recently retrieved batch of events.
+// The length is guaranteed to fall between 0 and the limit set in the GetEventsOptions structure passed to GetFirstPage.
+func (ei *EventIterator) Events() []Event {
+	return ei.events
+}
+
+// GetFirstPage retrieves the first batch of events, according to your criteria.
+// See the GetEventsOptions structure for more details on how the fields affect the data returned.
+func (ei *EventIterator) GetFirstPage(opts GetEventsOptions) error {
+	if opts.ForceAscending && opts.ForceDescending {
+		return fmt.Errorf("collation cannot at once be both ascending and descending")
+	}
+
+	payload := simplehttp.NewUrlEncodedPayload()
+	if opts.Limit != 0 {
+		payload.AddValue("limit", fmt.Sprintf("%d", opts.Limit))
+	}
+	if opts.Compact {
+		payload.AddValue("pretty", "no")
+	}
+	if opts.ForceAscending {
+		payload.AddValue("ascending", "yes")
+	}
+	if opts.ForceDescending {
+		payload.AddValue("ascending", "no")
+	}
+	if opts.Begin != noTime {
+		payload.AddValue("begin", formatMailgunTime(&opts.Begin))
+	}
+	if opts.End != noTime {
+		payload.AddValue("end", formatMailgunTime(&opts.End))
+	}
+	if opts.Filter != nil {
+		for k, v := range opts.Filter {
+			payload.AddValue(k, v)
+		}
+	}
+
+	url, err := generateParameterizedUrl(ei.mg, eventsEndpoint, payload)
+	if err != nil {
+		return err
+	}
+	return ei.fetch(url)
+}
+
+// Retrieves the chronologically previous batch of events, if any exist.
+// You know you're at the end of the list when len(Events())==0.
+func (ei *EventIterator) GetPrevious() error {
+	return ei.fetch(ei.prevURL)
+}
+
+// Retrieves the chronologically next batch of events, if any exist.
+// You know you're at the end of the list when len(Events())==0.
+func (ei *EventIterator) GetNext() error {
+	return ei.fetch(ei.nextURL)
+}
+
+// GetFirstPage, GetPrevious, and GetNext all have a common body of code.
+// fetch completes the API fetch common to all three of these functions.
+func (ei *EventIterator) fetch(url string) error {
+	r := simplehttp.NewHTTPRequest(url)
+	r.SetBasicAuth(basicAuthUser, ei.mg.ApiKey())
+	var response map[string]interface{}
+	err := getResponseFromJSON(r, &response)
+	if err != nil {
+		return err
+	}
+
+	items := response["items"].([]interface{})
+	ei.events = make([]Event, len(items))
+	for i, item := range items {
+		ei.events[i] = item.(map[string]interface{})
+	}
+
+	pagings := response["paging"].(map[string]interface{})
+	links := make(map[string]string, len(pagings))
+	for key, page := range pagings {
+		links[key] = page.(string)
+	}
+	ei.nextURL = links["next"]
+	ei.prevURL = links["previous"]
+	return err
+}
diff --git a/Godeps/_workspace/src/github.com/mailgun/mailgun-go/examples_test.go b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/examples_test.go
new file mode 100644
index 00000000..a4af5bfb
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/examples_test.go
@@ -0,0 +1,117 @@
+package mailgun
+
+import (
+	"io/ioutil"
+	"log"
+	"strings"
+	"time"
+)
+
+func ExampleMailgunImpl_ValidateEmail() {
+	mg := NewMailgun("example.com", "", "my_public_api_key")
+	ev, err := mg.ValidateEmail("joe@example.com")
+	if err != nil {
+		log.Fatal(err)
+	}
+	if !ev.IsValid {
+		log.Fatal("Expected valid e-mail address")
+	}
+	log.Printf("Parts local_part=%s domain=%s display_name=%s", ev.Parts.LocalPart, ev.Parts.Domain, ev.Parts.DisplayName)
+	if ev.DidYouMean != "" {
+		log.Printf("The address is syntactically valid, but perhaps has a typo.")
+		log.Printf("Did you mean %s instead?", ev.DidYouMean)
+	}
+}
+
+func ExampleMailgunImpl_ParseAddresses() {
+	mg := NewMailgun("example.com", "", "my_public_api_key")
+	addressesThatParsed, unparsableAddresses, err := mg.ParseAddresses("Alice <alice@example.com>", "bob@example.com", "example.com")
+	if err != nil {
+		log.Fatal(err)
+	}
+	hittest := map[string]bool{
+		"Alice <alice@example.com>": true,
+		"bob@example.com":           true,
+	}
+	for _, a := range addressesThatParsed {
+		if !hittest[a] {
+			log.Fatalf("Expected %s to be parsable", a)
+		}
+	}
+	if len(unparsableAddresses) != 1 {
+		log.Fatalf("Expected 1 address to be unparsable; got %d", len(unparsableAddresses))
+	}
+}
+
+func ExampleMailgunImpl_UpdateList() {
+	mg := NewMailgun("example.com", "my_api_key", "")
+	_, err := mg.UpdateList("joe-stat@example.com", List{
+		Name:        "Joe Stat",
+		Description: "Joe's status report list",
+	})
+	if err != nil {
+		log.Fatal(err)
+	}
+}
+
+func ExampleMailgunImpl_Send_constructed() {
+	mg := NewMailgun("example.com", "my_api_key", "")
+	m := NewMessage(
+		"Excited User <me@example.com>",
+		"Hello World",
+		"Testing some Mailgun Awesomeness!",
+		"baz@example.com",
+		"bar@example.com",
+	)
+	m.SetTracking(true)
+	m.SetDeliveryTime(time.Now().Add(24 * time.Hour))
+	m.SetHtml("<html><body><h1>Testing some Mailgun Awesomeness!!</h1></body></html>")
+	_, id, err := mg.Send(m)
+	if err != nil {
+		log.Fatal(err)
+	}
+	log.Printf("Message id=%s", id)
+}
+
+func ExampleMailgunImpl_Send_mime() {
+	exampleMime := `Content-Type: text/plain; charset="ascii"
+Subject: Joe's Example Subject
+From: Joe Example <joe@example.com>
+To: BARGLEGARF <bargle.garf@example.com>
+Content-Transfer-Encoding: 7bit
+Date: Thu, 6 Mar 2014 00:37:52 +0000
+
+Testing some Mailgun MIME awesomeness!
+`
+	mg := NewMailgun("example.com", "my_api_key", "")
+	m := NewMIMEMessage(ioutil.NopCloser(strings.NewReader(exampleMime)), "bargle.garf@example.com")
+	_, id, err := mg.Send(m)
+	if err != nil {
+		log.Fatal(err)
+	}
+	log.Printf("Message id=%s", id)
+}
+
+func ExampleMailgunImpl_GetRoutes() {
+	mg := NewMailgun("example.com", "my_api_key", "")
+	n, routes, err := mg.GetRoutes(DefaultLimit, DefaultSkip)
+	if err != nil {
+		log.Fatal(err)
+	}
+	if n > len(routes) {
+		log.Printf("More routes exist than has been returned.")
+	}
+	for _, r := range routes {
+		log.Printf("Route pri=%d expr=%s desc=%s", r.Priority, r.Expression, r.Description)
+	}
+}
+
+func ExampleMailgunImpl_UpdateRoute() {
+	mg := NewMailgun("example.com", "my_api_key", "")
+	_, err := mg.UpdateRoute("route-id-here", Route{
+		Priority: 2,
+	})
+	if err != nil {
+		log.Fatal(err)
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/mailgun/mailgun-go/mailgun.go b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/mailgun.go
new file mode 100644
index 00000000..490b7393
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/mailgun.go
@@ -0,0 +1,291 @@
+// TODO(sfalvo):
+// Document how to run acceptance tests.
+
+// The mailgun package provides methods for interacting with the Mailgun API.
+// It automates the HTTP request/response cycle, encodings, and other details needed by the API.
+// This SDK lets you do everything the API lets you, in a more Go-friendly way.
+//
+// For further information please see the Mailgun documentation at
+// http://documentation.mailgun.com/
+//
+//  Original Author: Michael Banzon
+//  Contributions:   Samuel A. Falvo II <sam.falvo %at% rackspace.com>
+//  Version:         0.99.0
+//
+// Examples
+//
+// This document includes a number of examples which illustrates some aspects of the GUI which might be misleading or confusing.
+// All examples included are derived from an acceptance test.
+// Note that every SDK function has a corresponding acceptance test, so
+// if you don't find an example for a function you'd like to know more about,
+// please check the acceptance sub-package for a corresponding test.
+// Of course, contributions to the documentation are always welcome as well.
+// Feel free to submit a pull request or open a Github issue if you cannot find an example to suit your needs.
+//
+// Limit and Skip Settings
+//
+// Many SDK functions consume a pair of parameters called limit and skip.
+// These help control how much data Mailgun sends over the wire.
+// Limit, as you'd expect, gives a count of the number of records you want to receive.
+// Note that, at present, Mailgun imposes its own cap of 100, for all API endpoints.
+// Skip indicates where in the data set you want to start receiving from.
+// Mailgun defaults to the very beginning of the dataset if not specified explicitly.
+//
+// If you don't particularly care how much data you receive, you may specify DefaultLimit.
+// If you similarly don't care about where the data starts, you may specify DefaultSkip.
+//
+// Functions that Return Totals
+//
+// Functions which accept a limit and skip setting, in general,
+// will also return a total count of the items returned.
+// Note that this total count is not the total in the bundle returned by the call.
+// You can determine that easily enough with Go's len() function.
+// The total that you receive actually refers to the complete set of data on the server.
+// This total may well exceed the size returned from the API.
+//
+// If this happens, you may find yourself needing to iterate over the dataset of interest.
+// For example:
+//
+//		// Get total amount of stuff we have to work with.
+// 		mg := NewMailgun("example.com", "my_api_key", "")
+// 		n, _, err := mg.GetStats(1, 0, nil, "sent", "opened")
+// 		if err != nil {
+// 			t.Fatal(err)
+// 		}
+//		// Loop over it all.
+//		for sk := 0; sk < n; sk += limit {
+//			_, stats, err := mg.GetStats(limit, sk, nil, "sent", "opened")
+//		 	if err != nil {
+//		 		t.Fatal(err)
+//		 	}
+//			doSomethingWith(stats)
+//		}
+//
+// License
+//
+// Copyright (c) 2013-2014, Michael Banzon.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice, this
+// list of conditions and the following disclaimer.
+//
+// * Redistributions in binary form must reproduce the above copyright notice, this
+// list of conditions and the following disclaimer in the documentation and/or
+// other materials provided with the distribution.
+//
+// * Neither the names of Mailgun, Michael Banzon, nor the names of their
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+package mailgun
+
+import (
+	"fmt"
+	"github.com/mbanzon/simplehttp"
+	"io"
+	"time"
+)
+
+const (
+	apiBase                 = "https://api.mailgun.net/v2"
+	messagesEndpoint        = "messages"
+	mimeMessagesEndpoint    = "messages.mime"
+	addressValidateEndpoint = "address/validate"
+	addressParseEndpoint    = "address/parse"
+	bouncesEndpoint         = "bounces"
+	statsEndpoint           = "stats"
+	domainsEndpoint         = "domains"
+	deleteTagEndpoint       = "tags"
+	campaignsEndpoint       = "campaigns"
+	eventsEndpoint          = "events"
+	credentialsEndpoint     = "credentials"
+	unsubscribesEndpoint    = "unsubscribes"
+	routesEndpoint          = "routes"
+	webhooksEndpoint        = "webhooks"
+	listsEndpoint           = "lists"
+	basicAuthUser           = "api"
+)
+
+// Mailgun defines the supported subset of the Mailgun API.
+// The Mailgun API may contain additional features which have been deprecated since writing this SDK.
+// This SDK only covers currently supported interface endpoints.
+//
+// Note that Mailgun reserves the right to deprecate endpoints.
+// Some endpoints listed in this interface may, at any time, become obsolete.
+// Always double-check with the Mailgun API Documentation to
+// determine the currently supported feature set.
+type Mailgun interface {
+	Domain() string
+	ApiKey() string
+	PublicApiKey() string
+	Send(m *Message) (string, string, error)
+	ValidateEmail(email string) (EmailVerification, error)
+	ParseAddresses(addresses ...string) ([]string, []string, error)
+	GetBounces(limit, skip int) (int, []Bounce, error)
+	GetSingleBounce(address string) (Bounce, error)
+	AddBounce(address, code, error string) error
+	DeleteBounce(address string) error
+	GetStats(limit int, skip int, startDate *time.Time, event ...string) (int, []Stat, error)
+	DeleteTag(tag string) error
+	GetDomains(limit, skip int) (int, []Domain, error)
+	GetSingleDomain(domain string) (Domain, []DNSRecord, []DNSRecord, error)
+	CreateDomain(name string, smtpPassword string, spamAction string, wildcard bool) error
+	DeleteDomain(name string) error
+	GetCampaigns() (int, []Campaign, error)
+	CreateCampaign(name, id string) error
+	UpdateCampaign(oldId, name, newId string) error
+	DeleteCampaign(id string) error
+	GetComplaints(limit, skip int) (int, []Complaint, error)
+	GetSingleComplaint(address string) (Complaint, error)
+	GetStoredMessage(id string) (StoredMessage, error)
+	GetStoredMessageRaw(id string) (StoredMessageRaw, error)
+	DeleteStoredMessage(id string) error
+	GetCredentials(limit, skip int) (int, []Credential, error)
+	CreateCredential(login, password string) error
+	ChangeCredentialPassword(id, password string) error
+	DeleteCredential(id string) error
+	GetUnsubscribes(limit, skip int) (int, []Unsubscription, error)
+	GetUnsubscribesByAddress(string) (int, []Unsubscription, error)
+	Unsubscribe(address, tag string) error
+	RemoveUnsubscribe(string) error
+	CreateComplaint(string) error
+	DeleteComplaint(string) error
+	GetRoutes(limit, skip int) (int, []Route, error)
+	GetRouteByID(string) (Route, error)
+	CreateRoute(Route) (Route, error)
+	DeleteRoute(string) error
+	UpdateRoute(string, Route) (Route, error)
+	GetWebhooks() (map[string]string, error)
+	CreateWebhook(kind, url string) error
+	DeleteWebhook(kind string) error
+	GetWebhookByType(kind string) (string, error)
+	UpdateWebhook(kind, url string) error
+	GetLists(limit, skip int, filter string) (int, []List, error)
+	CreateList(List) (List, error)
+	DeleteList(string) error
+	GetListByAddress(string) (List, error)
+	UpdateList(string, List) (List, error)
+	GetMembers(limit, skip int, subfilter *bool, address string) (int, []Member, error)
+	GetMemberByAddress(MemberAddr, listAddr string) (Member, error)
+	CreateMember(merge bool, addr string, prototype Member) error
+	CreateMemberList(subscribed *bool, addr string, newMembers []interface{}) error
+	UpdateMember(Member, list string, prototype Member) (Member, error)
+	DeleteMember(Member, list string) error
+	NewMessage(from, subject, text string, to ...string) *Message
+	NewMIMEMessage(body io.ReadCloser, to ...string) *Message
+	NewEventIterator() *EventIterator
+}
+
+// MailgunImpl bundles data needed by a large number of methods in order to interact with the Mailgun API.
+// Colloquially, we refer to instances of this structure as "clients."
+type MailgunImpl struct {
+	domain       string
+	apiKey       string
+	publicApiKey string
+}
+
+// NewMailGun creates a new client instance.
+func NewMailgun(domain, apiKey, publicApiKey string) Mailgun {
+	m := MailgunImpl{domain: domain, apiKey: apiKey, publicApiKey: publicApiKey}
+	return &m
+}
+
+// Domain returns the domain configured for this client.
+func (m *MailgunImpl) Domain() string {
+	return m.domain
+}
+
+// ApiKey returns the API key configured for this client.
+func (m *MailgunImpl) ApiKey() string {
+	return m.apiKey
+}
+
+// PublicApiKey returns the public API key configured for this client.
+func (m *MailgunImpl) PublicApiKey() string {
+	return m.publicApiKey
+}
+
+// generateApiUrl renders a URL for an API endpoint using the domain and endpoint name.
+func generateApiUrl(m Mailgun, endpoint string) string {
+	return fmt.Sprintf("%s/%s/%s", apiBase, m.Domain(), endpoint)
+}
+
+// generateMemberApiUrl renders a URL relevant for specifying mailing list members.
+// The address parameter refers to the mailing list in question.
+func generateMemberApiUrl(endpoint, address string) string {
+	return fmt.Sprintf("%s/%s/%s/members", apiBase, endpoint, address)
+}
+
+// generateApiUrlWithTarget works as generateApiUrl,
+// but consumes an additional resource parameter called 'target'.
+func generateApiUrlWithTarget(m Mailgun, endpoint, target string) string {
+	tail := ""
+	if target != "" {
+		tail = fmt.Sprintf("/%s", target)
+	}
+	return fmt.Sprintf("%s%s", generateApiUrl(m, endpoint), tail)
+}
+
+// generateDomainApiUrl renders a URL as generateApiUrl, but
+// addresses a family of functions which have a non-standard URL structure.
+// Most URLs consume a domain in the 2nd position, but some endpoints
+// require the word "domains" to be there instead.
+func generateDomainApiUrl(m Mailgun, endpoint string) string {
+	return fmt.Sprintf("%s/domains/%s/%s", apiBase, m.Domain(), endpoint)
+}
+
+// generateCredentialsUrl renders a URL as generateDomainApiUrl,
+// but focuses on the SMTP credentials family of API functions.
+func generateCredentialsUrl(m Mailgun, id string) string {
+	tail := ""
+	if id != "" {
+		tail = fmt.Sprintf("/%s", id)
+	}
+	return generateDomainApiUrl(m, fmt.Sprintf("credentials%s", tail))
+	// return fmt.Sprintf("%s/domains/%s/credentials%s", apiBase, m.Domain(), tail)
+}
+
+// generateStoredMessageUrl generates the URL needed to acquire a copy of a stored message.
+func generateStoredMessageUrl(m Mailgun, endpoint, id string) string {
+	return generateDomainApiUrl(m, fmt.Sprintf("%s/%s", endpoint, id))
+	// return fmt.Sprintf("%s/domains/%s/%s/%s", apiBase, m.Domain(), endpoint, id)
+}
+
+// generatePublicApiUrl works as generateApiUrl, except that generatePublicApiUrl has no need for the domain.
+func generatePublicApiUrl(endpoint string) string {
+	return fmt.Sprintf("%s/%s", apiBase, endpoint)
+}
+
+// generateParameterizedUrl works as generateApiUrl, but supports query parameters.
+func generateParameterizedUrl(m Mailgun, endpoint string, payload simplehttp.Payload) (string, error) {
+	paramBuffer, err := payload.GetPayloadBuffer()
+	if err != nil {
+		return "", err
+	}
+	params := string(paramBuffer.Bytes())
+	return fmt.Sprintf("%s?%s", generateApiUrl(m, eventsEndpoint), params), nil
+}
+
+// parseMailgunTime translates a timestamp as returned by Mailgun into a Go standard timestamp.
+func parseMailgunTime(ts string) (t time.Time, err error) {
+	t, err = time.Parse("Mon, 2 Jan 2006 15:04:05 MST", ts)
+	return
+}
+
+// formatMailgunTime translates a timestamp into a human-readable form.
+func formatMailgunTime(t *time.Time) string {
+	return t.Format("Mon, 2 Jan 2006 15:04:05 -0700")
+}
diff --git a/Godeps/_workspace/src/github.com/mailgun/mailgun-go/mailgun_test.go b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/mailgun_test.go
new file mode 100644
index 00000000..8abc3acd
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/mailgun_test.go
@@ -0,0 +1,68 @@
+package mailgun
+
+import (
+	"strconv"
+	"testing"
+)
+
+const domain = "valid-mailgun-domain"
+const apiKey = "valid-mailgun-api-key"
+const publicApiKey = "valid-mailgun-public-api-key"
+
+func TestMailgun(t *testing.T) {
+	m := NewMailgun(domain, apiKey, publicApiKey)
+
+	if domain != m.Domain() {
+		t.Fatal("Domain not equal!")
+	}
+
+	if apiKey != m.ApiKey() {
+		t.Fatal("ApiKey not equal!")
+	}
+
+	if publicApiKey != m.PublicApiKey() {
+		t.Fatal("PublicApiKey not equal!")
+	}
+}
+
+func TestBounceGetCode(t *testing.T) {
+	b1 := &Bounce{
+		CreatedAt: "blah",
+		code:      123,
+		Address:   "blort",
+		Error:     "bletch",
+	}
+	c, err := b1.GetCode()
+	if err != nil {
+		t.Fatal(err)
+	}
+	if c != 123 {
+		t.Fatal("Expected 123; got ", c)
+	}
+
+	b2 := &Bounce{
+		CreatedAt: "blah",
+		code:      "456",
+		Address:   "blort",
+		Error:     "Bletch",
+	}
+	c, err = b2.GetCode()
+	if err != nil {
+		t.Fatal(err)
+	}
+	if c != 456 {
+		t.Fatal("Expected 456; got ", c)
+	}
+
+	b3 := &Bounce{
+		CreatedAt: "blah",
+		code:      "456H",
+		Address:   "blort",
+		Error:     "Bletch",
+	}
+	c, err = b3.GetCode()
+	e, ok := err.(*strconv.NumError)
+	if !ok && e != nil {
+		t.Fatal("Expected a syntax error in numeric conversion: got ", err)
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/mailgun/mailgun-go/mailing_lists.go b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/mailing_lists.go
new file mode 100644
index 00000000..a640a478
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/mailing_lists.go
@@ -0,0 +1,307 @@
+package mailgun
+
+import (
+	"encoding/json"
+	"fmt"
+	"github.com/mbanzon/simplehttp"
+	"strconv"
+)
+
+// A mailing list may have one of three membership modes.
+// ReadOnly specifies that nobody, including Members,
+// may send messages to the mailing list.
+// Messages distributed on such lists come from list administrator accounts only.
+// Members specifies that only those who subscribe to the mailing list may send messages.
+// Everyone specifies that anyone and everyone may both read and submit messages
+// to the mailing list, including non-subscribers.
+const (
+	ReadOnly = "readonly"
+	Members  = "members"
+	Everyone = "everyone"
+)
+
+// Mailing list members have an attribute that determines if they've subscribed to the mailing list or not.
+// This attribute may be used to filter the results returned by GetSubscribers().
+// All, Subscribed, and Unsubscribed provides a convenient and readable syntax for specifying the scope of the search.
+var (
+	All          *bool = nil
+	Subscribed   *bool = &yes
+	Unsubscribed *bool = &no
+)
+
+// yes and no are variables which provide us the ability to take their addresses.
+// Subscribed and Unsubscribed are pointers to these booleans.
+//
+// We use a pointer to boolean as a kind of trinary data type:
+// if nil, the relevant data type remains unspecified.
+// Otherwise, its value is either true or false.
+var (
+	yes bool = true
+	no  bool = false
+)
+
+// A List structure provides information for a mailing list.
+//
+// AccessLevel may be one of ReadOnly, Members, or Everyone.
+type List struct {
+	Address      string `json:"address",omitempty"`
+	Name         string `json:"name",omitempty"`
+	Description  string `json:"description",omitempty"`
+	AccessLevel  string `json:"access_level",omitempty"`
+	CreatedAt    string `json:"created_at",omitempty"`
+	MembersCount int    `json:"members_count",omitempty"`
+}
+
+// A Member structure represents a member of the mailing list.
+// The Vars field can represent any JSON-encodable data.
+type Member struct {
+	Address    string                 `json:"address,omitempty"`
+	Name       string                 `json:"name,omitempty"`
+	Subscribed *bool                  `json:"subscribed,omitempty"`
+	Vars       map[string]interface{} `json:"vars,omitempty"`
+}
+
+// GetLists returns the specified set of mailing lists administered by your account.
+func (mg *MailgunImpl) GetLists(limit, skip int, filter string) (int, []List, error) {
+	r := simplehttp.NewHTTPRequest(generatePublicApiUrl(listsEndpoint))
+	r.SetBasicAuth(basicAuthUser, mg.ApiKey())
+	p := simplehttp.NewUrlEncodedPayload()
+	if limit != DefaultLimit {
+		p.AddValue("limit", strconv.Itoa(limit))
+	}
+	if skip != DefaultSkip {
+		p.AddValue("skip", strconv.Itoa(skip))
+	}
+	if filter != "" {
+		p.AddValue("address", filter)
+	}
+	var envelope struct {
+		Items      []List `json:"items"`
+		TotalCount int    `json:"total_count"`
+	}
+	response, err := makeRequest(r, "GET", p)
+	if err != nil {
+		return -1, nil, err
+	}
+	err = response.ParseFromJSON(&envelope)
+	return envelope.TotalCount, envelope.Items, err
+}
+
+// CreateList creates a new mailing list under your Mailgun account.
+// You need specify only the Address and Name members of the prototype;
+// Description, and AccessLevel are optional.
+// If unspecified, Description remains blank,
+// while AccessLevel defaults to Everyone.
+func (mg *MailgunImpl) CreateList(prototype List) (List, error) {
+	r := simplehttp.NewHTTPRequest(generatePublicApiUrl(listsEndpoint))
+	r.SetBasicAuth(basicAuthUser, mg.ApiKey())
+	p := simplehttp.NewUrlEncodedPayload()
+	if prototype.Address != "" {
+		p.AddValue("address", prototype.Address)
+	}
+	if prototype.Name != "" {
+		p.AddValue("name", prototype.Name)
+	}
+	if prototype.Description != "" {
+		p.AddValue("description", prototype.Description)
+	}
+	if prototype.AccessLevel != "" {
+		p.AddValue("access_level", prototype.AccessLevel)
+	}
+	response, err := makePostRequest(r, p)
+	if err != nil {
+		return List{}, err
+	}
+	var l List
+	err = response.ParseFromJSON(&l)
+	return l, err
+}
+
+// DeleteList removes all current members of the list, then removes the list itself.
+// Attempts to send e-mail to the list will fail subsequent to this call.
+func (mg *MailgunImpl) DeleteList(addr string) error {
+	r := simplehttp.NewHTTPRequest(generatePublicApiUrl(listsEndpoint) + "/" + addr)
+	r.SetBasicAuth(basicAuthUser, mg.ApiKey())
+	_, err := makeDeleteRequest(r)
+	return err
+}
+
+// GetListByAddress allows your application to recover the complete List structure
+// representing a mailing list, so long as you have its e-mail address.
+func (mg *MailgunImpl) GetListByAddress(addr string) (List, error) {
+	r := simplehttp.NewHTTPRequest(generatePublicApiUrl(listsEndpoint) + "/" + addr)
+	r.SetBasicAuth(basicAuthUser, mg.ApiKey())
+	response, err := makeGetRequest(r)
+	var envelope struct {
+		List `json:"list"`
+	}
+	err = response.ParseFromJSON(&envelope)
+	return envelope.List, err
+}
+
+// UpdateList allows you to change various attributes of a list.
+// Address, Name, Description, and AccessLevel are all optional;
+// only those fields which are set in the prototype will change.
+//
+// Be careful!  If changing the address of a mailing list,
+// e-mail sent to the old address will not succeed.
+// Make sure you account for the change accordingly.
+func (mg *MailgunImpl) UpdateList(addr string, prototype List) (List, error) {
+	r := simplehttp.NewHTTPRequest(generatePublicApiUrl(listsEndpoint) + "/" + addr)
+	r.SetBasicAuth(basicAuthUser, mg.ApiKey())
+	p := simplehttp.NewUrlEncodedPayload()
+	if prototype.Address != "" {
+		p.AddValue("address", prototype.Address)
+	}
+	if prototype.Name != "" {
+		p.AddValue("name", prototype.Name)
+	}
+	if prototype.Description != "" {
+		p.AddValue("description", prototype.Description)
+	}
+	if prototype.AccessLevel != "" {
+		p.AddValue("access_level", prototype.AccessLevel)
+	}
+	var l List
+	response, err := makePutRequest(r, p)
+	if err != nil {
+		return l, err
+	}
+	err = response.ParseFromJSON(&l)
+	return l, err
+}
+
+// GetMembers returns the list of members belonging to the indicated mailing list.
+// The s parameter can be set to one of three settings to help narrow the returned data set:
+// All indicates that you want both Members and unsubscribed members alike, while
+// Subscribed and Unsubscribed indicate you want only those eponymous subsets.
+func (mg *MailgunImpl) GetMembers(limit, skip int, s *bool, addr string) (int, []Member, error) {
+	r := simplehttp.NewHTTPRequest(generateMemberApiUrl(listsEndpoint, addr))
+	r.SetBasicAuth(basicAuthUser, mg.ApiKey())
+	p := simplehttp.NewUrlEncodedPayload()
+	if limit != DefaultLimit {
+		p.AddValue("limit", strconv.Itoa(limit))
+	}
+	if skip != DefaultSkip {
+		p.AddValue("skip", strconv.Itoa(skip))
+	}
+	if s != nil {
+		p.AddValue("subscribed", yesNo(*s))
+	}
+	var envelope struct {
+		TotalCount int      `json:"total_count"`
+		Items      []Member `json:"items"`
+	}
+	response, err := makeRequest(r, "GET", p)
+	if err != nil {
+		return -1, nil, err
+	}
+	err = response.ParseFromJSON(&envelope)
+	return envelope.TotalCount, envelope.Items, err
+}
+
+// GetMemberByAddress returns a complete Member structure for a member of a mailing list,
+// given only their subscription e-mail address.
+func (mg *MailgunImpl) GetMemberByAddress(s, l string) (Member, error) {
+	r := simplehttp.NewHTTPRequest(generateMemberApiUrl(listsEndpoint, l) + "/" + s)
+	r.SetBasicAuth(basicAuthUser, mg.ApiKey())
+	response, err := makeGetRequest(r)
+	if err != nil {
+		return Member{}, err
+	}
+	var envelope struct {
+		Member Member `json:"member"`
+	}
+	err = response.ParseFromJSON(&envelope)
+	return envelope.Member, err
+}
+
+// CreateMember registers a new member of the indicated mailing list.
+// If merge is set to true, then the registration may update an existing Member's settings.
+// Otherwise, an error will occur if you attempt to add a member with a duplicate e-mail address.
+func (mg *MailgunImpl) CreateMember(merge bool, addr string, prototype Member) error {
+	vs, err := json.Marshal(prototype.Vars)
+	if err != nil {
+		return err
+	}
+
+	r := simplehttp.NewHTTPRequest(generateMemberApiUrl(listsEndpoint, addr))
+	r.SetBasicAuth(basicAuthUser, mg.ApiKey())
+	p := simplehttp.NewFormDataPayload()
+	p.AddValue("upsert", yesNo(merge))
+	p.AddValue("address", prototype.Address)
+	p.AddValue("name", prototype.Name)
+	p.AddValue("vars", string(vs))
+	if prototype.Subscribed != nil {
+		p.AddValue("subscribed", yesNo(*prototype.Subscribed))
+	}
+	_, err = makePostRequest(r, p)
+	return err
+}
+
+// UpdateMember lets you change certain details about the indicated mailing list member.
+// Address, Name, Vars, and Subscribed fields may be changed.
+func (mg *MailgunImpl) UpdateMember(s, l string, prototype Member) (Member, error) {
+	r := simplehttp.NewHTTPRequest(generateMemberApiUrl(listsEndpoint, l) + "/" + s)
+	r.SetBasicAuth(basicAuthUser, mg.ApiKey())
+	p := simplehttp.NewFormDataPayload()
+	if prototype.Address != "" {
+		p.AddValue("address", prototype.Address)
+	}
+	if prototype.Name != "" {
+		p.AddValue("name", prototype.Name)
+	}
+	if prototype.Vars != nil {
+		vs, err := json.Marshal(prototype.Vars)
+		if err != nil {
+			return Member{}, err
+		}
+		p.AddValue("vars", string(vs))
+	}
+	if prototype.Subscribed != nil {
+		p.AddValue("subscribed", yesNo(*prototype.Subscribed))
+	}
+	response, err := makePutRequest(r, p)
+	if err != nil {
+		return Member{}, err
+	}
+	var envelope struct {
+		Member Member `json:"member"`
+	}
+	err = response.ParseFromJSON(&envelope)
+	return envelope.Member, err
+}
+
+// DeleteMember removes the member from the list.
+func (mg *MailgunImpl) DeleteMember(member, addr string) error {
+	r := simplehttp.NewHTTPRequest(generateMemberApiUrl(listsEndpoint, addr) + "/" + member)
+	r.SetBasicAuth(basicAuthUser, mg.ApiKey())
+	_, err := makeDeleteRequest(r)
+	return err
+}
+
+// CreateMemberList registers multiple Members and non-Member members to a single mailing list
+// in a single round-trip.
+// s indicates the default subscribed status (Subscribed or Unsubscribed).
+// Use All to elect not to provide a default.
+// The newMembers list can take one of two JSON-encodable forms: an slice of strings, or
+// a slice of Member structures.
+// If a simple slice of strings is passed, each string refers to the member's e-mail address.
+// Otherwise, each Member needs to have at least the Address field filled out.
+// Other fields are optional, but may be set according to your needs.
+func (mg *MailgunImpl) CreateMemberList(s *bool, addr string, newMembers []interface{}) error {
+	r := simplehttp.NewHTTPRequest(generateMemberApiUrl(listsEndpoint, addr) + ".json")
+	r.SetBasicAuth(basicAuthUser, mg.ApiKey())
+	p := simplehttp.NewFormDataPayload()
+	if s != nil {
+		p.AddValue("subscribed", yesNo(*s))
+	}
+	bs, err := json.Marshal(newMembers)
+	if err != nil {
+		return err
+	}
+	fmt.Println(string(bs))
+	p.AddValue("members", string(bs))
+	_, err = makePostRequest(r, p)
+	return err
+}
diff --git a/Godeps/_workspace/src/github.com/mailgun/mailgun-go/messages.go b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/messages.go
new file mode 100644
index 00000000..650502c3
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/messages.go
@@ -0,0 +1,647 @@
+package mailgun
+
+import (
+	"encoding/json"
+	"errors"
+	"io"
+	"time"
+
+	"github.com/mbanzon/simplehttp"
+)
+
+// MaxNumberOfRecipients represents the largest batch of recipients that Mailgun can support in a single API call.
+// This figure includes To:, Cc:, Bcc:, etc. recipients.
+const MaxNumberOfRecipients = 1000
+
+// Message structures contain both the message text and the envelop for an e-mail message.
+type Message struct {
+	to                []string
+	tags              []string
+	campaigns         []string
+	dkim              bool
+	deliveryTime      *time.Time
+	attachments       []string
+	readerAttachments []ReaderAttachment
+	inlines           []string
+
+	testMode           bool
+	tracking           bool
+	trackingClicks     bool
+	trackingOpens      bool
+	headers            map[string]string
+	variables          map[string]string
+	recipientVariables map[string]map[string]interface{}
+
+	dkimSet           bool
+	trackingSet       bool
+	trackingClicksSet bool
+	trackingOpensSet  bool
+
+	specific features
+	mg       Mailgun
+}
+
+type ReaderAttachment struct {
+	Filename   string
+	ReadCloser io.ReadCloser
+}
+
+// StoredMessage structures contain the (parsed) message content for an email
+// sent to a Mailgun account.
+//
+// The MessageHeaders field is special, in that it's formatted as a slice of pairs.
+// Each pair consists of a name [0] and value [1].  Array notation is used instead of a map
+// because that's how it's sent over the wire, and it's how encoding/json expects this field
+// to be.
+type StoredMessage struct {
+	Recipients        string                 `json:"recipients"`
+	Sender            string                 `json:"sender"`
+	From              string                 `json:"from"`
+	Subject           string                 `json:"subject"`
+	BodyPlain         string                 `json:"body-plain"`
+	StrippedText      string                 `json:"stripped-text"`
+	StrippedSignature string                 `json:"stripped-signature"`
+	BodyHtml          string                 `json:"body-html"`
+	StrippedHtml      string                 `json:"stripped-html"`
+	Attachments       []StoredAttachment     `json:"attachments"`
+	MessageUrl        string                 `json:"message-url"`
+	ContentIDMap      map[string]interface{} `json:"content-id-map"`
+	MessageHeaders    [][]string             `json:"message-headers"`
+}
+
+// StoredAttachment structures contain information on an attachment associated with a stored message.
+type StoredAttachment struct {
+	Size        int    `json:"size"`
+	Url         string `json:"url"`
+	Name        string `json:"name"`
+	ContentType string `json:"content-type"`
+}
+
+type StoredMessageRaw struct {
+	Recipients string `json:"recipients"`
+	Sender     string `json:"sender"`
+	From       string `json:"from"`
+	Subject    string `json:"subject"`
+	BodyMime   string `json:"body-mime"`
+}
+
+// plainMessage contains fields relevant to plain API-synthesized messages.
+// You're expected to use various setters to set most of these attributes,
+// although from, subject, and text are set when the message is created with
+// NewMessage.
+type plainMessage struct {
+	from    string
+	cc      []string
+	bcc     []string
+	subject string
+	text    string
+	html    string
+}
+
+// mimeMessage contains fields relevant to pre-packaged MIME messages.
+type mimeMessage struct {
+	body io.ReadCloser
+}
+
+type sendMessageResponse struct {
+	Message string `json:"message"`
+	Id      string `json:"id"`
+}
+
+// features abstracts the common characteristics between regular and MIME messages.
+// addCC, addBCC, recipientCount, and setHTML are invoked via the package-global AddCC, AddBCC,
+// RecipientCount, and SetHtml calls, as these functions are ignored for MIME messages.
+// Send() invokes addValues to add message-type-specific MIME headers for the API call
+// to Mailgun.  isValid yeilds true if and only if the message is valid enough for sending
+// through the API.  Finally, endpoint() tells Send() which endpoint to use to submit the API call.
+type features interface {
+	addCC(string)
+	addBCC(string)
+	setHtml(string)
+	addValues(*simplehttp.FormDataPayload)
+	isValid() bool
+	endpoint() string
+	recipientCount() int
+}
+
+// NewMessage returns a new e-mail message with the simplest envelop needed to send.
+//
+// DEPRECATED.
+// The package will panic if you use AddRecipient(), AddBcc(), AddCc(), et. al.
+// on a message already equipped with MaxNumberOfRecipients recipients.
+// Use Mailgun.NewMessage() instead.
+// It works similarly to this function, but supports larger lists of recipients.
+func NewMessage(from string, subject string, text string, to ...string) *Message {
+	return &Message{
+		specific: &plainMessage{
+			from:    from,
+			subject: subject,
+			text:    text,
+		},
+		to: to,
+	}
+}
+
+// NewMessage returns a new e-mail message with the simplest envelop needed to send.
+//
+// Unlike the global function,
+// this method supports arbitrary-sized recipient lists by
+// automatically sending mail in batches of up to MaxNumberOfRecipients.
+//
+// To support batch sending, you don't want to provide a fixed To: header at this point.
+// Pass nil as the to parameter to skip adding the To: header at this stage.
+// You can do this explicitly, or implicitly, as follows:
+//
+//     // Note absence of To parameter(s)!
+//     m := mg.NewMessage("me@example.com", "Help save our planet", "Hello world!")
+//
+// Note that you'll need to invoke the AddRecipientAndVariables or AddRecipient method
+// before sending, though.
+func (mg *MailgunImpl) NewMessage(from, subject, text string, to ...string) *Message {
+	return &Message{
+		specific: &plainMessage{
+			from:    from,
+			subject: subject,
+			text:    text,
+		},
+		to: to,
+		mg: mg,
+	}
+}
+
+// NewMIMEMessage creates a new MIME message.  These messages are largely canned;
+// you do not need to invoke setters to set message-related headers.
+// However, you do still need to call setters for Mailgun-specific settings.
+//
+// DEPRECATED.
+// The package will panic if you use AddRecipient(), AddBcc(), AddCc(), et. al.
+// on a message already equipped with MaxNumberOfRecipients recipients.
+// Use Mailgun.NewMIMEMessage() instead.
+// It works similarly to this function, but supports larger lists of recipients.
+func NewMIMEMessage(body io.ReadCloser, to ...string) *Message {
+	return &Message{
+		specific: &mimeMessage{
+			body: body,
+		},
+		to: to,
+	}
+}
+
+// NewMIMEMessage creates a new MIME message.  These messages are largely canned;
+// you do not need to invoke setters to set message-related headers.
+// However, you do still need to call setters for Mailgun-specific settings.
+//
+// Unlike the global function,
+// this method supports arbitrary-sized recipient lists by
+// automatically sending mail in batches of up to MaxNumberOfRecipients.
+//
+// To support batch sending, you don't want to provide a fixed To: header at this point.
+// Pass nil as the to parameter to skip adding the To: header at this stage.
+// You can do this explicitly, or implicitly, as follows:
+//
+//     // Note absence of To parameter(s)!
+//     m := mg.NewMessage("me@example.com", "Help save our planet", "Hello world!")
+//
+// Note that you'll need to invoke the AddRecipientAndVariables or AddRecipient method
+// before sending, though.
+func (mg *MailgunImpl) NewMIMEMessage(body io.ReadCloser, to ...string) *Message {
+	return &Message{
+		specific: &mimeMessage{
+			body: body,
+		},
+		to: to,
+		mg: mg,
+	}
+}
+
+// AddReaderAttachment arranges to send a file along with the e-mail message.
+// File contents are read from a io.ReadCloser.
+// The filename parameter is the resulting filename of the attachment.
+// The readCloser parameter is the io.ReadCloser which reads the actual bytes to be used
+// as the contents of the attached file.
+func (m *Message) AddReaderAttachment(filename string, readCloser io.ReadCloser) {
+	ra := ReaderAttachment{Filename: filename, ReadCloser: readCloser}
+	m.readerAttachments = append(m.readerAttachments, ra)
+}
+
+// AddAttachment arranges to send a file from the filesystem along with the e-mail message.
+// The attachment parameter is a filename, which must refer to a file which actually resides
+// in the local filesystem.
+func (m *Message) AddAttachment(attachment string) {
+	m.attachments = append(m.attachments, attachment)
+}
+
+// AddInline arranges to send a file along with the e-mail message, but does so
+// in a way that its data remains "inline" with the rest of the message.  This
+// can be used to send image or font data along with an HTML-encoded message body.
+// The attachment parameter is a filename, which must refer to a file which actually resides
+// in the local filesystem.
+func (m *Message) AddInline(inline string) {
+	m.inlines = append(m.inlines, inline)
+}
+
+// AddRecipient appends a receiver to the To: header of a message.
+//
+// NOTE: Above a certain limit (currently 1000 recipients),
+// this function will cause the message as it's currently defined to be sent.
+// This allows you to support large mailing lists without running into Mailgun's API limitations.
+func (m *Message) AddRecipient(recipient string) error {
+	return m.AddRecipientAndVariables(recipient, nil)
+}
+
+// AddRecipientAndVariables appends a receiver to the To: header of a message,
+// and as well attaches a set of variables relevant for this recipient.
+//
+// NOTE: Above a certain limit (see MaxNumberOfRecipients),
+// this function will cause the message as it's currently defined to be sent.
+// This allows you to support large mailing lists without running into Mailgun's API limitations.
+func (m *Message) AddRecipientAndVariables(r string, vars map[string]interface{}) error {
+	if m.RecipientCount() >= MaxNumberOfRecipients {
+		_, _, err := m.send()
+		if err != nil {
+			return err
+		}
+		m.to = make([]string, len(m.to))
+		m.recipientVariables = make(map[string]map[string]interface{}, len(m.recipientVariables))
+	}
+	m.to = append(m.to, r)
+	if vars != nil {
+		if m.recipientVariables == nil {
+			m.recipientVariables = make(map[string]map[string]interface{})
+		}
+		m.recipientVariables[r] = vars
+	}
+	return nil
+}
+
+// RecipientCount returns the total number of recipients for the message.
+// This includes To:, Cc:, and Bcc: fields.
+//
+// NOTE: At present, this method is reliable only for non-MIME messages, as the
+// Bcc: and Cc: fields are easily accessible.
+// For MIME messages, only the To: field is considered.
+// A fix for this issue is planned for a future release.
+// For now, MIME messages are always assumed to have 10 recipients between Cc: and Bcc: fields.
+// If your MIME messages have more than 10 non-To: field recipients,
+// you may find that some recipients will not receive your e-mail.
+// It's perfectly OK, of course, for a MIME message to not have any Cc: or Bcc: recipients.
+func (m *Message) RecipientCount() int {
+	return len(m.to) + m.specific.recipientCount()
+}
+
+func (pm *plainMessage) recipientCount() int {
+	return len(pm.bcc) + len(pm.cc)
+}
+
+func (mm *mimeMessage) recipientCount() int {
+	return 10
+}
+
+func (m *Message) send() (string, string, error) {
+	return m.mg.Send(m)
+}
+
+// AddCC appends a receiver to the carbon-copy header of a message.
+func (m *Message) AddCC(recipient string) {
+	m.specific.addCC(recipient)
+}
+
+func (pm *plainMessage) addCC(r string) {
+	pm.cc = append(pm.cc, r)
+}
+
+func (mm *mimeMessage) addCC(_ string) {}
+
+// AddBCC appends a receiver to the blind-carbon-copy header of a message.
+func (m *Message) AddBCC(recipient string) {
+	m.specific.addBCC(recipient)
+}
+
+func (pm *plainMessage) addBCC(r string) {
+	pm.bcc = append(pm.bcc, r)
+}
+
+func (mm *mimeMessage) addBCC(_ string) {}
+
+// If you're sending a message that isn't already MIME encoded, SetHtml() will arrange to bundle
+// an HTML representation of your message in addition to your plain-text body.
+func (m *Message) SetHtml(html string) {
+	m.specific.setHtml(html)
+}
+
+func (pm *plainMessage) setHtml(h string) {
+	pm.html = h
+}
+
+func (mm *mimeMessage) setHtml(_ string) {}
+
+// AddTag attaches a tag to the message.  Tags are useful for metrics gathering and event tracking purposes.
+// Refer to the Mailgun documentation for further details.
+func (m *Message) AddTag(tag string) {
+	m.tags = append(m.tags, tag)
+}
+
+// This feature is deprecated for new software.
+func (m *Message) AddCampaign(campaign string) {
+	m.campaigns = append(m.campaigns, campaign)
+}
+
+// SetDKIM arranges to send the o:dkim header with the message, and sets its value accordingly.
+// Refer to the Mailgun documentation for more information.
+func (m *Message) SetDKIM(dkim bool) {
+	m.dkim = dkim
+	m.dkimSet = true
+}
+
+// EnableTestMode allows submittal of a message, such that it will be discarded by Mailgun.
+// This facilitates testing client-side software without actually consuming e-mail resources.
+func (m *Message) EnableTestMode() {
+	m.testMode = true
+}
+
+// SetDeliveryTime schedules the message for transmission at the indicated time.
+// Pass nil to remove any installed schedule.
+// Refer to the Mailgun documentation for more information.
+func (m *Message) SetDeliveryTime(dt time.Time) {
+	pdt := new(time.Time)
+	*pdt = dt
+	m.deliveryTime = pdt
+}
+
+// SetTracking sets the o:tracking message parameter to adjust, on a message-by-message basis,
+// whether or not Mailgun will rewrite URLs to facilitate event tracking.
+// Events tracked includes opens, clicks, unsubscribes, etc.
+// Note: simply calling this method ensures that the o:tracking header is passed in with the message.
+// Its yes/no setting is determined by the call's parameter.
+// Note that this header is not passed on to the final recipient(s).
+// Refer to the Mailgun documentation for more information.
+func (m *Message) SetTracking(tracking bool) {
+	m.tracking = tracking
+	m.trackingSet = true
+}
+
+// Refer to the Mailgun documentation for more information.
+func (m *Message) SetTrackingClicks(trackingClicks bool) {
+	m.trackingClicks = trackingClicks
+	m.trackingClicksSet = true
+}
+
+// Refer to the Mailgun documentation for more information.
+func (m *Message) SetTrackingOpens(trackingOpens bool) {
+	m.trackingOpens = trackingOpens
+	m.trackingOpensSet = true
+}
+
+// AddHeader allows you to send custom MIME headers with the message.
+func (m *Message) AddHeader(header, value string) {
+	if m.headers == nil {
+		m.headers = make(map[string]string)
+	}
+	m.headers[header] = value
+}
+
+// AddVariable lets you associate a set of variables with messages you send,
+// which Mailgun can use to, in essence, complete form-mail.
+// Refer to the Mailgun documentation for more information.
+func (m *Message) AddVariable(variable string, value interface{}) error {
+	j, err := json.Marshal(value)
+	if err != nil {
+		return err
+	}
+	if m.variables == nil {
+		m.variables = make(map[string]string)
+	}
+	m.variables[variable] = string(j)
+	return nil
+}
+
+// Send attempts to queue a message (see Message, NewMessage, and its methods) for delivery.
+// It returns the Mailgun server response, which consists of two components:
+// a human-readable status message, and a message ID.  The status and message ID are set only
+// if no error occurred.
+func (m *MailgunImpl) Send(message *Message) (mes string, id string, err error) {
+	if !isValid(message) {
+		err = errors.New("Message not valid")
+	} else {
+		payload := simplehttp.NewFormDataPayload()
+
+		message.specific.addValues(payload)
+		for _, to := range message.to {
+			payload.AddValue("to", to)
+		}
+		for _, tag := range message.tags {
+			payload.AddValue("o:tag", tag)
+		}
+		for _, campaign := range message.campaigns {
+			payload.AddValue("o:campaign", campaign)
+		}
+		if message.dkimSet {
+			payload.AddValue("o:dkim", yesNo(message.dkim))
+		}
+		if message.deliveryTime != nil {
+			payload.AddValue("o:deliverytime", formatMailgunTime(message.deliveryTime))
+		}
+		if message.testMode {
+			payload.AddValue("o:testmode", "yes")
+		}
+		if message.trackingSet {
+			payload.AddValue("o:tracking", yesNo(message.tracking))
+		}
+		if message.trackingClicksSet {
+			payload.AddValue("o:tracking-clicks", yesNo(message.trackingClicks))
+		}
+		if message.trackingOpensSet {
+			payload.AddValue("o:tracking-opens", yesNo(message.trackingOpens))
+		}
+		if message.headers != nil {
+			for header, value := range message.headers {
+				payload.AddValue("h:"+header, value)
+			}
+		}
+		if message.variables != nil {
+			for variable, value := range message.variables {
+				payload.AddValue("v:"+variable, value)
+			}
+		}
+		if message.recipientVariables != nil {
+			j, err := json.Marshal(message.recipientVariables)
+			if err != nil {
+				return "", "", err
+			}
+			payload.AddValue("recipient-variables", string(j))
+		}
+		if message.attachments != nil {
+			for _, attachment := range message.attachments {
+				payload.AddFile("attachment", attachment)
+			}
+		}
+		if message.readerAttachments != nil {
+			for _, readerAttachment := range message.readerAttachments {
+				payload.AddReadCloser("attachment", readerAttachment.Filename, readerAttachment.ReadCloser)
+			}
+		}
+		if message.inlines != nil {
+			for _, inline := range message.inlines {
+				payload.AddFile("inline", inline)
+			}
+		}
+
+		r := simplehttp.NewHTTPRequest(generateApiUrl(m, message.specific.endpoint()))
+		r.SetBasicAuth(basicAuthUser, m.ApiKey())
+
+		var response sendMessageResponse
+		err = postResponseFromJSON(r, payload, &response)
+		if err == nil {
+			mes = response.Message
+			id = response.Id
+		}
+	}
+
+	return
+}
+
+func (pm *plainMessage) addValues(p *simplehttp.FormDataPayload) {
+	p.AddValue("from", pm.from)
+	p.AddValue("subject", pm.subject)
+	p.AddValue("text", pm.text)
+	for _, cc := range pm.cc {
+		p.AddValue("cc", cc)
+	}
+	for _, bcc := range pm.bcc {
+		p.AddValue("bcc", bcc)
+	}
+	if pm.html != "" {
+		p.AddValue("html", pm.html)
+	}
+}
+
+func (mm *mimeMessage) addValues(p *simplehttp.FormDataPayload) {
+	p.AddReadCloser("message", "message.mime", mm.body)
+}
+
+func (pm *plainMessage) endpoint() string {
+	return messagesEndpoint
+}
+
+func (mm *mimeMessage) endpoint() string {
+	return mimeMessagesEndpoint
+}
+
+// yesNo translates a true/false boolean value into a yes/no setting suitable for the Mailgun API.
+func yesNo(b bool) string {
+	if b {
+		return "yes"
+	} else {
+		return "no"
+	}
+}
+
+// isValid returns true if, and only if,
+// a Message instance is sufficiently initialized to send via the Mailgun interface.
+func isValid(m *Message) bool {
+	if m == nil {
+		return false
+	}
+
+	if !m.specific.isValid() {
+		return false
+	}
+
+	if !validateStringList(m.to, true) {
+		return false
+	}
+
+	if !validateStringList(m.tags, false) {
+		return false
+	}
+
+	if !validateStringList(m.campaigns, false) || len(m.campaigns) > 3 {
+		return false
+	}
+
+	return true
+}
+
+func (pm *plainMessage) isValid() bool {
+	if pm.from == "" {
+		return false
+	}
+
+	if !validateStringList(pm.cc, false) {
+		return false
+	}
+
+	if !validateStringList(pm.bcc, false) {
+		return false
+	}
+
+	if pm.text == "" {
+		return false
+	}
+
+	return true
+}
+
+func (mm *mimeMessage) isValid() bool {
+	return mm.body != nil
+}
+
+// validateStringList returns true if, and only if,
+// a slice of strings exists AND all of its elements exist,
+// OR if the slice doesn't exist AND it's not required to exist.
+// The requireOne parameter indicates whether the list is required to exist.
+func validateStringList(list []string, requireOne bool) bool {
+	hasOne := false
+
+	if list == nil {
+		return !requireOne
+	} else {
+		for _, a := range list {
+			if a == "" {
+				return false
+			} else {
+				hasOne = hasOne || true
+			}
+		}
+	}
+
+	return hasOne
+}
+
+// GetStoredMessage retrieves information about a received e-mail message.
+// This provides visibility into, e.g., replies to a message sent to a mailing list.
+func (mg *MailgunImpl) GetStoredMessage(id string) (StoredMessage, error) {
+	url := generateStoredMessageUrl(mg, messagesEndpoint, id)
+	r := simplehttp.NewHTTPRequest(url)
+	r.SetBasicAuth(basicAuthUser, mg.ApiKey())
+
+	var response StoredMessage
+	err := getResponseFromJSON(r, &response)
+	return response, err
+}
+
+// GetStoredMessageRaw retrieves the raw MIME body of a received e-mail message.
+// Compared to GetStoredMessage, it gives access to the unparsed MIME body, and
+// thus delegates to the caller the required parsing.
+func (mg *MailgunImpl) GetStoredMessageRaw(id string) (StoredMessageRaw, error) {
+	url := generateStoredMessageUrl(mg, messagesEndpoint, id)
+	r := simplehttp.NewHTTPRequest(url)
+	r.SetBasicAuth(basicAuthUser, mg.ApiKey())
+	r.AddHeader("Accept", "message/rfc2822")
+
+	var response StoredMessageRaw
+	err := getResponseFromJSON(r, &response)
+	return response, err
+
+}
+
+// DeleteStoredMessage removes a previously stored message.
+// Note that Mailgun institutes a policy of automatically deleting messages after a set time.
+// Consult the current Mailgun API documentation for more details.
+func (mg *MailgunImpl) DeleteStoredMessage(id string) error {
+	url := generateStoredMessageUrl(mg, messagesEndpoint, id)
+	r := simplehttp.NewHTTPRequest(url)
+	r.SetBasicAuth(basicAuthUser, mg.ApiKey())
+	_, err := makeDeleteRequest(r)
+	return err
+}
diff --git a/Godeps/_workspace/src/github.com/mailgun/mailgun-go/rest_shim.go b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/rest_shim.go
new file mode 100644
index 00000000..29279e05
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/rest_shim.go
@@ -0,0 +1,152 @@
+package mailgun
+
+import (
+	"fmt"
+	"github.com/mbanzon/simplehttp"
+)
+
+// The MailgunGoUserAgent identifies the client to the server, for logging purposes.
+// In the event of problems requiring a human administrator's assistance,
+// this user agent allows them to identify the client from human-generated activity.
+const MailgunGoUserAgent = "mailgun-go/1.0.0"
+
+// This error will be returned whenever a Mailgun API returns an error response.
+// Your application can check the Actual field to see the actual HTTP response code returned.
+// URL contains the base URL accessed, sans any query parameters.
+type UnexpectedResponseError struct {
+	Expected []int
+	Actual   int
+	URL      string
+}
+
+// String() converts the error into a human-readable, logfmt-compliant string.
+// See http://godoc.org/github.com/kr/logfmt for details on logfmt formatting.
+func (e *UnexpectedResponseError) String() string {
+	return fmt.Sprintf("UnexpectedResponseError URL=%s ExpectedOneOf=%#v Got=%d", e.URL, e.Expected, e.Actual)
+}
+
+// Error() performs as String().
+func (e *UnexpectedResponseError) Error() string {
+	return e.String()
+}
+
+// newError creates a new error condition to be returned.
+func newError(url string, expected []int, got int) error {
+	return &UnexpectedResponseError{
+		URL:      url,
+		Expected: expected,
+		Actual:   got,
+	}
+}
+
+// notGood searches a list of response codes (the haystack) for a matching entry (the needle).
+// If found, the response code is considered good, and thus false is returned.
+// Otherwise true is returned.
+func notGood(needle int, haystack []int) bool {
+	for _, i := range haystack {
+		if needle == i {
+			return false
+		}
+	}
+	return true
+}
+
+// expected denotes the expected list of known-good HTTP response codes possible from the Mailgun API.
+var expected = []int{200, 202, 204}
+
+// makeRequest shim performs a generic request, checking for a positive outcome.
+// See simplehttp.MakeRequest for more details.
+func makeRequest(r *simplehttp.HTTPRequest, kind string, p simplehttp.Payload) (*simplehttp.HTTPResponse, error) {
+	r.AddHeader("User-Agent", MailgunGoUserAgent)
+	rsp, err := r.MakeRequest(kind, p)
+	if (err == nil) && notGood(rsp.Code, expected) {
+		return rsp, newError(r.URL, expected, rsp.Code)
+	}
+	return rsp, err
+}
+
+// getResponseFromJSON shim performs a GET request, checking for a positive outcome.
+// See simplehttp.GetResponseFromJSON for more details.
+func getResponseFromJSON(r *simplehttp.HTTPRequest, v interface{}) error {
+	r.AddHeader("User-Agent", MailgunGoUserAgent)
+	response, err := r.MakeGetRequest()
+	if err != nil {
+		return err
+	}
+	if notGood(response.Code, expected) {
+		return newError(r.URL, expected, response.Code)
+	}
+	return response.ParseFromJSON(v)
+}
+
+// postResponseFromJSON shim performs a POST request, checking for a positive outcome.
+// See simplehttp.PostResponseFromJSON for more details.
+func postResponseFromJSON(r *simplehttp.HTTPRequest, p simplehttp.Payload, v interface{}) error {
+	r.AddHeader("User-Agent", MailgunGoUserAgent)
+	response, err := r.MakePostRequest(p)
+	if err != nil {
+		return err
+	}
+	if notGood(response.Code, expected) {
+		return newError(r.URL, expected, response.Code)
+	}
+	return response.ParseFromJSON(v)
+}
+
+// putResponseFromJSON shim performs a PUT request, checking for a positive outcome.
+// See simplehttp.PutResponseFromJSON for more details.
+func putResponseFromJSON(r *simplehttp.HTTPRequest, p simplehttp.Payload, v interface{}) error {
+	r.AddHeader("User-Agent", MailgunGoUserAgent)
+	response, err := r.MakePutRequest(p)
+	if err != nil {
+		return err
+	}
+	if notGood(response.Code, expected) {
+		return newError(r.URL, expected, response.Code)
+	}
+	return response.ParseFromJSON(v)
+}
+
+// makeGetRequest shim performs a GET request, checking for a positive outcome.
+// See simplehttp.MakeGetRequest for more details.
+func makeGetRequest(r *simplehttp.HTTPRequest) (*simplehttp.HTTPResponse, error) {
+	r.AddHeader("User-Agent", MailgunGoUserAgent)
+	rsp, err := r.MakeGetRequest()
+	if (err == nil) && notGood(rsp.Code, expected) {
+		return rsp, newError(r.URL, expected, rsp.Code)
+	}
+	return rsp, err
+}
+
+// makePostRequest shim performs a POST request, checking for a positive outcome.
+// See simplehttp.MakePostRequest for more details.
+func makePostRequest(r *simplehttp.HTTPRequest, p simplehttp.Payload) (*simplehttp.HTTPResponse, error) {
+	r.AddHeader("User-Agent", MailgunGoUserAgent)
+	rsp, err := r.MakePostRequest(p)
+	if (err == nil) && notGood(rsp.Code, expected) {
+		return rsp, newError(r.URL, expected, rsp.Code)
+	}
+	return rsp, err
+}
+
+// makePutRequest shim performs a PUT request, checking for a positive outcome.
+// See simplehttp.MakePutRequest for more details.
+func makePutRequest(r *simplehttp.HTTPRequest, p simplehttp.Payload) (*simplehttp.HTTPResponse, error) {
+	r.AddHeader("User-Agent", MailgunGoUserAgent)
+	rsp, err := r.MakePutRequest(p)
+	if (err == nil) && notGood(rsp.Code, expected) {
+		return rsp, newError(r.URL, expected, rsp.Code)
+	}
+	return rsp, err
+}
+
+// makeDeleteRequest shim performs a DELETE request, checking for a positive outcome.
+// See simplehttp.MakeDeleteRequest for more details.
+func makeDeleteRequest(r *simplehttp.HTTPRequest) (*simplehttp.HTTPResponse, error) {
+	r.AddHeader("User-Agent", MailgunGoUserAgent)
+	rsp, err := r.MakeDeleteRequest()
+	if (err == nil) && notGood(rsp.Code, expected) {
+		return rsp, newError(r.URL, expected, rsp.Code)
+	}
+	return rsp, err
+}
diff --git a/Godeps/_workspace/src/github.com/mailgun/mailgun-go/routes.go b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/routes.go
new file mode 100644
index 00000000..3fde0981
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/routes.go
@@ -0,0 +1,127 @@
+package mailgun
+
+import (
+	"github.com/mbanzon/simplehttp"
+	"strconv"
+)
+
+// A Route structure contains information on a configured or to-be-configured route.
+// The Priority field indicates how soon the route works relative to other configured routes.
+// Routes of equal priority are consulted in chronological order.
+// The Description field provides a human-readable description for the route.
+// Mailgun ignores this field except to provide the description when viewing the Mailgun web control panel.
+// The Expression field lets you specify a pattern to match incoming messages against.
+// The Actions field contains strings specifying what to do
+// with any message which matches the provided expression.
+// The CreatedAt field provides a time-stamp for when the route came into existence.
+// Finally, the ID field provides a unique identifier for this route.
+//
+// When creating a new route, the SDK only uses a subset of the fields of this structure.
+// In particular, CreatedAt and ID are meaningless in this context, and will be ignored.
+// Only Priority, Description, Expression, and Actions need be provided.
+type Route struct {
+	Priority    int      `json:"priority,omitempty"`
+	Description string   `json:"description,omitempty"`
+	Expression  string   `json:"expression,omitempty"`
+	Actions     []string `json:"actions,omitempty"`
+
+	CreatedAt string `json:"created_at,omitempty"`
+	ID        string `json:"id,omitempty"`
+}
+
+// GetRoutes returns the complete set of routes configured for your domain.
+// You use routes to configure how to handle returned messages, or
+// messages sent to a specfic address on your domain.
+// See the Mailgun documentation for more information.
+func (mg *MailgunImpl) GetRoutes(limit, skip int) (int, []Route, error) {
+	r := simplehttp.NewHTTPRequest(generatePublicApiUrl(routesEndpoint))
+	if limit != DefaultLimit {
+		r.AddParameter("limit", strconv.Itoa(limit))
+	}
+	if skip != DefaultSkip {
+		r.AddParameter("skip", strconv.Itoa(skip))
+	}
+	r.SetBasicAuth(basicAuthUser, mg.ApiKey())
+
+	var envelope struct {
+		TotalCount int     `json:"total_count"`
+		Items      []Route `json:"items"`
+	}
+	err := getResponseFromJSON(r, &envelope)
+	if err != nil {
+		return -1, nil, err
+	}
+	return envelope.TotalCount, envelope.Items, nil
+}
+
+// CreateRoute installs a new route for your domain.
+// The route structure you provide serves as a template, and
+// only a subset of the fields influence the operation.
+// See the Route structure definition for more details.
+func (mg *MailgunImpl) CreateRoute(prototype Route) (Route, error) {
+	r := simplehttp.NewHTTPRequest(generatePublicApiUrl(routesEndpoint))
+	r.SetBasicAuth(basicAuthUser, mg.ApiKey())
+	p := simplehttp.NewUrlEncodedPayload()
+	p.AddValue("priority", strconv.Itoa(prototype.Priority))
+	p.AddValue("description", prototype.Description)
+	p.AddValue("expression", prototype.Expression)
+	for _, action := range prototype.Actions {
+		p.AddValue("action", action)
+	}
+	var envelope struct {
+		Message string `json:"message"`
+		*Route  `json:"route"`
+	}
+	err := postResponseFromJSON(r, p, &envelope)
+	return *envelope.Route, err
+}
+
+// DeleteRoute removes the specified route from your domain's configuration.
+// To avoid ambiguity, Mailgun identifies the route by unique ID.
+// See the Route structure definition and the Mailgun API documentation for more details.
+func (mg *MailgunImpl) DeleteRoute(id string) error {
+	r := simplehttp.NewHTTPRequest(generatePublicApiUrl(routesEndpoint) + "/" + id)
+	r.SetBasicAuth(basicAuthUser, mg.ApiKey())
+	_, err := makeDeleteRequest(r)
+	return err
+}
+
+// GetRouteByID retrieves the complete route definition associated with the unique route ID.
+func (mg *MailgunImpl) GetRouteByID(id string) (Route, error) {
+	r := simplehttp.NewHTTPRequest(generatePublicApiUrl(routesEndpoint) + "/" + id)
+	r.SetBasicAuth(basicAuthUser, mg.ApiKey())
+	var envelope struct {
+		Message string `json:"message"`
+		*Route  `json:"route"`
+	}
+	err := getResponseFromJSON(r, &envelope)
+	return *envelope.Route, err
+}
+
+// UpdateRoute provides an "in-place" update of the specified route.
+// Only those route fields which are non-zero or non-empty are updated.
+// All other fields remain as-is.
+func (mg *MailgunImpl) UpdateRoute(id string, route Route) (Route, error) {
+	r := simplehttp.NewHTTPRequest(generatePublicApiUrl(routesEndpoint) + "/" + id)
+	r.SetBasicAuth(basicAuthUser, mg.ApiKey())
+	p := simplehttp.NewUrlEncodedPayload()
+	if route.Priority != 0 {
+		p.AddValue("priority", strconv.Itoa(route.Priority))
+	}
+	if route.Description != "" {
+		p.AddValue("description", route.Description)
+	}
+	if route.Expression != "" {
+		p.AddValue("expression", route.Expression)
+	}
+	if route.Actions != nil {
+		for _, action := range route.Actions {
+			p.AddValue("action", action)
+		}
+	}
+	// For some reason, this API function just returns a bare Route on success.
+	// Unsure why this is the case; it seems like it ought to be a bug.
+	var envelope Route
+	err := putResponseFromJSON(r, p, &envelope)
+	return envelope, err
+}
diff --git a/Godeps/_workspace/src/github.com/mailgun/mailgun-go/spam_complaints.go b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/spam_complaints.go
new file mode 100644
index 00000000..48d1cf35
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/spam_complaints.go
@@ -0,0 +1,78 @@
+package mailgun
+
+import (
+	"github.com/mbanzon/simplehttp"
+	"strconv"
+)
+
+const (
+	complaintsEndpoint = "complaints"
+)
+
+// Complaint structures track how many times one of your emails have been marked as spam.
+// CreatedAt indicates when the first report arrives from a given recipient, identified by Address.
+// Count provides a running counter of how many times
+// the recipient thought your messages were not solicited.
+type Complaint struct {
+	Count     int    `json:"count"`
+	CreatedAt string `json:"created_at"`
+	Address   string `json:"address"`
+}
+
+type complaintsEnvelope struct {
+	TotalCount int         `json:"total_count"`
+	Items      []Complaint `json:"items"`
+}
+
+// GetComplaints returns a set of spam complaints registered against your domain.
+// Recipients of your messages can click on a link which sends feedback to Mailgun
+// indicating that the message they received is, to them, spam.
+func (m *MailgunImpl) GetComplaints(limit, skip int) (int, []Complaint, error) {
+	r := simplehttp.NewHTTPRequest(generateApiUrl(m, complaintsEndpoint))
+	r.SetBasicAuth(basicAuthUser, m.ApiKey())
+
+	if limit != -1 {
+		r.AddParameter("limit", strconv.Itoa(limit))
+	}
+	if skip != -1 {
+		r.AddParameter("skip", strconv.Itoa(skip))
+	}
+
+	var envelope complaintsEnvelope
+	err := getResponseFromJSON(r, &envelope)
+	if err != nil {
+		return -1, nil, err
+	}
+	return envelope.TotalCount, envelope.Items, nil
+}
+
+// GetSingleComplaint returns a single complaint record filed by a recipient at the email address provided.
+// If no complaint exists, the Complaint instance returned will be empty.
+func (m *MailgunImpl) GetSingleComplaint(address string) (Complaint, error) {
+	r := simplehttp.NewHTTPRequest(generateApiUrl(m, complaintsEndpoint) + "/" + address)
+	r.SetBasicAuth(basicAuthUser, m.ApiKey())
+
+	var c Complaint
+	err := getResponseFromJSON(r, &c)
+	return c, err
+}
+
+// CreateComplaint registers the specified address as a recipient who has complained of receiving spam
+// from your domain.
+func (m *MailgunImpl) CreateComplaint(address string) error {
+	r := simplehttp.NewHTTPRequest(generateApiUrl(m, complaintsEndpoint))
+	r.SetBasicAuth(basicAuthUser, m.ApiKey())
+	p := simplehttp.NewUrlEncodedPayload()
+	p.AddValue("address", address)
+	_, err := makePostRequest(r, p)
+	return err
+}
+
+// DeleteComplaint removes a previously registered e-mail address from the list of people who complained
+// of receiving spam from your domain.
+func (m *MailgunImpl) DeleteComplaint(address string) error {
+	r := simplehttp.NewHTTPRequest(generateApiUrl(m, complaintsEndpoint) + "/" + address)
+	r.SetBasicAuth(basicAuthUser, m.ApiKey())
+	_, err := makeDeleteRequest(r)
+	return err
+}
diff --git a/Godeps/_workspace/src/github.com/mailgun/mailgun-go/stats.go b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/stats.go
new file mode 100644
index 00000000..8cccf3c2
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/stats.go
@@ -0,0 +1,59 @@
+package mailgun
+
+import (
+	"github.com/mbanzon/simplehttp"
+	"strconv"
+	"time"
+)
+
+type Stat struct {
+	Event      string         `json:"event"`
+	TotalCount int            `json:"total_count"`
+	CreatedAt  string         `json:"created_at"`
+	Id         string         `json:"id"`
+	Tags       map[string]int `json:"tags"`
+}
+
+type statsEnvelope struct {
+	TotalCount int    `json:"total_count"`
+	Items      []Stat `json:"items"`
+}
+
+// GetStats returns a basic set of statistics for different events.
+// Events start at the given start date, if one is provided.
+// If not, this function will consider all stated events dating to the creation of the sending domain.
+func (m *MailgunImpl) GetStats(limit int, skip int, startDate *time.Time, event ...string) (int, []Stat, error) {
+	r := simplehttp.NewHTTPRequest(generateApiUrl(m, statsEndpoint))
+
+	if limit != -1 {
+		r.AddParameter("limit", strconv.Itoa(limit))
+	}
+	if skip != -1 {
+		r.AddParameter("skip", strconv.Itoa(skip))
+	}
+
+	if startDate != nil {
+		r.AddParameter("start-date", startDate.Format(time.RFC3339))
+	}
+
+	for _, e := range event {
+		r.AddParameter("event", e)
+	}
+	r.SetBasicAuth(basicAuthUser, m.ApiKey())
+
+	var res statsEnvelope
+	err := getResponseFromJSON(r, &res)
+	if err != nil {
+		return -1, nil, err
+	} else {
+		return res.TotalCount, res.Items, nil
+	}
+}
+
+// DeleteTag removes all counters for a particular tag, including the tag itself.
+func (m *MailgunImpl) DeleteTag(tag string) error {
+	r := simplehttp.NewHTTPRequest(generateApiUrl(m, deleteTagEndpoint) + "/" + tag)
+	r.SetBasicAuth(basicAuthUser, m.ApiKey())
+	_, err := makeDeleteRequest(r)
+	return err
+}
diff --git a/Godeps/_workspace/src/github.com/mailgun/mailgun-go/unsubscribes.go b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/unsubscribes.go
new file mode 100644
index 00000000..b296908c
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/unsubscribes.go
@@ -0,0 +1,66 @@
+package mailgun
+
+import (
+	"github.com/mbanzon/simplehttp"
+	"strconv"
+)
+
+type Unsubscription struct {
+	CreatedAt string `json:"created_at"`
+	Tag       string `json:"tag"`
+	ID        string `json:"id"`
+	Address   string `json:"address"`
+}
+
+// GetUnsubscribes retrieves a list of unsubscriptions issued by recipients of mail from your domain.
+// Zero is a valid list length.
+func (mg *MailgunImpl) GetUnsubscribes(limit, skip int) (int, []Unsubscription, error) {
+	r := simplehttp.NewHTTPRequest(generateApiUrl(mg, unsubscribesEndpoint))
+	if limit != DefaultLimit {
+		r.AddParameter("limit", strconv.Itoa(limit))
+	}
+	if skip != DefaultSkip {
+		r.AddParameter("skip", strconv.Itoa(skip))
+	}
+	r.SetBasicAuth(basicAuthUser, mg.ApiKey())
+	var envelope struct {
+		TotalCount int              `json:"total_count"`
+		Items      []Unsubscription `json:"items"`
+	}
+	err := getResponseFromJSON(r, &envelope)
+	return envelope.TotalCount, envelope.Items, err
+}
+
+// GetUnsubscribesByAddress retrieves a list of unsubscriptions by recipient address.
+// Zero is a valid list length.
+func (mg *MailgunImpl) GetUnsubscribesByAddress(a string) (int, []Unsubscription, error) {
+	r := simplehttp.NewHTTPRequest(generateApiUrlWithTarget(mg, unsubscribesEndpoint, a))
+	r.SetBasicAuth(basicAuthUser, mg.ApiKey())
+	var envelope struct {
+		TotalCount int              `json:"total_count"`
+		Items      []Unsubscription `json:"items"`
+	}
+	err := getResponseFromJSON(r, &envelope)
+	return envelope.TotalCount, envelope.Items, err
+}
+
+// Unsubscribe adds an e-mail address to the domain's unsubscription table.
+func (mg *MailgunImpl) Unsubscribe(a, t string) error {
+	r := simplehttp.NewHTTPRequest(generateApiUrl(mg, unsubscribesEndpoint))
+	r.SetBasicAuth(basicAuthUser, mg.ApiKey())
+	p := simplehttp.NewUrlEncodedPayload()
+	p.AddValue("address", a)
+	p.AddValue("tag", t)
+	_, err := makePostRequest(r, p)
+	return err
+}
+
+// RemoveUnsubscribe removes the e-mail address given from the domain's unsubscription table.
+// If passing in an ID (discoverable from, e.g., GetUnsubscribes()), the e-mail address associated
+// with the given ID will be removed.
+func (mg *MailgunImpl) RemoveUnsubscribe(a string) error {
+	r := simplehttp.NewHTTPRequest(generateApiUrlWithTarget(mg, unsubscribesEndpoint, a))
+	r.SetBasicAuth(basicAuthUser, mg.ApiKey())
+	_, err := makeDeleteRequest(r)
+	return err
+}
diff --git a/Godeps/_workspace/src/github.com/mailgun/mailgun-go/webhooks.go b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/webhooks.go
new file mode 100644
index 00000000..1b4ab614
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mailgun/mailgun-go/webhooks.go
@@ -0,0 +1,68 @@
+package mailgun
+
+import (
+	"github.com/mbanzon/simplehttp"
+)
+
+// GetWebhooks returns the complete set of webhooks configured for your domain.
+// Note that a zero-length mapping is not an error.
+func (mg *MailgunImpl) GetWebhooks() (map[string]string, error) {
+	r := simplehttp.NewHTTPRequest(generateDomainApiUrl(mg, webhooksEndpoint))
+	r.SetBasicAuth(basicAuthUser, mg.ApiKey())
+	var envelope struct {
+		Webhooks map[string]interface{} `json:"webhooks"`
+	}
+	err := getResponseFromJSON(r, &envelope)
+	hooks := make(map[string]string, 0)
+	if err != nil {
+		return hooks, err
+	}
+	for k, v := range envelope.Webhooks {
+		object := v.(map[string]interface{})
+		url := object["url"]
+		hooks[k] = url.(string)
+	}
+	return hooks, nil
+}
+
+// CreateWebhook installs a new webhook for your domain.
+func (mg *MailgunImpl) CreateWebhook(t, u string) error {
+	r := simplehttp.NewHTTPRequest(generateDomainApiUrl(mg, webhooksEndpoint))
+	r.SetBasicAuth(basicAuthUser, mg.ApiKey())
+	p := simplehttp.NewUrlEncodedPayload()
+	p.AddValue("id", t)
+	p.AddValue("url", u)
+	_, err := makePostRequest(r, p)
+	return err
+}
+
+// DeleteWebhook removes the specified webhook from your domain's configuration.
+func (mg *MailgunImpl) DeleteWebhook(t string) error {
+	r := simplehttp.NewHTTPRequest(generateDomainApiUrl(mg, webhooksEndpoint) + "/" + t)
+	r.SetBasicAuth(basicAuthUser, mg.ApiKey())
+	_, err := makeDeleteRequest(r)
+	return err
+}
+
+// GetWebhookByType retrieves the currently assigned webhook URL associated with the provided type of webhook.
+func (mg *MailgunImpl) GetWebhookByType(t string) (string, error) {
+	r := simplehttp.NewHTTPRequest(generateDomainApiUrl(mg, webhooksEndpoint) + "/" + t)
+	r.SetBasicAuth(basicAuthUser, mg.ApiKey())
+	var envelope struct {
+		Webhook struct {
+			Url *string `json:"url"`
+		} `json:"webhook"`
+	}
+	err := getResponseFromJSON(r, &envelope)
+	return *envelope.Webhook.Url, err
+}
+
+// UpdateWebhook replaces one webhook setting for another.
+func (mg *MailgunImpl) UpdateWebhook(t, u string) error {
+	r := simplehttp.NewHTTPRequest(generateDomainApiUrl(mg, webhooksEndpoint) + "/" + t)
+	r.SetBasicAuth(basicAuthUser, mg.ApiKey())
+	p := simplehttp.NewUrlEncodedPayload()
+	p.AddValue("url", u)
+	_, err := makePutRequest(r, p)
+	return err
+}
diff --git a/Godeps/_workspace/src/github.com/mbanzon/simplehttp/.gitignore b/Godeps/_workspace/src/github.com/mbanzon/simplehttp/.gitignore
new file mode 100644
index 00000000..2b1c9a52
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mbanzon/simplehttp/.gitignore
@@ -0,0 +1 @@
+desktop.ini
diff --git a/Godeps/_workspace/src/github.com/mbanzon/simplehttp/.travis.yml b/Godeps/_workspace/src/github.com/mbanzon/simplehttp/.travis.yml
new file mode 100644
index 00000000..296b8715
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mbanzon/simplehttp/.travis.yml
@@ -0,0 +1,11 @@
+language: go
+go:
+  - 1.3
+  - 1.4
+env:
+  - GOARCH=amd64
+  - GOARCH=386
+script:
+  - go get github.com/mbanzon/callbackenv
+  - go get github.com/mbanzon/dummyserver
+  - go test
diff --git a/Godeps/_workspace/src/github.com/mbanzon/simplehttp/LICENSE b/Godeps/_workspace/src/github.com/mbanzon/simplehttp/LICENSE
new file mode 100644
index 00000000..74f74ee0
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mbanzon/simplehttp/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2013-2014, Michael Banzon
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice, this
+  list of conditions and the following disclaimer in the documentation and/or
+  other materials provided with the distribution.
+
+* Neither the name of the {organization} nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/mbanzon/simplehttp/README.md b/Godeps/_workspace/src/github.com/mbanzon/simplehttp/README.md
new file mode 100644
index 00000000..cb032cf5
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mbanzon/simplehttp/README.md
@@ -0,0 +1,15 @@
+simplehttp
+==========
+
+[![Build Status](https://travis-ci.org/mbanzon/simplehttp.png?branch=master)](https://travis-ci.org/mbanzon/simplehttp)
+
+Simple HTTP library for Go.
+
+This small library adds some utility functions for doing HTTP request and easilly gettings results as
+structs from JSON and XML.
+
+Supports alternative `http.Client` instances to support use on Google App Engine.
+
+Examples are coming soon.
+
+The code is released under a 3-clause BSD license. See the LICENSE file for more information.
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/mbanzon/simplehttp/helpers.go b/Godeps/_workspace/src/github.com/mbanzon/simplehttp/helpers.go
new file mode 100644
index 00000000..64e2b871
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mbanzon/simplehttp/helpers.go
@@ -0,0 +1,17 @@
+package simplehttp
+
+func (r *HTTPRequest) GetResponseFromJSON(v interface{}) error {
+	response, err := r.MakeGetRequest()
+	if err != nil {
+		return err
+	}
+	return response.ParseFromJSON(v)
+}
+
+func (r *HTTPRequest) PostResponseFromJSON(payload Payload, v interface{}) error {
+	response, err := r.MakePostRequest(payload)
+	if err != nil {
+		return err
+	}
+	return response.ParseFromJSON(v)
+}
diff --git a/Godeps/_workspace/src/github.com/mbanzon/simplehttp/helpers_test.go b/Godeps/_workspace/src/github.com/mbanzon/simplehttp/helpers_test.go
new file mode 100644
index 00000000..ecf3dc22
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mbanzon/simplehttp/helpers_test.go
@@ -0,0 +1,133 @@
+package simplehttp
+
+import (
+	"encoding/json"
+	"encoding/xml"
+	"testing"
+)
+
+func TestParsingGetFromJson(t *testing.T) {
+	tmp := testStruct{
+		Value1: "1",
+		Value2: "2",
+		Value3: "3",
+	}
+
+	data, err := json.Marshal(tmp)
+	if err != nil {
+		t.Fail()
+	}
+
+	server.SetNextResponse(data)
+
+	request := NewHTTPRequest(dummyurl)
+	var retVal testStruct
+	err = request.GetResponseFromJSON(&retVal)
+
+	if err != nil {
+		t.Fail()
+	}
+
+	if tmp.Value1 != retVal.Value1 {
+		t.Fail()
+	}
+
+	if tmp.Value2 != retVal.Value2 {
+		t.Fail()
+	}
+
+	if tmp.Value3 != retVal.Value3 {
+		t.Fail()
+	}
+}
+
+func TestFailingParsingGetFromJson(t *testing.T) {
+	request := NewHTTPRequest(invalidurl)
+	var retVal testStruct
+	err := request.GetResponseFromJSON(&retVal)
+
+	if err == nil {
+		t.Fail()
+	}
+}
+
+func TestParsingPostFromJson(t *testing.T) {
+	tmp := testStruct{
+		Value1: "1",
+		Value2: "2",
+		Value3: "3",
+	}
+
+	data, err := json.Marshal(tmp)
+	if err != nil {
+		t.Fail()
+	}
+
+	server.SetNextResponse(data)
+
+	request := NewHTTPRequest(dummyurl)
+	var retVal testStruct
+	err = request.PostResponseFromJSON(nil, &retVal)
+
+	if err != nil {
+		t.Fail()
+	}
+
+	if tmp.Value1 != retVal.Value1 {
+		t.Fail()
+	}
+
+	if tmp.Value2 != retVal.Value2 {
+		t.Fail()
+	}
+
+	if tmp.Value3 != retVal.Value3 {
+		t.Fail()
+	}
+}
+
+func TestFailingParsingPostFromJson(t *testing.T) {
+	request := NewHTTPRequest(invalidurl)
+	var retVal testStruct
+	err := request.PostResponseFromJSON(nil, &retVal)
+
+	if err == nil {
+		t.Fail()
+	}
+}
+
+func TestParsingGetFromXml(t *testing.T) {
+	tmp := testStruct{
+		Value1: "1",
+		Value2: "2",
+		Value3: "3",
+	}
+
+	data, err := xml.Marshal(tmp)
+	if err != nil {
+		t.Fail()
+	}
+
+	server.SetNextResponse(data)
+
+	request := NewHTTPRequest(dummyurl)
+	var retVal testStruct
+	response, err := request.MakeGetRequest()
+	response.ParseFromXML(&retVal)
+
+	if err != nil {
+		t.Fail()
+	}
+
+	if tmp.Value1 != retVal.Value1 {
+		t.Fail()
+	}
+
+	if tmp.Value2 != retVal.Value2 {
+		t.Fail()
+	}
+
+	if tmp.Value3 != retVal.Value3 {
+		t.Fail()
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/mbanzon/simplehttp/json_utils.go b/Godeps/_workspace/src/github.com/mbanzon/simplehttp/json_utils.go
new file mode 100644
index 00000000..47ff4b9b
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mbanzon/simplehttp/json_utils.go
@@ -0,0 +1,31 @@
+package simplehttp
+
+import (
+	"encoding/json"
+	"net/http"
+)
+
+func GetJSONInput(r *http.Request, w http.ResponseWriter, v interface{}) (err error) {
+	decoder := json.NewDecoder(r.Body)
+	err = decoder.Decode(v)
+	if err != nil {
+		http.Error(w, "Bad request.", http.StatusBadRequest)
+		return err
+	}
+
+	return nil
+}
+
+func OutputJSON(w http.ResponseWriter, v interface{}) (err error) {
+	var data []byte
+	data, err = json.Marshal(v)
+	if err != nil {
+		http.Error(w, "Internal error.", http.StatusInternalServerError)
+		return err
+	}
+
+	w.Header().Add("Content-Type", "application/json")
+	_, err = w.Write(data)
+
+	return nil
+}
diff --git a/Godeps/_workspace/src/github.com/mbanzon/simplehttp/parsing.go b/Godeps/_workspace/src/github.com/mbanzon/simplehttp/parsing.go
new file mode 100644
index 00000000..0261ccf9
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mbanzon/simplehttp/parsing.go
@@ -0,0 +1,15 @@
+package simplehttp
+
+import (
+	"encoding/json"
+	"encoding/xml"
+)
+
+// Parses the HTTPResponse as JSON to the given interface.
+func (r *HTTPResponse) ParseFromJSON(v interface{}) error {
+	return json.Unmarshal(r.Data, v)
+}
+
+func (r *HTTPResponse) ParseFromXML(v interface{}) error {
+	return xml.Unmarshal(r.Data, v)
+}
diff --git a/Godeps/_workspace/src/github.com/mbanzon/simplehttp/payload_test.go b/Godeps/_workspace/src/github.com/mbanzon/simplehttp/payload_test.go
new file mode 100644
index 00000000..7adcbfb0
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mbanzon/simplehttp/payload_test.go
@@ -0,0 +1,38 @@
+package simplehttp
+
+import (
+	"bytes"
+	"github.com/mbanzon/callbackenv"
+	"io/ioutil"
+	"testing"
+)
+
+const (
+	FILE_ENV = "SIMPLEHTTP_TEST_FILE"
+)
+
+func TestFormDataPayloadPost(t *testing.T) {
+	payload := NewFormDataPayload()
+	payload.AddValue("key", "value")
+
+	buf := &bytes.Buffer{}
+	buf.Write([]byte("testing testing testing"))
+
+	rc := ioutil.NopCloser(buf)
+	payload.AddReadCloser("foo", "bar", rc)
+
+	callbackenv.RequireEnv(FILE_ENV,
+		func(file string) {
+			payload.AddFile("file", file)
+		}, nil)
+
+	request := NewHTTPRequest(dummyurl)
+	request.MakePostRequest(payload)
+}
+
+func TestUrlEncodedPayloadPost(t *testing.T) {
+	payload := NewUrlEncodedPayload()
+	payload.AddValue("key", "value")
+	request := NewHTTPRequest(dummyurl)
+	request.MakePostRequest(payload)
+}
diff --git a/Godeps/_workspace/src/github.com/mbanzon/simplehttp/payloads.go b/Godeps/_workspace/src/github.com/mbanzon/simplehttp/payloads.go
new file mode 100644
index 00000000..2c3fa2d1
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mbanzon/simplehttp/payloads.go
@@ -0,0 +1,141 @@
+package simplehttp
+
+import (
+	"bytes"
+	"io"
+	"mime/multipart"
+	"net/url"
+	"os"
+	"path"
+)
+
+type keyValuePair struct {
+	key   string
+	value string
+}
+
+type keyNameRC struct {
+	key   string
+	name  string
+	value io.ReadCloser
+}
+
+type Payload interface {
+	GetPayloadBuffer() (*bytes.Buffer, error)
+	GetContentType() string
+}
+
+type RawPayload struct {
+	Data []byte
+}
+
+type FormDataPayload struct {
+	contentType string
+	Values      []keyValuePair
+	Files       []keyValuePair
+	ReadClosers []keyNameRC
+}
+
+type UrlEncodedPayload struct {
+	Values []keyValuePair
+}
+
+func NewRawPayload(data []byte) *RawPayload {
+	return &RawPayload{Data: data}
+}
+
+func (r *RawPayload) GetPayloadBuffer() (*bytes.Buffer, error) {
+	data := &bytes.Buffer{}
+	c, err := data.Write(r.Data)
+	if c != len(r.Data) || err != nil {
+		return data, err
+	}
+	return data, nil
+}
+
+func (r *RawPayload) GetContentType() string {
+	return ""
+}
+
+func NewFormDataPayload() *FormDataPayload {
+	return &FormDataPayload{}
+}
+
+func (f *FormDataPayload) AddValue(key, value string) {
+	f.Values = append(f.Values, keyValuePair{key: key, value: value})
+}
+
+func (f *FormDataPayload) AddFile(key, file string) {
+	f.Files = append(f.Files, keyValuePair{key: key, value: file})
+}
+
+func (f *FormDataPayload) AddReadCloser(key, name string, rc io.ReadCloser) {
+	f.ReadClosers = append(f.ReadClosers, keyNameRC{key: key, name: name, value: rc})
+}
+
+func (f *FormDataPayload) GetPayloadBuffer() (*bytes.Buffer, error) {
+	data := &bytes.Buffer{}
+	writer := multipart.NewWriter(data)
+	defer writer.Close()
+
+	for _, keyVal := range f.Values {
+		if tmp, err := writer.CreateFormField(keyVal.key); err == nil {
+			tmp.Write([]byte(keyVal.value))
+		} else {
+			return nil, err
+		}
+	}
+
+	for _, file := range f.Files {
+		if tmp, err := writer.CreateFormFile(file.key, path.Base(file.value)); err == nil {
+			if fp, err := os.Open(file.value); err == nil {
+				defer fp.Close()
+				io.Copy(tmp, fp)
+			} else {
+				return nil, err
+			}
+		} else {
+			return nil, err
+		}
+	}
+
+	for _, file := range f.ReadClosers {
+		if tmp, err := writer.CreateFormFile(file.key, file.name); err == nil {
+			defer file.value.Close()
+			io.Copy(tmp, file.value)
+		} else {
+			return nil, err
+		}
+	}
+
+	f.contentType = writer.FormDataContentType()
+
+	return data, nil
+}
+
+func (f *FormDataPayload) GetContentType() string {
+	if f.contentType == "" {
+		f.GetPayloadBuffer()
+	}
+	return f.contentType
+}
+
+func NewUrlEncodedPayload() *UrlEncodedPayload {
+	return &UrlEncodedPayload{}
+}
+
+func (f *UrlEncodedPayload) AddValue(key, value string) {
+	f.Values = append(f.Values, keyValuePair{key: key, value: value})
+}
+
+func (f *UrlEncodedPayload) GetPayloadBuffer() (*bytes.Buffer, error) {
+	data := url.Values{}
+	for _, keyVal := range f.Values {
+		data.Add(keyVal.key, keyVal.value)
+	}
+	return bytes.NewBufferString(data.Encode()), nil
+}
+
+func (f *UrlEncodedPayload) GetContentType() string {
+	return "application/x-www-form-urlencoded"
+}
diff --git a/Godeps/_workspace/src/github.com/mbanzon/simplehttp/shorthand.go b/Godeps/_workspace/src/github.com/mbanzon/simplehttp/shorthand.go
new file mode 100644
index 00000000..2d0c62ca
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mbanzon/simplehttp/shorthand.go
@@ -0,0 +1,74 @@
+package simplehttp
+
+// Type to encapsulate basic authentication for requests.
+type BasicAuthentication struct {
+	User     string
+	Password string
+}
+
+// Type to wrap requests.
+type Request struct {
+	Url            string
+	Authentication BasicAuthentication
+	UserAgent      string
+	Data           []byte
+}
+
+func createHttpRequest(req Request) *HTTPRequest {
+	r := NewHTTPRequest(req.Url)
+	if req.Authentication.User != "" {
+		r.SetBasicAuth(req.Authentication.User, req.Authentication.Password)
+	}
+	if req.UserAgent != "" {
+		r.AddHeader("User-Agent", req.UserAgent)
+	}
+	return r
+}
+
+func (r Request) Get() (int, []byte, error) {
+	req := createHttpRequest(r)
+	res, err := req.MakeGetRequest()
+	if err == nil {
+		return res.Code, res.Data, err
+	} else {
+		return -1, nil, err
+	}
+}
+
+func (r Request) Post() (int, []byte, error) {
+	req := createHttpRequest(r)
+	var payload Payload = nil
+	if r.Data != nil {
+		payload = NewRawPayload(r.Data)
+	}
+	res, err := req.MakePostRequest(payload)
+	if err == nil {
+		return res.Code, res.Data, err
+	} else {
+		return -1, nil, err
+	}
+}
+
+func (r Request) Put() (int, []byte, error) {
+	req := createHttpRequest(r)
+	var payload Payload = nil
+	if r.Data != nil {
+		payload = NewRawPayload(r.Data)
+	}
+	res, err := req.MakePutRequest(payload)
+	if err == nil {
+		return res.Code, res.Data, err
+	} else {
+		return -1, nil, err
+	}
+}
+
+func (r Request) Delete() (int, []byte, error) {
+	req := createHttpRequest(r)
+	res, err := req.MakeDeleteRequest()
+	if err == nil {
+		return res.Code, res.Data, err
+	} else {
+		return -1, nil, err
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/mbanzon/simplehttp/shorthand_test.go b/Godeps/_workspace/src/github.com/mbanzon/simplehttp/shorthand_test.go
new file mode 100644
index 00000000..59682244
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mbanzon/simplehttp/shorthand_test.go
@@ -0,0 +1,104 @@
+package simplehttp
+
+import (
+	"testing"
+)
+
+func TestShorthandFailingPayload(t *testing.T) {
+	Request{
+		Url:  dummyurl,
+		Data: nil,
+	}.Post()
+}
+
+func TestShorthandGet(t *testing.T) {
+	code, _, err := Request{
+		Url:       dummyurl,
+		UserAgent: "simplehttp go test",
+	}.Get()
+
+	if code == -1 || err != nil {
+		t.Fail()
+	}
+}
+
+func TestShorthandPost(t *testing.T) {
+	code, _, err := Request{
+		Url:       dummyurl,
+		Data:      []byte("foobar"),
+		UserAgent: "simplehttp go test",
+		Authentication: BasicAuthentication{
+			User:     "test",
+			Password: "test",
+		},
+	}.Post()
+
+	if code == -1 || err != nil {
+		t.Fail()
+	}
+}
+
+func TestShorthandPut(t *testing.T) {
+	code, _, err := Request{
+		Url:       dummyurl,
+		Data:      []byte("foobar"),
+		UserAgent: "simplehttp go test",
+	}.Put()
+
+	if code == -1 || err != nil {
+		t.Fail()
+	}
+}
+
+func TestShorthandDelete(t *testing.T) {
+	code, _, err := Request{
+		Url:       dummyurl,
+		UserAgent: "simplehttp go test",
+	}.Delete()
+
+	if code == -1 || err != nil {
+		t.Fail()
+	}
+}
+
+func TestFailingShorthandGet(t *testing.T) {
+	code, _, err := Request{
+		Url: invalidurl,
+	}.Get()
+
+	if code != -1 || err == nil {
+		t.Fail()
+	}
+}
+
+func TestFailingShorthandPost(t *testing.T) {
+	code, _, err := Request{
+		Url:  invalidurl,
+		Data: []byte("foobar"),
+	}.Post()
+
+	if code != -1 || err == nil {
+		t.Fail()
+	}
+}
+
+func TestFailingShorthandPut(t *testing.T) {
+	code, _, err := Request{
+		Url:  invalidurl,
+		Data: []byte("foobar"),
+	}.Put()
+
+	if code != -1 || err == nil {
+		t.Fail()
+	}
+}
+
+func TestFailingShorthandDelete(t *testing.T) {
+	code, _, err := Request{
+		Url: invalidurl,
+	}.Delete()
+
+	if code != -1 || err == nil {
+		t.Fail()
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/mbanzon/simplehttp/simplehttp.go b/Godeps/_workspace/src/github.com/mbanzon/simplehttp/simplehttp.go
new file mode 100644
index 00000000..6ea097e5
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mbanzon/simplehttp/simplehttp.go
@@ -0,0 +1,147 @@
+// Package simplehttp provides some simple methods and types to do
+// HTTP queries with form values and parameters easily - especially
+// if the returned result is expected to be JSON or XML.
+//
+// Author: Michael Banzon
+package simplehttp
+
+import (
+	"io"
+	"io/ioutil"
+	"net/http"
+	"net/url"
+)
+
+// Holds all information used to make a HTTP request.
+type HTTPRequest struct {
+	URL               string
+	Parameters        map[string][]string
+	Headers           map[string]string
+	BasicAuthUser     string
+	BasicAuthPassword string
+	Client            *http.Client
+}
+
+type HTTPResponse struct {
+	Code int
+	Data []byte
+}
+
+// Creates a new HTTPRequest instance.
+func NewHTTPRequest(url string) *HTTPRequest {
+	return &HTTPRequest{URL: url, Client: http.DefaultClient}
+}
+
+// Adds a parameter to the generated query string.
+func (r *HTTPRequest) AddParameter(name, value string) {
+	if r.Parameters == nil {
+		r.Parameters = make(map[string][]string)
+	}
+	r.Parameters[name] = append(r.Parameters[name], value)
+}
+
+// Adds a header that will be sent with the HTTP request.
+func (r *HTTPRequest) AddHeader(name, value string) {
+	// hej
+	if r.Headers == nil {
+		r.Headers = make(map[string]string)
+	}
+	r.Headers[name] = value
+}
+
+// Sets username and password for basic authentication.
+func (r *HTTPRequest) SetBasicAuth(user, password string) {
+	r.BasicAuthUser = user
+	r.BasicAuthPassword = password
+}
+
+func (r *HTTPRequest) MakeGetRequest() (*HTTPResponse, error) {
+	return r.MakeRequest("GET", nil)
+}
+
+func (r *HTTPRequest) MakePostRequest(payload Payload) (*HTTPResponse, error) {
+	return r.MakeRequest("POST", payload)
+}
+
+func (r *HTTPRequest) MakePutRequest(payload Payload) (*HTTPResponse, error) {
+	return r.MakeRequest("PUT", payload)
+}
+
+func (r *HTTPRequest) MakeDeleteRequest() (*HTTPResponse, error) {
+	return r.MakeRequest("DELETE", nil)
+}
+
+func (r *HTTPRequest) MakeRequest(method string, payload Payload) (*HTTPResponse, error) {
+	url, err := r.generateUrlWithParameters()
+	if err != nil {
+		return nil, err
+	}
+
+	var body io.Reader
+	if payload != nil {
+		if body, err = payload.GetPayloadBuffer(); err != nil {
+			return nil, err
+		}
+	} else {
+		body = nil
+	}
+
+	req, err := http.NewRequest(method, url, body)
+	if err != nil {
+		return nil, err
+	}
+
+	if payload != nil && payload.GetContentType() != "" {
+		req.Header.Add("Content-Type", payload.GetContentType())
+	}
+
+	if r.BasicAuthUser != "" && r.BasicAuthPassword != "" {
+		req.SetBasicAuth(r.BasicAuthUser, r.BasicAuthPassword)
+	}
+
+	for header, value := range r.Headers {
+		req.Header.Add(header, value)
+	}
+
+	response := HTTPResponse{}
+
+	resp, err := r.Client.Do(req)
+	if resp != nil {
+		response.Code = resp.StatusCode
+	}
+	if err != nil {
+		return nil, err
+	}
+
+	defer resp.Body.Close()
+	responseBody, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return nil, err
+	}
+
+	response.Data = responseBody
+	return &response, nil
+}
+
+// Generates the complete URL using GET parameters.
+func (r *HTTPRequest) generateUrlWithParameters() (string, error) {
+	url, err := url.Parse(r.URL)
+	if err != nil {
+		return "", err
+	}
+	q := url.Query()
+	if r.Parameters != nil && len(r.Parameters) > 0 {
+		for name, values := range r.Parameters {
+			for _, value := range values {
+				q.Add(name, value)
+			}
+		}
+	}
+	url.RawQuery = q.Encode()
+
+	return url.String(), nil
+}
+
+func (r *HTTPRequest) SetClient(c *http.Client) {
+	r.Client = c
+}
diff --git a/Godeps/_workspace/src/github.com/mbanzon/simplehttp/simplehttp_test.go b/Godeps/_workspace/src/github.com/mbanzon/simplehttp/simplehttp_test.go
new file mode 100644
index 00000000..ef46737a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/mbanzon/simplehttp/simplehttp_test.go
@@ -0,0 +1,37 @@
+package simplehttp
+
+import (
+	"github.com/mbanzon/dummyserver"
+	"log"
+	"strconv"
+	"testing"
+)
+
+var (
+	server     *dummyserver.DummyServer
+	dummyurl   string
+	invalidurl string
+)
+
+type testStruct struct {
+	Value1 string `json:"value1" xml:"value1"`
+	Value2 string `json:"value2" xml:"value2"`
+	Value3 string `json:"value3" xml:"value3"`
+}
+
+func init() {
+	server = dummyserver.NewRandomServer()
+	go func() {
+		err := server.Start()
+		log.Fatal(err)
+	}()
+	dummyurl = "http://localhost:" + strconv.Itoa(server.GetPort()) + "/"
+	invalidurl = "invalid://invalid"
+}
+
+func TestAddParameters(t *testing.T) {
+	request := NewHTTPRequest(dummyurl)
+	request.AddParameter("p1", "v1")
+
+	request.MakeGetRequest()
+}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/bcrypt/base64.go b/Godeps/_workspace/src/golang.org/x/crypto/bcrypt/base64.go
new file mode 100644
index 00000000..fc311609
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/crypto/bcrypt/base64.go
@@ -0,0 +1,35 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package bcrypt
+
+import "encoding/base64"
+
+const alphabet = "./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
+
+var bcEncoding = base64.NewEncoding(alphabet)
+
+func base64Encode(src []byte) []byte {
+	n := bcEncoding.EncodedLen(len(src))
+	dst := make([]byte, n)
+	bcEncoding.Encode(dst, src)
+	for dst[n-1] == '=' {
+		n--
+	}
+	return dst[:n]
+}
+
+func base64Decode(src []byte) ([]byte, error) {
+	numOfEquals := 4 - (len(src) % 4)
+	for i := 0; i < numOfEquals; i++ {
+		src = append(src, '=')
+	}
+
+	dst := make([]byte, bcEncoding.DecodedLen(len(src)))
+	n, err := bcEncoding.Decode(dst, src)
+	if err != nil {
+		return nil, err
+	}
+	return dst[:n], nil
+}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/bcrypt/bcrypt.go b/Godeps/_workspace/src/golang.org/x/crypto/bcrypt/bcrypt.go
new file mode 100644
index 00000000..f8b807f9
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/crypto/bcrypt/bcrypt.go
@@ -0,0 +1,294 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package bcrypt implements Provos and Mazières's bcrypt adaptive hashing
+// algorithm. See http://www.usenix.org/event/usenix99/provos/provos.pdf
+package bcrypt // import "golang.org/x/crypto/bcrypt"
+
+// The code is a port of Provos and Mazières's C implementation.
+import (
+	"crypto/rand"
+	"crypto/subtle"
+	"errors"
+	"fmt"
+	"golang.org/x/crypto/blowfish"
+	"io"
+	"strconv"
+)
+
+const (
+	MinCost     int = 4  // the minimum allowable cost as passed in to GenerateFromPassword
+	MaxCost     int = 31 // the maximum allowable cost as passed in to GenerateFromPassword
+	DefaultCost int = 10 // the cost that will actually be set if a cost below MinCost is passed into GenerateFromPassword
+)
+
+// The error returned from CompareHashAndPassword when a password and hash do
+// not match.
+var ErrMismatchedHashAndPassword = errors.New("crypto/bcrypt: hashedPassword is not the hash of the given password")
+
+// The error returned from CompareHashAndPassword when a hash is too short to
+// be a bcrypt hash.
+var ErrHashTooShort = errors.New("crypto/bcrypt: hashedSecret too short to be a bcrypted password")
+
+// The error returned from CompareHashAndPassword when a hash was created with
+// a bcrypt algorithm newer than this implementation.
+type HashVersionTooNewError byte
+
+func (hv HashVersionTooNewError) Error() string {
+	return fmt.Sprintf("crypto/bcrypt: bcrypt algorithm version '%c' requested is newer than current version '%c'", byte(hv), majorVersion)
+}
+
+// The error returned from CompareHashAndPassword when a hash starts with something other than '$'
+type InvalidHashPrefixError byte
+
+func (ih InvalidHashPrefixError) Error() string {
+	return fmt.Sprintf("crypto/bcrypt: bcrypt hashes must start with '$', but hashedSecret started with '%c'", byte(ih))
+}
+
+type InvalidCostError int
+
+func (ic InvalidCostError) Error() string {
+	return fmt.Sprintf("crypto/bcrypt: cost %d is outside allowed range (%d,%d)", int(ic), int(MinCost), int(MaxCost))
+}
+
+const (
+	majorVersion       = '2'
+	minorVersion       = 'a'
+	maxSaltSize        = 16
+	maxCryptedHashSize = 23
+	encodedSaltSize    = 22
+	encodedHashSize    = 31
+	minHashSize        = 59
+)
+
+// magicCipherData is an IV for the 64 Blowfish encryption calls in
+// bcrypt(). It's the string "OrpheanBeholderScryDoubt" in big-endian bytes.
+var magicCipherData = []byte{
+	0x4f, 0x72, 0x70, 0x68,
+	0x65, 0x61, 0x6e, 0x42,
+	0x65, 0x68, 0x6f, 0x6c,
+	0x64, 0x65, 0x72, 0x53,
+	0x63, 0x72, 0x79, 0x44,
+	0x6f, 0x75, 0x62, 0x74,
+}
+
+type hashed struct {
+	hash  []byte
+	salt  []byte
+	cost  int // allowed range is MinCost to MaxCost
+	major byte
+	minor byte
+}
+
+// GenerateFromPassword returns the bcrypt hash of the password at the given
+// cost. If the cost given is less than MinCost, the cost will be set to
+// DefaultCost, instead. Use CompareHashAndPassword, as defined in this package,
+// to compare the returned hashed password with its cleartext version.
+func GenerateFromPassword(password []byte, cost int) ([]byte, error) {
+	p, err := newFromPassword(password, cost)
+	if err != nil {
+		return nil, err
+	}
+	return p.Hash(), nil
+}
+
+// CompareHashAndPassword compares a bcrypt hashed password with its possible
+// plaintext equivalent. Returns nil on success, or an error on failure.
+func CompareHashAndPassword(hashedPassword, password []byte) error {
+	p, err := newFromHash(hashedPassword)
+	if err != nil {
+		return err
+	}
+
+	otherHash, err := bcrypt(password, p.cost, p.salt)
+	if err != nil {
+		return err
+	}
+
+	otherP := &hashed{otherHash, p.salt, p.cost, p.major, p.minor}
+	if subtle.ConstantTimeCompare(p.Hash(), otherP.Hash()) == 1 {
+		return nil
+	}
+
+	return ErrMismatchedHashAndPassword
+}
+
+// Cost returns the hashing cost used to create the given hashed
+// password. When, in the future, the hashing cost of a password system needs
+// to be increased in order to adjust for greater computational power, this
+// function allows one to establish which passwords need to be updated.
+func Cost(hashedPassword []byte) (int, error) {
+	p, err := newFromHash(hashedPassword)
+	if err != nil {
+		return 0, err
+	}
+	return p.cost, nil
+}
+
+func newFromPassword(password []byte, cost int) (*hashed, error) {
+	if cost < MinCost {
+		cost = DefaultCost
+	}
+	p := new(hashed)
+	p.major = majorVersion
+	p.minor = minorVersion
+
+	err := checkCost(cost)
+	if err != nil {
+		return nil, err
+	}
+	p.cost = cost
+
+	unencodedSalt := make([]byte, maxSaltSize)
+	_, err = io.ReadFull(rand.Reader, unencodedSalt)
+	if err != nil {
+		return nil, err
+	}
+
+	p.salt = base64Encode(unencodedSalt)
+	hash, err := bcrypt(password, p.cost, p.salt)
+	if err != nil {
+		return nil, err
+	}
+	p.hash = hash
+	return p, err
+}
+
+func newFromHash(hashedSecret []byte) (*hashed, error) {
+	if len(hashedSecret) < minHashSize {
+		return nil, ErrHashTooShort
+	}
+	p := new(hashed)
+	n, err := p.decodeVersion(hashedSecret)
+	if err != nil {
+		return nil, err
+	}
+	hashedSecret = hashedSecret[n:]
+	n, err = p.decodeCost(hashedSecret)
+	if err != nil {
+		return nil, err
+	}
+	hashedSecret = hashedSecret[n:]
+
+	// The "+2" is here because we'll have to append at most 2 '=' to the salt
+	// when base64 decoding it in expensiveBlowfishSetup().
+	p.salt = make([]byte, encodedSaltSize, encodedSaltSize+2)
+	copy(p.salt, hashedSecret[:encodedSaltSize])
+
+	hashedSecret = hashedSecret[encodedSaltSize:]
+	p.hash = make([]byte, len(hashedSecret))
+	copy(p.hash, hashedSecret)
+
+	return p, nil
+}
+
+func bcrypt(password []byte, cost int, salt []byte) ([]byte, error) {
+	cipherData := make([]byte, len(magicCipherData))
+	copy(cipherData, magicCipherData)
+
+	c, err := expensiveBlowfishSetup(password, uint32(cost), salt)
+	if err != nil {
+		return nil, err
+	}
+
+	for i := 0; i < 24; i += 8 {
+		for j := 0; j < 64; j++ {
+			c.Encrypt(cipherData[i:i+8], cipherData[i:i+8])
+		}
+	}
+
+	// Bug compatibility with C bcrypt implementations. We only encode 23 of
+	// the 24 bytes encrypted.
+	hsh := base64Encode(cipherData[:maxCryptedHashSize])
+	return hsh, nil
+}
+
+func expensiveBlowfishSetup(key []byte, cost uint32, salt []byte) (*blowfish.Cipher, error) {
+
+	csalt, err := base64Decode(salt)
+	if err != nil {
+		return nil, err
+	}
+
+	// Bug compatibility with C bcrypt implementations. They use the trailing
+	// NULL in the key string during expansion.
+	ckey := append(key, 0)
+
+	c, err := blowfish.NewSaltedCipher(ckey, csalt)
+	if err != nil {
+		return nil, err
+	}
+
+	var i, rounds uint64
+	rounds = 1 << cost
+	for i = 0; i < rounds; i++ {
+		blowfish.ExpandKey(ckey, c)
+		blowfish.ExpandKey(csalt, c)
+	}
+
+	return c, nil
+}
+
+func (p *hashed) Hash() []byte {
+	arr := make([]byte, 60)
+	arr[0] = '$'
+	arr[1] = p.major
+	n := 2
+	if p.minor != 0 {
+		arr[2] = p.minor
+		n = 3
+	}
+	arr[n] = '$'
+	n += 1
+	copy(arr[n:], []byte(fmt.Sprintf("%02d", p.cost)))
+	n += 2
+	arr[n] = '$'
+	n += 1
+	copy(arr[n:], p.salt)
+	n += encodedSaltSize
+	copy(arr[n:], p.hash)
+	n += encodedHashSize
+	return arr[:n]
+}
+
+func (p *hashed) decodeVersion(sbytes []byte) (int, error) {
+	if sbytes[0] != '$' {
+		return -1, InvalidHashPrefixError(sbytes[0])
+	}
+	if sbytes[1] > majorVersion {
+		return -1, HashVersionTooNewError(sbytes[1])
+	}
+	p.major = sbytes[1]
+	n := 3
+	if sbytes[2] != '$' {
+		p.minor = sbytes[2]
+		n++
+	}
+	return n, nil
+}
+
+// sbytes should begin where decodeVersion left off.
+func (p *hashed) decodeCost(sbytes []byte) (int, error) {
+	cost, err := strconv.Atoi(string(sbytes[0:2]))
+	if err != nil {
+		return -1, err
+	}
+	err = checkCost(cost)
+	if err != nil {
+		return -1, err
+	}
+	p.cost = cost
+	return 3, nil
+}
+
+func (p *hashed) String() string {
+	return fmt.Sprintf("&{hash: %#v, salt: %#v, cost: %d, major: %c, minor: %c}", string(p.hash), p.salt, p.cost, p.major, p.minor)
+}
+
+func checkCost(cost int) error {
+	if cost < MinCost || cost > MaxCost {
+		return InvalidCostError(cost)
+	}
+	return nil
+}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/bcrypt/bcrypt_test.go b/Godeps/_workspace/src/golang.org/x/crypto/bcrypt/bcrypt_test.go
new file mode 100644
index 00000000..f08a6f5b
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/crypto/bcrypt/bcrypt_test.go
@@ -0,0 +1,226 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package bcrypt
+
+import (
+	"bytes"
+	"fmt"
+	"testing"
+)
+
+func TestBcryptingIsEasy(t *testing.T) {
+	pass := []byte("mypassword")
+	hp, err := GenerateFromPassword(pass, 0)
+	if err != nil {
+		t.Fatalf("GenerateFromPassword error: %s", err)
+	}
+
+	if CompareHashAndPassword(hp, pass) != nil {
+		t.Errorf("%v should hash %s correctly", hp, pass)
+	}
+
+	notPass := "notthepass"
+	err = CompareHashAndPassword(hp, []byte(notPass))
+	if err != ErrMismatchedHashAndPassword {
+		t.Errorf("%v and %s should be mismatched", hp, notPass)
+	}
+}
+
+func TestBcryptingIsCorrect(t *testing.T) {
+	pass := []byte("allmine")
+	salt := []byte("XajjQvNhvvRt5GSeFk1xFe")
+	expectedHash := []byte("$2a$10$XajjQvNhvvRt5GSeFk1xFeyqRrsxkhBkUiQeg0dt.wU1qD4aFDcga")
+
+	hash, err := bcrypt(pass, 10, salt)
+	if err != nil {
+		t.Fatalf("bcrypt blew up: %v", err)
+	}
+	if !bytes.HasSuffix(expectedHash, hash) {
+		t.Errorf("%v should be the suffix of %v", hash, expectedHash)
+	}
+
+	h, err := newFromHash(expectedHash)
+	if err != nil {
+		t.Errorf("Unable to parse %s: %v", string(expectedHash), err)
+	}
+
+	// This is not the safe way to compare these hashes. We do this only for
+	// testing clarity. Use bcrypt.CompareHashAndPassword()
+	if err == nil && !bytes.Equal(expectedHash, h.Hash()) {
+		t.Errorf("Parsed hash %v should equal %v", h.Hash(), expectedHash)
+	}
+}
+
+func TestVeryShortPasswords(t *testing.T) {
+	key := []byte("k")
+	salt := []byte("XajjQvNhvvRt5GSeFk1xFe")
+	_, err := bcrypt(key, 10, salt)
+	if err != nil {
+		t.Errorf("One byte key resulted in error: %s", err)
+	}
+}
+
+func TestTooLongPasswordsWork(t *testing.T) {
+	salt := []byte("XajjQvNhvvRt5GSeFk1xFe")
+	// One byte over the usual 56 byte limit that blowfish has
+	tooLongPass := []byte("012345678901234567890123456789012345678901234567890123456")
+	tooLongExpected := []byte("$2a$10$XajjQvNhvvRt5GSeFk1xFe5l47dONXg781AmZtd869sO8zfsHuw7C")
+	hash, err := bcrypt(tooLongPass, 10, salt)
+	if err != nil {
+		t.Fatalf("bcrypt blew up on long password: %v", err)
+	}
+	if !bytes.HasSuffix(tooLongExpected, hash) {
+		t.Errorf("%v should be the suffix of %v", hash, tooLongExpected)
+	}
+}
+
+type InvalidHashTest struct {
+	err  error
+	hash []byte
+}
+
+var invalidTests = []InvalidHashTest{
+	{ErrHashTooShort, []byte("$2a$10$fooo")},
+	{ErrHashTooShort, []byte("$2a")},
+	{HashVersionTooNewError('3'), []byte("$3a$10$sssssssssssssssssssssshhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh")},
+	{InvalidHashPrefixError('%'), []byte("%2a$10$sssssssssssssssssssssshhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh")},
+	{InvalidCostError(32), []byte("$2a$32$sssssssssssssssssssssshhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh")},
+}
+
+func TestInvalidHashErrors(t *testing.T) {
+	check := func(name string, expected, err error) {
+		if err == nil {
+			t.Errorf("%s: Should have returned an error", name)
+		}
+		if err != nil && err != expected {
+			t.Errorf("%s gave err %v but should have given %v", name, err, expected)
+		}
+	}
+	for _, iht := range invalidTests {
+		_, err := newFromHash(iht.hash)
+		check("newFromHash", iht.err, err)
+		err = CompareHashAndPassword(iht.hash, []byte("anything"))
+		check("CompareHashAndPassword", iht.err, err)
+	}
+}
+
+func TestUnpaddedBase64Encoding(t *testing.T) {
+	original := []byte{101, 201, 101, 75, 19, 227, 199, 20, 239, 236, 133, 32, 30, 109, 243, 30}
+	encodedOriginal := []byte("XajjQvNhvvRt5GSeFk1xFe")
+
+	encoded := base64Encode(original)
+
+	if !bytes.Equal(encodedOriginal, encoded) {
+		t.Errorf("Encoded %v should have equaled %v", encoded, encodedOriginal)
+	}
+
+	decoded, err := base64Decode(encodedOriginal)
+	if err != nil {
+		t.Fatalf("base64Decode blew up: %s", err)
+	}
+
+	if !bytes.Equal(decoded, original) {
+		t.Errorf("Decoded %v should have equaled %v", decoded, original)
+	}
+}
+
+func TestCost(t *testing.T) {
+	suffix := "XajjQvNhvvRt5GSeFk1xFe5l47dONXg781AmZtd869sO8zfsHuw7C"
+	for _, vers := range []string{"2a", "2"} {
+		for _, cost := range []int{4, 10} {
+			s := fmt.Sprintf("$%s$%02d$%s", vers, cost, suffix)
+			h := []byte(s)
+			actual, err := Cost(h)
+			if err != nil {
+				t.Errorf("Cost, error: %s", err)
+				continue
+			}
+			if actual != cost {
+				t.Errorf("Cost, expected: %d, actual: %d", cost, actual)
+			}
+		}
+	}
+	_, err := Cost([]byte("$a$a$" + suffix))
+	if err == nil {
+		t.Errorf("Cost, malformed but no error returned")
+	}
+}
+
+func TestCostValidationInHash(t *testing.T) {
+	if testing.Short() {
+		return
+	}
+
+	pass := []byte("mypassword")
+
+	for c := 0; c < MinCost; c++ {
+		p, _ := newFromPassword(pass, c)
+		if p.cost != DefaultCost {
+			t.Errorf("newFromPassword should default costs below %d to %d, but was %d", MinCost, DefaultCost, p.cost)
+		}
+	}
+
+	p, _ := newFromPassword(pass, 14)
+	if p.cost != 14 {
+		t.Errorf("newFromPassword should default cost to 14, but was %d", p.cost)
+	}
+
+	hp, _ := newFromHash(p.Hash())
+	if p.cost != hp.cost {
+		t.Errorf("newFromHash should maintain the cost at %d, but was %d", p.cost, hp.cost)
+	}
+
+	_, err := newFromPassword(pass, 32)
+	if err == nil {
+		t.Fatalf("newFromPassword: should return a cost error")
+	}
+	if err != InvalidCostError(32) {
+		t.Errorf("newFromPassword: should return cost error, got %#v", err)
+	}
+}
+
+func TestCostReturnsWithLeadingZeroes(t *testing.T) {
+	hp, _ := newFromPassword([]byte("abcdefgh"), 7)
+	cost := hp.Hash()[4:7]
+	expected := []byte("07$")
+
+	if !bytes.Equal(expected, cost) {
+		t.Errorf("single digit costs in hash should have leading zeros: was %v instead of %v", cost, expected)
+	}
+}
+
+func TestMinorNotRequired(t *testing.T) {
+	noMinorHash := []byte("$2$10$XajjQvNhvvRt5GSeFk1xFeyqRrsxkhBkUiQeg0dt.wU1qD4aFDcga")
+	h, err := newFromHash(noMinorHash)
+	if err != nil {
+		t.Fatalf("No minor hash blew up: %s", err)
+	}
+	if h.minor != 0 {
+		t.Errorf("Should leave minor version at 0, but was %d", h.minor)
+	}
+
+	if !bytes.Equal(noMinorHash, h.Hash()) {
+		t.Errorf("Should generate hash %v, but created %v", noMinorHash, h.Hash())
+	}
+}
+
+func BenchmarkEqual(b *testing.B) {
+	b.StopTimer()
+	passwd := []byte("somepasswordyoulike")
+	hash, _ := GenerateFromPassword(passwd, 10)
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		CompareHashAndPassword(hash, passwd)
+	}
+}
+
+func BenchmarkGeneration(b *testing.B) {
+	b.StopTimer()
+	passwd := []byte("mylongpassword1234")
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		GenerateFromPassword(passwd, 10)
+	}
+}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/blowfish/block.go b/Godeps/_workspace/src/golang.org/x/crypto/blowfish/block.go
new file mode 100644
index 00000000..9d80f195
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/crypto/blowfish/block.go
@@ -0,0 +1,159 @@
+// Copyright 2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package blowfish
+
+// getNextWord returns the next big-endian uint32 value from the byte slice
+// at the given position in a circular manner, updating the position.
+func getNextWord(b []byte, pos *int) uint32 {
+	var w uint32
+	j := *pos
+	for i := 0; i < 4; i++ {
+		w = w<<8 | uint32(b[j])
+		j++
+		if j >= len(b) {
+			j = 0
+		}
+	}
+	*pos = j
+	return w
+}
+
+// ExpandKey performs a key expansion on the given *Cipher. Specifically, it
+// performs the Blowfish algorithm's key schedule which sets up the *Cipher's
+// pi and substitution tables for calls to Encrypt. This is used, primarily,
+// by the bcrypt package to reuse the Blowfish key schedule during its
+// set up. It's unlikely that you need to use this directly.
+func ExpandKey(key []byte, c *Cipher) {
+	j := 0
+	for i := 0; i < 18; i++ {
+		// Using inlined getNextWord for performance.
+		var d uint32
+		for k := 0; k < 4; k++ {
+			d = d<<8 | uint32(key[j])
+			j++
+			if j >= len(key) {
+				j = 0
+			}
+		}
+		c.p[i] ^= d
+	}
+
+	var l, r uint32
+	for i := 0; i < 18; i += 2 {
+		l, r = encryptBlock(l, r, c)
+		c.p[i], c.p[i+1] = l, r
+	}
+
+	for i := 0; i < 256; i += 2 {
+		l, r = encryptBlock(l, r, c)
+		c.s0[i], c.s0[i+1] = l, r
+	}
+	for i := 0; i < 256; i += 2 {
+		l, r = encryptBlock(l, r, c)
+		c.s1[i], c.s1[i+1] = l, r
+	}
+	for i := 0; i < 256; i += 2 {
+		l, r = encryptBlock(l, r, c)
+		c.s2[i], c.s2[i+1] = l, r
+	}
+	for i := 0; i < 256; i += 2 {
+		l, r = encryptBlock(l, r, c)
+		c.s3[i], c.s3[i+1] = l, r
+	}
+}
+
+// This is similar to ExpandKey, but folds the salt during the key
+// schedule. While ExpandKey is essentially expandKeyWithSalt with an all-zero
+// salt passed in, reusing ExpandKey turns out to be a place of inefficiency
+// and specializing it here is useful.
+func expandKeyWithSalt(key []byte, salt []byte, c *Cipher) {
+	j := 0
+	for i := 0; i < 18; i++ {
+		c.p[i] ^= getNextWord(key, &j)
+	}
+
+	j = 0
+	var l, r uint32
+	for i := 0; i < 18; i += 2 {
+		l ^= getNextWord(salt, &j)
+		r ^= getNextWord(salt, &j)
+		l, r = encryptBlock(l, r, c)
+		c.p[i], c.p[i+1] = l, r
+	}
+
+	for i := 0; i < 256; i += 2 {
+		l ^= getNextWord(salt, &j)
+		r ^= getNextWord(salt, &j)
+		l, r = encryptBlock(l, r, c)
+		c.s0[i], c.s0[i+1] = l, r
+	}
+
+	for i := 0; i < 256; i += 2 {
+		l ^= getNextWord(salt, &j)
+		r ^= getNextWord(salt, &j)
+		l, r = encryptBlock(l, r, c)
+		c.s1[i], c.s1[i+1] = l, r
+	}
+
+	for i := 0; i < 256; i += 2 {
+		l ^= getNextWord(salt, &j)
+		r ^= getNextWord(salt, &j)
+		l, r = encryptBlock(l, r, c)
+		c.s2[i], c.s2[i+1] = l, r
+	}
+
+	for i := 0; i < 256; i += 2 {
+		l ^= getNextWord(salt, &j)
+		r ^= getNextWord(salt, &j)
+		l, r = encryptBlock(l, r, c)
+		c.s3[i], c.s3[i+1] = l, r
+	}
+}
+
+func encryptBlock(l, r uint32, c *Cipher) (uint32, uint32) {
+	xl, xr := l, r
+	xl ^= c.p[0]
+	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[1]
+	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[2]
+	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[3]
+	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[4]
+	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[5]
+	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[6]
+	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[7]
+	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[8]
+	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[9]
+	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[10]
+	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[11]
+	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[12]
+	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[13]
+	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[14]
+	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[15]
+	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[16]
+	xr ^= c.p[17]
+	return xr, xl
+}
+
+func decryptBlock(l, r uint32, c *Cipher) (uint32, uint32) {
+	xl, xr := l, r
+	xl ^= c.p[17]
+	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[16]
+	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[15]
+	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[14]
+	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[13]
+	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[12]
+	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[11]
+	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[10]
+	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[9]
+	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[8]
+	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[7]
+	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[6]
+	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[5]
+	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[4]
+	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[3]
+	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[2]
+	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[1]
+	xr ^= c.p[0]
+	return xr, xl
+}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/blowfish/blowfish_test.go b/Godeps/_workspace/src/golang.org/x/crypto/blowfish/blowfish_test.go
new file mode 100644
index 00000000..7afa1fdf
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/crypto/blowfish/blowfish_test.go
@@ -0,0 +1,274 @@
+// Copyright 2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package blowfish
+
+import "testing"
+
+type CryptTest struct {
+	key []byte
+	in  []byte
+	out []byte
+}
+
+// Test vector values are from http://www.schneier.com/code/vectors.txt.
+var encryptTests = []CryptTest{
+	{
+		[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		[]byte{0x4E, 0xF9, 0x97, 0x45, 0x61, 0x98, 0xDD, 0x78}},
+	{
+		[]byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
+		[]byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
+		[]byte{0x51, 0x86, 0x6F, 0xD5, 0xB8, 0x5E, 0xCB, 0x8A}},
+	{
+		[]byte{0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		[]byte{0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01},
+		[]byte{0x7D, 0x85, 0x6F, 0x9A, 0x61, 0x30, 0x63, 0xF2}},
+	{
+		[]byte{0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11},
+		[]byte{0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11},
+		[]byte{0x24, 0x66, 0xDD, 0x87, 0x8B, 0x96, 0x3C, 0x9D}},
+
+	{
+		[]byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
+		[]byte{0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11},
+		[]byte{0x61, 0xF9, 0xC3, 0x80, 0x22, 0x81, 0xB0, 0x96}},
+	{
+		[]byte{0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11},
+		[]byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
+		[]byte{0x7D, 0x0C, 0xC6, 0x30, 0xAF, 0xDA, 0x1E, 0xC7}},
+	{
+		[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		[]byte{0x4E, 0xF9, 0x97, 0x45, 0x61, 0x98, 0xDD, 0x78}},
+	{
+		[]byte{0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10},
+		[]byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
+		[]byte{0x0A, 0xCE, 0xAB, 0x0F, 0xC6, 0xA0, 0xA2, 0x8D}},
+	{
+		[]byte{0x7C, 0xA1, 0x10, 0x45, 0x4A, 0x1A, 0x6E, 0x57},
+		[]byte{0x01, 0xA1, 0xD6, 0xD0, 0x39, 0x77, 0x67, 0x42},
+		[]byte{0x59, 0xC6, 0x82, 0x45, 0xEB, 0x05, 0x28, 0x2B}},
+	{
+		[]byte{0x01, 0x31, 0xD9, 0x61, 0x9D, 0xC1, 0x37, 0x6E},
+		[]byte{0x5C, 0xD5, 0x4C, 0xA8, 0x3D, 0xEF, 0x57, 0xDA},
+		[]byte{0xB1, 0xB8, 0xCC, 0x0B, 0x25, 0x0F, 0x09, 0xA0}},
+	{
+		[]byte{0x07, 0xA1, 0x13, 0x3E, 0x4A, 0x0B, 0x26, 0x86},
+		[]byte{0x02, 0x48, 0xD4, 0x38, 0x06, 0xF6, 0x71, 0x72},
+		[]byte{0x17, 0x30, 0xE5, 0x77, 0x8B, 0xEA, 0x1D, 0xA4}},
+	{
+		[]byte{0x38, 0x49, 0x67, 0x4C, 0x26, 0x02, 0x31, 0x9E},
+		[]byte{0x51, 0x45, 0x4B, 0x58, 0x2D, 0xDF, 0x44, 0x0A},
+		[]byte{0xA2, 0x5E, 0x78, 0x56, 0xCF, 0x26, 0x51, 0xEB}},
+	{
+		[]byte{0x04, 0xB9, 0x15, 0xBA, 0x43, 0xFE, 0xB5, 0xB6},
+		[]byte{0x42, 0xFD, 0x44, 0x30, 0x59, 0x57, 0x7F, 0xA2},
+		[]byte{0x35, 0x38, 0x82, 0xB1, 0x09, 0xCE, 0x8F, 0x1A}},
+	{
+		[]byte{0x01, 0x13, 0xB9, 0x70, 0xFD, 0x34, 0xF2, 0xCE},
+		[]byte{0x05, 0x9B, 0x5E, 0x08, 0x51, 0xCF, 0x14, 0x3A},
+		[]byte{0x48, 0xF4, 0xD0, 0x88, 0x4C, 0x37, 0x99, 0x18}},
+	{
+		[]byte{0x01, 0x70, 0xF1, 0x75, 0x46, 0x8F, 0xB5, 0xE6},
+		[]byte{0x07, 0x56, 0xD8, 0xE0, 0x77, 0x47, 0x61, 0xD2},
+		[]byte{0x43, 0x21, 0x93, 0xB7, 0x89, 0x51, 0xFC, 0x98}},
+	{
+		[]byte{0x43, 0x29, 0x7F, 0xAD, 0x38, 0xE3, 0x73, 0xFE},
+		[]byte{0x76, 0x25, 0x14, 0xB8, 0x29, 0xBF, 0x48, 0x6A},
+		[]byte{0x13, 0xF0, 0x41, 0x54, 0xD6, 0x9D, 0x1A, 0xE5}},
+	{
+		[]byte{0x07, 0xA7, 0x13, 0x70, 0x45, 0xDA, 0x2A, 0x16},
+		[]byte{0x3B, 0xDD, 0x11, 0x90, 0x49, 0x37, 0x28, 0x02},
+		[]byte{0x2E, 0xED, 0xDA, 0x93, 0xFF, 0xD3, 0x9C, 0x79}},
+	{
+		[]byte{0x04, 0x68, 0x91, 0x04, 0xC2, 0xFD, 0x3B, 0x2F},
+		[]byte{0x26, 0x95, 0x5F, 0x68, 0x35, 0xAF, 0x60, 0x9A},
+		[]byte{0xD8, 0x87, 0xE0, 0x39, 0x3C, 0x2D, 0xA6, 0xE3}},
+	{
+		[]byte{0x37, 0xD0, 0x6B, 0xB5, 0x16, 0xCB, 0x75, 0x46},
+		[]byte{0x16, 0x4D, 0x5E, 0x40, 0x4F, 0x27, 0x52, 0x32},
+		[]byte{0x5F, 0x99, 0xD0, 0x4F, 0x5B, 0x16, 0x39, 0x69}},
+	{
+		[]byte{0x1F, 0x08, 0x26, 0x0D, 0x1A, 0xC2, 0x46, 0x5E},
+		[]byte{0x6B, 0x05, 0x6E, 0x18, 0x75, 0x9F, 0x5C, 0xCA},
+		[]byte{0x4A, 0x05, 0x7A, 0x3B, 0x24, 0xD3, 0x97, 0x7B}},
+	{
+		[]byte{0x58, 0x40, 0x23, 0x64, 0x1A, 0xBA, 0x61, 0x76},
+		[]byte{0x00, 0x4B, 0xD6, 0xEF, 0x09, 0x17, 0x60, 0x62},
+		[]byte{0x45, 0x20, 0x31, 0xC1, 0xE4, 0xFA, 0xDA, 0x8E}},
+	{
+		[]byte{0x02, 0x58, 0x16, 0x16, 0x46, 0x29, 0xB0, 0x07},
+		[]byte{0x48, 0x0D, 0x39, 0x00, 0x6E, 0xE7, 0x62, 0xF2},
+		[]byte{0x75, 0x55, 0xAE, 0x39, 0xF5, 0x9B, 0x87, 0xBD}},
+	{
+		[]byte{0x49, 0x79, 0x3E, 0xBC, 0x79, 0xB3, 0x25, 0x8F},
+		[]byte{0x43, 0x75, 0x40, 0xC8, 0x69, 0x8F, 0x3C, 0xFA},
+		[]byte{0x53, 0xC5, 0x5F, 0x9C, 0xB4, 0x9F, 0xC0, 0x19}},
+	{
+		[]byte{0x4F, 0xB0, 0x5E, 0x15, 0x15, 0xAB, 0x73, 0xA7},
+		[]byte{0x07, 0x2D, 0x43, 0xA0, 0x77, 0x07, 0x52, 0x92},
+		[]byte{0x7A, 0x8E, 0x7B, 0xFA, 0x93, 0x7E, 0x89, 0xA3}},
+	{
+		[]byte{0x49, 0xE9, 0x5D, 0x6D, 0x4C, 0xA2, 0x29, 0xBF},
+		[]byte{0x02, 0xFE, 0x55, 0x77, 0x81, 0x17, 0xF1, 0x2A},
+		[]byte{0xCF, 0x9C, 0x5D, 0x7A, 0x49, 0x86, 0xAD, 0xB5}},
+	{
+		[]byte{0x01, 0x83, 0x10, 0xDC, 0x40, 0x9B, 0x26, 0xD6},
+		[]byte{0x1D, 0x9D, 0x5C, 0x50, 0x18, 0xF7, 0x28, 0xC2},
+		[]byte{0xD1, 0xAB, 0xB2, 0x90, 0x65, 0x8B, 0xC7, 0x78}},
+	{
+		[]byte{0x1C, 0x58, 0x7F, 0x1C, 0x13, 0x92, 0x4F, 0xEF},
+		[]byte{0x30, 0x55, 0x32, 0x28, 0x6D, 0x6F, 0x29, 0x5A},
+		[]byte{0x55, 0xCB, 0x37, 0x74, 0xD1, 0x3E, 0xF2, 0x01}},
+	{
+		[]byte{0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01},
+		[]byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
+		[]byte{0xFA, 0x34, 0xEC, 0x48, 0x47, 0xB2, 0x68, 0xB2}},
+	{
+		[]byte{0x1F, 0x1F, 0x1F, 0x1F, 0x0E, 0x0E, 0x0E, 0x0E},
+		[]byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
+		[]byte{0xA7, 0x90, 0x79, 0x51, 0x08, 0xEA, 0x3C, 0xAE}},
+	{
+		[]byte{0xE0, 0xFE, 0xE0, 0xFE, 0xF1, 0xFE, 0xF1, 0xFE},
+		[]byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
+		[]byte{0xC3, 0x9E, 0x07, 0x2D, 0x9F, 0xAC, 0x63, 0x1D}},
+	{
+		[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		[]byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
+		[]byte{0x01, 0x49, 0x33, 0xE0, 0xCD, 0xAF, 0xF6, 0xE4}},
+	{
+		[]byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
+		[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		[]byte{0xF2, 0x1E, 0x9A, 0x77, 0xB7, 0x1C, 0x49, 0xBC}},
+	{
+		[]byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
+		[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		[]byte{0x24, 0x59, 0x46, 0x88, 0x57, 0x54, 0x36, 0x9A}},
+	{
+		[]byte{0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10},
+		[]byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
+		[]byte{0x6B, 0x5C, 0x5A, 0x9C, 0x5D, 0x9E, 0x0A, 0x5A}},
+}
+
+func TestCipherEncrypt(t *testing.T) {
+	for i, tt := range encryptTests {
+		c, err := NewCipher(tt.key)
+		if err != nil {
+			t.Errorf("NewCipher(%d bytes) = %s", len(tt.key), err)
+			continue
+		}
+		ct := make([]byte, len(tt.out))
+		c.Encrypt(ct, tt.in)
+		for j, v := range ct {
+			if v != tt.out[j] {
+				t.Errorf("Cipher.Encrypt, test vector #%d: cipher-text[%d] = %#x, expected %#x", i, j, v, tt.out[j])
+				break
+			}
+		}
+	}
+}
+
+func TestCipherDecrypt(t *testing.T) {
+	for i, tt := range encryptTests {
+		c, err := NewCipher(tt.key)
+		if err != nil {
+			t.Errorf("NewCipher(%d bytes) = %s", len(tt.key), err)
+			continue
+		}
+		pt := make([]byte, len(tt.in))
+		c.Decrypt(pt, tt.out)
+		for j, v := range pt {
+			if v != tt.in[j] {
+				t.Errorf("Cipher.Decrypt, test vector #%d: plain-text[%d] = %#x, expected %#x", i, j, v, tt.in[j])
+				break
+			}
+		}
+	}
+}
+
+func TestSaltedCipherKeyLength(t *testing.T) {
+	if _, err := NewSaltedCipher(nil, []byte{'a'}); err != KeySizeError(0) {
+		t.Errorf("NewSaltedCipher with short key, gave error %#v, expected %#v", err, KeySizeError(0))
+	}
+
+	// A 57-byte key. One over the typical blowfish restriction.
+	key := []byte("012345678901234567890123456789012345678901234567890123456")
+	if _, err := NewSaltedCipher(key, []byte{'a'}); err != nil {
+		t.Errorf("NewSaltedCipher with long key, gave error %#v", err)
+	}
+}
+
+// Test vectors generated with Blowfish from OpenSSH.
+var saltedVectors = [][8]byte{
+	{0x0c, 0x82, 0x3b, 0x7b, 0x8d, 0x01, 0x4b, 0x7e},
+	{0xd1, 0xe1, 0x93, 0xf0, 0x70, 0xa6, 0xdb, 0x12},
+	{0xfc, 0x5e, 0xba, 0xde, 0xcb, 0xf8, 0x59, 0xad},
+	{0x8a, 0x0c, 0x76, 0xe7, 0xdd, 0x2c, 0xd3, 0xa8},
+	{0x2c, 0xcb, 0x7b, 0xee, 0xac, 0x7b, 0x7f, 0xf8},
+	{0xbb, 0xf6, 0x30, 0x6f, 0xe1, 0x5d, 0x62, 0xbf},
+	{0x97, 0x1e, 0xc1, 0x3d, 0x3d, 0xe0, 0x11, 0xe9},
+	{0x06, 0xd7, 0x4d, 0xb1, 0x80, 0xa3, 0xb1, 0x38},
+	{0x67, 0xa1, 0xa9, 0x75, 0x0e, 0x5b, 0xc6, 0xb4},
+	{0x51, 0x0f, 0x33, 0x0e, 0x4f, 0x67, 0xd2, 0x0c},
+	{0xf1, 0x73, 0x7e, 0xd8, 0x44, 0xea, 0xdb, 0xe5},
+	{0x14, 0x0e, 0x16, 0xce, 0x7f, 0x4a, 0x9c, 0x7b},
+	{0x4b, 0xfe, 0x43, 0xfd, 0xbf, 0x36, 0x04, 0x47},
+	{0xb1, 0xeb, 0x3e, 0x15, 0x36, 0xa7, 0xbb, 0xe2},
+	{0x6d, 0x0b, 0x41, 0xdd, 0x00, 0x98, 0x0b, 0x19},
+	{0xd3, 0xce, 0x45, 0xce, 0x1d, 0x56, 0xb7, 0xfc},
+	{0xd9, 0xf0, 0xfd, 0xda, 0xc0, 0x23, 0xb7, 0x93},
+	{0x4c, 0x6f, 0xa1, 0xe4, 0x0c, 0xa8, 0xca, 0x57},
+	{0xe6, 0x2f, 0x28, 0xa7, 0x0c, 0x94, 0x0d, 0x08},
+	{0x8f, 0xe3, 0xf0, 0xb6, 0x29, 0xe3, 0x44, 0x03},
+	{0xff, 0x98, 0xdd, 0x04, 0x45, 0xb4, 0x6d, 0x1f},
+	{0x9e, 0x45, 0x4d, 0x18, 0x40, 0x53, 0xdb, 0xef},
+	{0xb7, 0x3b, 0xef, 0x29, 0xbe, 0xa8, 0x13, 0x71},
+	{0x02, 0x54, 0x55, 0x41, 0x8e, 0x04, 0xfc, 0xad},
+	{0x6a, 0x0a, 0xee, 0x7c, 0x10, 0xd9, 0x19, 0xfe},
+	{0x0a, 0x22, 0xd9, 0x41, 0xcc, 0x23, 0x87, 0x13},
+	{0x6e, 0xff, 0x1f, 0xff, 0x36, 0x17, 0x9c, 0xbe},
+	{0x79, 0xad, 0xb7, 0x40, 0xf4, 0x9f, 0x51, 0xa6},
+	{0x97, 0x81, 0x99, 0xa4, 0xde, 0x9e, 0x9f, 0xb6},
+	{0x12, 0x19, 0x7a, 0x28, 0xd0, 0xdc, 0xcc, 0x92},
+	{0x81, 0xda, 0x60, 0x1e, 0x0e, 0xdd, 0x65, 0x56},
+	{0x7d, 0x76, 0x20, 0xb2, 0x73, 0xc9, 0x9e, 0xee},
+}
+
+func TestSaltedCipher(t *testing.T) {
+	var key, salt [32]byte
+	for i := range key {
+		key[i] = byte(i)
+		salt[i] = byte(i + 32)
+	}
+	for i, v := range saltedVectors {
+		c, err := NewSaltedCipher(key[:], salt[:i])
+		if err != nil {
+			t.Fatal(err)
+		}
+		var buf [8]byte
+		c.Encrypt(buf[:], buf[:])
+		if v != buf {
+			t.Errorf("%d: expected %x, got %x", i, v, buf)
+		}
+	}
+}
+
+func BenchmarkExpandKeyWithSalt(b *testing.B) {
+	key := make([]byte, 32)
+	salt := make([]byte, 16)
+	c, _ := NewCipher(key)
+	for i := 0; i < b.N; i++ {
+		expandKeyWithSalt(key, salt, c)
+	}
+}
+
+func BenchmarkExpandKey(b *testing.B) {
+	key := make([]byte, 32)
+	c, _ := NewCipher(key)
+	for i := 0; i < b.N; i++ {
+		ExpandKey(key, c)
+	}
+}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/blowfish/cipher.go b/Godeps/_workspace/src/golang.org/x/crypto/blowfish/cipher.go
new file mode 100644
index 00000000..542984aa
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/crypto/blowfish/cipher.go
@@ -0,0 +1,91 @@
+// Copyright 2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package blowfish implements Bruce Schneier's Blowfish encryption algorithm.
+package blowfish // import "golang.org/x/crypto/blowfish"
+
+// The code is a port of Bruce Schneier's C implementation.
+// See http://www.schneier.com/blowfish.html.
+
+import "strconv"
+
+// The Blowfish block size in bytes.
+const BlockSize = 8
+
+// A Cipher is an instance of Blowfish encryption using a particular key.
+type Cipher struct {
+	p              [18]uint32
+	s0, s1, s2, s3 [256]uint32
+}
+
+type KeySizeError int
+
+func (k KeySizeError) Error() string {
+	return "crypto/blowfish: invalid key size " + strconv.Itoa(int(k))
+}
+
+// NewCipher creates and returns a Cipher.
+// The key argument should be the Blowfish key, from 1 to 56 bytes.
+func NewCipher(key []byte) (*Cipher, error) {
+	var result Cipher
+	if k := len(key); k < 1 || k > 56 {
+		return nil, KeySizeError(k)
+	}
+	initCipher(&result)
+	ExpandKey(key, &result)
+	return &result, nil
+}
+
+// NewSaltedCipher creates a returns a Cipher that folds a salt into its key
+// schedule. For most purposes, NewCipher, instead of NewSaltedCipher, is
+// sufficient and desirable. For bcrypt compatiblity, the key can be over 56
+// bytes.
+func NewSaltedCipher(key, salt []byte) (*Cipher, error) {
+	if len(salt) == 0 {
+		return NewCipher(key)
+	}
+	var result Cipher
+	if k := len(key); k < 1 {
+		return nil, KeySizeError(k)
+	}
+	initCipher(&result)
+	expandKeyWithSalt(key, salt, &result)
+	return &result, nil
+}
+
+// BlockSize returns the Blowfish block size, 8 bytes.
+// It is necessary to satisfy the Block interface in the
+// package "crypto/cipher".
+func (c *Cipher) BlockSize() int { return BlockSize }
+
+// Encrypt encrypts the 8-byte buffer src using the key k
+// and stores the result in dst.
+// Note that for amounts of data larger than a block,
+// it is not safe to just call Encrypt on successive blocks;
+// instead, use an encryption mode like CBC (see crypto/cipher/cbc.go).
+func (c *Cipher) Encrypt(dst, src []byte) {
+	l := uint32(src[0])<<24 | uint32(src[1])<<16 | uint32(src[2])<<8 | uint32(src[3])
+	r := uint32(src[4])<<24 | uint32(src[5])<<16 | uint32(src[6])<<8 | uint32(src[7])
+	l, r = encryptBlock(l, r, c)
+	dst[0], dst[1], dst[2], dst[3] = byte(l>>24), byte(l>>16), byte(l>>8), byte(l)
+	dst[4], dst[5], dst[6], dst[7] = byte(r>>24), byte(r>>16), byte(r>>8), byte(r)
+}
+
+// Decrypt decrypts the 8-byte buffer src using the key k
+// and stores the result in dst.
+func (c *Cipher) Decrypt(dst, src []byte) {
+	l := uint32(src[0])<<24 | uint32(src[1])<<16 | uint32(src[2])<<8 | uint32(src[3])
+	r := uint32(src[4])<<24 | uint32(src[5])<<16 | uint32(src[6])<<8 | uint32(src[7])
+	l, r = decryptBlock(l, r, c)
+	dst[0], dst[1], dst[2], dst[3] = byte(l>>24), byte(l>>16), byte(l>>8), byte(l)
+	dst[4], dst[5], dst[6], dst[7] = byte(r>>24), byte(r>>16), byte(r>>8), byte(r)
+}
+
+func initCipher(c *Cipher) {
+	copy(c.p[0:], p[0:])
+	copy(c.s0[0:], s0[0:])
+	copy(c.s1[0:], s1[0:])
+	copy(c.s2[0:], s2[0:])
+	copy(c.s3[0:], s3[0:])
+}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/blowfish/const.go b/Godeps/_workspace/src/golang.org/x/crypto/blowfish/const.go
new file mode 100644
index 00000000..8c5ee4cb
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/crypto/blowfish/const.go
@@ -0,0 +1,199 @@
+// Copyright 2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// The startup permutation array and substitution boxes.
+// They are the hexadecimal digits of PI; see:
+// http://www.schneier.com/code/constants.txt.
+
+package blowfish
+
+var s0 = [256]uint32{
+	0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7, 0xb8e1afed, 0x6a267e96,
+	0xba7c9045, 0xf12c7f99, 0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
+	0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e, 0x0d95748f, 0x728eb658,
+	0x718bcd58, 0x82154aee, 0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
+	0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef, 0x8e79dcb0, 0x603a180e,
+	0x6c9e0e8b, 0xb01e8a3e, 0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
+	0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440, 0x55ca396a, 0x2aab10b6,
+	0xb4cc5c34, 0x1141e8ce, 0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
+	0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e, 0xafd6ba33, 0x6c24cf5c,
+	0x7a325381, 0x28958677, 0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
+	0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032, 0xef845d5d, 0xe98575b1,
+	0xdc262302, 0xeb651b88, 0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
+	0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e, 0x21c66842, 0xf6e96c9a,
+	0x670c9c61, 0xabd388f0, 0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
+	0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98, 0xa1f1651d, 0x39af0176,
+	0x66ca593e, 0x82430e88, 0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
+	0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6, 0x4ed3aa62, 0x363f7706,
+	0x1bfedf72, 0x429b023d, 0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
+	0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7, 0xe3fe501a, 0xb6794c3b,
+	0x976ce0bd, 0x04c006ba, 0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
+	0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f, 0x6dfc511f, 0x9b30952c,
+	0xcc814544, 0xaf5ebd09, 0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
+	0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb, 0x5579c0bd, 0x1a60320a,
+	0xd6a100c6, 0x402c7279, 0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
+	0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab, 0x323db5fa, 0xfd238760,
+	0x53317b48, 0x3e00df82, 0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
+	0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573, 0x695b27b0, 0xbbca58c8,
+	0xe1ffa35d, 0xb8f011a0, 0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
+	0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790, 0xe1ddf2da, 0xa4cb7e33,
+	0x62fb1341, 0xcee4c6e8, 0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
+	0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0, 0xd08ed1d0, 0xafc725e0,
+	0x8e3c5b2f, 0x8e7594b7, 0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
+	0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad, 0x2f2f2218, 0xbe0e1777,
+	0xea752dfe, 0x8b021fa1, 0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
+	0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9, 0x165fa266, 0x80957705,
+	0x93cc7314, 0x211a1477, 0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
+	0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49, 0x00250e2d, 0x2071b35e,
+	0x226800bb, 0x57b8e0af, 0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
+	0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5, 0x83260376, 0x6295cfa9,
+	0x11c81968, 0x4e734a41, 0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
+	0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400, 0x08ba6fb5, 0x571be91f,
+	0xf296ec6b, 0x2a0dd915, 0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
+	0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a,
+}
+
+var s1 = [256]uint32{
+	0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623, 0xad6ea6b0, 0x49a7df7d,
+	0x9cee60b8, 0x8fedb266, 0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
+	0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e, 0x3f54989a, 0x5b429d65,
+	0x6b8fe4d6, 0x99f73fd6, 0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
+	0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e, 0x09686b3f, 0x3ebaefc9,
+	0x3c971814, 0x6b6a70a1, 0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
+	0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8, 0xb03ada37, 0xf0500c0d,
+	0xf01c1f04, 0x0200b3ff, 0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
+	0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701, 0x3ae5e581, 0x37c2dadc,
+	0xc8b57634, 0x9af3dda7, 0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
+	0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331, 0x4e548b38, 0x4f6db908,
+	0x6f420d03, 0xf60a04bf, 0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
+	0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e, 0x5512721f, 0x2e6b7124,
+	0x501adde6, 0x9f84cd87, 0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
+	0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2, 0xef1c1847, 0x3215d908,
+	0xdd433b37, 0x24c2ba16, 0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
+	0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b, 0x043556f1, 0xd7a3c76b,
+	0x3c11183b, 0x5924a509, 0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
+	0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3, 0x771fe71c, 0x4e3d06fa,
+	0x2965dcb9, 0x99e71d0f, 0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
+	0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4, 0xf2f74ea7, 0x361d2b3d,
+	0x1939260f, 0x19c27960, 0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
+	0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28, 0xc332ddef, 0xbe6c5aa5,
+	0x65582185, 0x68ab9802, 0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
+	0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510, 0x13cca830, 0xeb61bd96,
+	0x0334fe1e, 0xaa0363cf, 0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
+	0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e, 0x648b1eaf, 0x19bdf0ca,
+	0xa02369b9, 0x655abb50, 0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
+	0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8, 0xf837889a, 0x97e32d77,
+	0x11ed935f, 0x16681281, 0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
+	0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696, 0xcdb30aeb, 0x532e3054,
+	0x8fd948e4, 0x6dbc3128, 0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
+	0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0, 0x45eee2b6, 0xa3aaabea,
+	0xdb6c4f15, 0xfacb4fd0, 0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
+	0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250, 0xcf62a1f2, 0x5b8d2646,
+	0xfc8883a0, 0xc1c7b6a3, 0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
+	0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00, 0x58428d2a, 0x0c55f5ea,
+	0x1dadf43e, 0x233f7061, 0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
+	0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e, 0xa6078084, 0x19f8509e,
+	0xe8efd855, 0x61d99735, 0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
+	0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9, 0xdb73dbd3, 0x105588cd,
+	0x675fda79, 0xe3674340, 0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
+	0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7,
+}
+
+var s2 = [256]uint32{
+	0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934, 0x411520f7, 0x7602d4f7,
+	0xbcf46b2e, 0xd4a20068, 0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af,
+	0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840, 0x4d95fc1d, 0x96b591af,
+	0x70f4ddd3, 0x66a02f45, 0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
+	0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a, 0x28507825, 0x530429f4,
+	0x0a2c86da, 0xe9b66dfb, 0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee,
+	0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6, 0xaace1e7c, 0xd3375fec,
+	0xce78a399, 0x406b2a42, 0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
+	0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2, 0x3a6efa74, 0xdd5b4332,
+	0x6841e7f7, 0xca7820fb, 0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527,
+	0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b, 0x55a867bc, 0xa1159a58,
+	0xcca92963, 0x99e1db33, 0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
+	0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3, 0x95c11548, 0xe4c66d22,
+	0x48c1133f, 0xc70f86dc, 0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17,
+	0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564, 0x257b7834, 0x602a9c60,
+	0xdff8e8a3, 0x1f636c1b, 0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
+	0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922, 0x85b2a20e, 0xe6ba0d99,
+	0xde720c8c, 0x2da2f728, 0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0,
+	0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e, 0x0a476341, 0x992eff74,
+	0x3a6f6eab, 0xf4f8fd37, 0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
+	0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804, 0xf1290dc7, 0xcc00ffa3,
+	0xb5390f92, 0x690fed0b, 0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
+	0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb, 0x37392eb3, 0xcc115979,
+	0x8026e297, 0xf42e312d, 0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
+	0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350, 0x1a6b1018, 0x11caedfa,
+	0x3d25bdd8, 0xe2e1c3c9, 0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a,
+	0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe, 0x9dbc8057, 0xf0f7c086,
+	0x60787bf8, 0x6003604d, 0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
+	0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f, 0x77a057be, 0xbde8ae24,
+	0x55464299, 0xbf582e61, 0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2,
+	0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9, 0x7aeb2661, 0x8b1ddf84,
+	0x846a0e79, 0x915f95e2, 0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
+	0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e, 0xb77f19b6, 0xe0a9dc09,
+	0x662d09a1, 0xc4324633, 0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10,
+	0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169, 0xdcb7da83, 0x573906fe,
+	0xa1e2ce9b, 0x4fcd7f52, 0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
+	0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5, 0xf0177a28, 0xc0f586e0,
+	0x006058aa, 0x30dc7d62, 0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
+	0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76, 0x6f05e409, 0x4b7c0188,
+	0x39720a3d, 0x7c927c24, 0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
+	0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4, 0x1e50ef5e, 0xb161e6f8,
+	0xa28514d9, 0x6c51133c, 0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837,
+	0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0,
+}
+
+var s3 = [256]uint32{
+	0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b, 0x5cb0679e, 0x4fa33742,
+	0xd3822740, 0x99bc9bbe, 0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
+	0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4, 0x5748ab2f, 0xbc946e79,
+	0xc6a376d2, 0x6549c2c8, 0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
+	0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304, 0xa1fad5f0, 0x6a2d519a,
+	0x63ef8ce2, 0x9a86ee22, 0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4,
+	0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6, 0x2826a2f9, 0xa73a3ae1,
+	0x4ba99586, 0xef5562e9, 0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
+	0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593, 0xe990fd5a, 0x9e34d797,
+	0x2cf0b7d9, 0x022b8b51, 0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28,
+	0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c, 0xe029ac71, 0xe019a5e6,
+	0x47b0acfd, 0xed93fa9b, 0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
+	0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c, 0x15056dd4, 0x88f46dba,
+	0x03a16125, 0x0564f0bd, 0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a,
+	0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319, 0x7533d928, 0xb155fdf5,
+	0x03563482, 0x8aba3cbb, 0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
+	0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991, 0xea7a90c2, 0xfb3e7bce,
+	0x5121ce64, 0x774fbe32, 0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680,
+	0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166, 0xb39a460a, 0x6445c0dd,
+	0x586cdecf, 0x1c20c8ae, 0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
+	0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5, 0x72eacea8, 0xfa6484bb,
+	0x8d6612ae, 0xbf3c6f47, 0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
+	0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d, 0x4040cb08, 0x4eb4e2cc,
+	0x34d2466a, 0x0115af84, 0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
+	0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8, 0x611560b1, 0xe7933fdc,
+	0xbb3a792b, 0x344525bd, 0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9,
+	0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7, 0x1a908749, 0xd44fbd9a,
+	0xd0dadecb, 0xd50ada38, 0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
+	0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c, 0xbf97222c, 0x15e6fc2a,
+	0x0f91fc71, 0x9b941525, 0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1,
+	0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442, 0xe0ec6e0e, 0x1698db3b,
+	0x4c98a0be, 0x3278e964, 0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
+	0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8, 0xdf359f8d, 0x9b992f2e,
+	0xe60b6f47, 0x0fe3f11d, 0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f,
+	0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299, 0xf523f357, 0xa6327623,
+	0x93a83531, 0x56cccd02, 0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
+	0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614, 0xe6c6c7bd, 0x327a140a,
+	0x45e1d006, 0xc3f27b9a, 0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
+	0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b, 0x53113ec0, 0x1640e3d3,
+	0x38abbd60, 0x2547adf0, 0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
+	0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e, 0x1948c25c, 0x02fb8a8c,
+	0x01c36ae4, 0xd6ebe1f9, 0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
+	0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6,
+}
+
+var p = [18]uint32{
+	0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344, 0xa4093822, 0x299f31d0,
+	0x082efa98, 0xec4e6c89, 0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
+	0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917, 0x9216d5d9, 0x8979fb1b,
+}
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/atom/atom.go b/Godeps/_workspace/src/golang.org/x/net/html/atom/atom.go
new file mode 100644
index 00000000..227404bd
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/atom/atom.go
@@ -0,0 +1,78 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package atom provides integer codes (also known as atoms) for a fixed set of
+// frequently occurring HTML strings: tag names and attribute keys such as "p"
+// and "id".
+//
+// Sharing an atom's name between all elements with the same tag can result in
+// fewer string allocations when tokenizing and parsing HTML. Integer
+// comparisons are also generally faster than string comparisons.
+//
+// The value of an atom's particular code is not guaranteed to stay the same
+// between versions of this package. Neither is any ordering guaranteed:
+// whether atom.H1 < atom.H2 may also change. The codes are not guaranteed to
+// be dense. The only guarantees are that e.g. looking up "div" will yield
+// atom.Div, calling atom.Div.String will return "div", and atom.Div != 0.
+package atom
+
+// Atom is an integer code for a string. The zero value maps to "".
+type Atom uint32
+
+// String returns the atom's name.
+func (a Atom) String() string {
+	start := uint32(a >> 8)
+	n := uint32(a & 0xff)
+	if start+n > uint32(len(atomText)) {
+		return ""
+	}
+	return atomText[start : start+n]
+}
+
+func (a Atom) string() string {
+	return atomText[a>>8 : a>>8+a&0xff]
+}
+
+// fnv computes the FNV hash with an arbitrary starting value h.
+func fnv(h uint32, s []byte) uint32 {
+	for i := range s {
+		h ^= uint32(s[i])
+		h *= 16777619
+	}
+	return h
+}
+
+func match(s string, t []byte) bool {
+	for i, c := range t {
+		if s[i] != c {
+			return false
+		}
+	}
+	return true
+}
+
+// Lookup returns the atom whose name is s. It returns zero if there is no
+// such atom. The lookup is case sensitive.
+func Lookup(s []byte) Atom {
+	if len(s) == 0 || len(s) > maxAtomLen {
+		return 0
+	}
+	h := fnv(hash0, s)
+	if a := table[h&uint32(len(table)-1)]; int(a&0xff) == len(s) && match(a.string(), s) {
+		return a
+	}
+	if a := table[(h>>16)&uint32(len(table)-1)]; int(a&0xff) == len(s) && match(a.string(), s) {
+		return a
+	}
+	return 0
+}
+
+// String returns a string whose contents are equal to s. In that sense, it is
+// equivalent to string(s) but may be more efficient.
+func String(s []byte) string {
+	if a := Lookup(s); a != 0 {
+		return a.String()
+	}
+	return string(s)
+}
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/atom/atom_test.go b/Godeps/_workspace/src/golang.org/x/net/html/atom/atom_test.go
new file mode 100644
index 00000000..6e33704d
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/atom/atom_test.go
@@ -0,0 +1,109 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package atom
+
+import (
+	"sort"
+	"testing"
+)
+
+func TestKnown(t *testing.T) {
+	for _, s := range testAtomList {
+		if atom := Lookup([]byte(s)); atom.String() != s {
+			t.Errorf("Lookup(%q) = %#x (%q)", s, uint32(atom), atom.String())
+		}
+	}
+}
+
+func TestHits(t *testing.T) {
+	for _, a := range table {
+		if a == 0 {
+			continue
+		}
+		got := Lookup([]byte(a.String()))
+		if got != a {
+			t.Errorf("Lookup(%q) = %#x, want %#x", a.String(), uint32(got), uint32(a))
+		}
+	}
+}
+
+func TestMisses(t *testing.T) {
+	testCases := []string{
+		"",
+		"\x00",
+		"\xff",
+		"A",
+		"DIV",
+		"Div",
+		"dIV",
+		"aa",
+		"a\x00",
+		"ab",
+		"abb",
+		"abbr0",
+		"abbr ",
+		" abbr",
+		" a",
+		"acceptcharset",
+		"acceptCharset",
+		"accept_charset",
+		"h0",
+		"h1h2",
+		"h7",
+		"onClick",
+		"λ",
+		// The following string has the same hash (0xa1d7fab7) as "onmouseover".
+		"\x00\x00\x00\x00\x00\x50\x18\xae\x38\xd0\xb7",
+	}
+	for _, tc := range testCases {
+		got := Lookup([]byte(tc))
+		if got != 0 {
+			t.Errorf("Lookup(%q): got %d, want 0", tc, got)
+		}
+	}
+}
+
+func TestForeignObject(t *testing.T) {
+	const (
+		afo = Foreignobject
+		afO = ForeignObject
+		sfo = "foreignobject"
+		sfO = "foreignObject"
+	)
+	if got := Lookup([]byte(sfo)); got != afo {
+		t.Errorf("Lookup(%q): got %#v, want %#v", sfo, got, afo)
+	}
+	if got := Lookup([]byte(sfO)); got != afO {
+		t.Errorf("Lookup(%q): got %#v, want %#v", sfO, got, afO)
+	}
+	if got := afo.String(); got != sfo {
+		t.Errorf("Atom(%#v).String(): got %q, want %q", afo, got, sfo)
+	}
+	if got := afO.String(); got != sfO {
+		t.Errorf("Atom(%#v).String(): got %q, want %q", afO, got, sfO)
+	}
+}
+
+func BenchmarkLookup(b *testing.B) {
+	sortedTable := make([]string, 0, len(table))
+	for _, a := range table {
+		if a != 0 {
+			sortedTable = append(sortedTable, a.String())
+		}
+	}
+	sort.Strings(sortedTable)
+
+	x := make([][]byte, 1000)
+	for i := range x {
+		x[i] = []byte(sortedTable[i%len(sortedTable)])
+	}
+
+	b.ResetTimer()
+	for i := 0; i < b.N; i++ {
+		for _, s := range x {
+			Lookup(s)
+		}
+	}
+}
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/atom/gen.go b/Godeps/_workspace/src/golang.org/x/net/html/atom/gen.go
new file mode 100644
index 00000000..6bfa8660
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/atom/gen.go
@@ -0,0 +1,648 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build ignore
+
+package main
+
+// This program generates table.go and table_test.go.
+// Invoke as
+//
+//	go run gen.go |gofmt >table.go
+//	go run gen.go -test |gofmt >table_test.go
+
+import (
+	"flag"
+	"fmt"
+	"math/rand"
+	"os"
+	"sort"
+	"strings"
+)
+
+// identifier converts s to a Go exported identifier.
+// It converts "div" to "Div" and "accept-charset" to "AcceptCharset".
+func identifier(s string) string {
+	b := make([]byte, 0, len(s))
+	cap := true
+	for _, c := range s {
+		if c == '-' {
+			cap = true
+			continue
+		}
+		if cap && 'a' <= c && c <= 'z' {
+			c -= 'a' - 'A'
+		}
+		cap = false
+		b = append(b, byte(c))
+	}
+	return string(b)
+}
+
+var test = flag.Bool("test", false, "generate table_test.go")
+
+func main() {
+	flag.Parse()
+
+	var all []string
+	all = append(all, elements...)
+	all = append(all, attributes...)
+	all = append(all, eventHandlers...)
+	all = append(all, extra...)
+	sort.Strings(all)
+
+	if *test {
+		fmt.Printf("// generated by go run gen.go -test; DO NOT EDIT\n\n")
+		fmt.Printf("package atom\n\n")
+		fmt.Printf("var testAtomList = []string{\n")
+		for _, s := range all {
+			fmt.Printf("\t%q,\n", s)
+		}
+		fmt.Printf("}\n")
+		return
+	}
+
+	// uniq - lists have dups
+	// compute max len too
+	maxLen := 0
+	w := 0
+	for _, s := range all {
+		if w == 0 || all[w-1] != s {
+			if maxLen < len(s) {
+				maxLen = len(s)
+			}
+			all[w] = s
+			w++
+		}
+	}
+	all = all[:w]
+
+	// Find hash that minimizes table size.
+	var best *table
+	for i := 0; i < 1000000; i++ {
+		if best != nil && 1<<(best.k-1) < len(all) {
+			break
+		}
+		h := rand.Uint32()
+		for k := uint(0); k <= 16; k++ {
+			if best != nil && k >= best.k {
+				break
+			}
+			var t table
+			if t.init(h, k, all) {
+				best = &t
+				break
+			}
+		}
+	}
+	if best == nil {
+		fmt.Fprintf(os.Stderr, "failed to construct string table\n")
+		os.Exit(1)
+	}
+
+	// Lay out strings, using overlaps when possible.
+	layout := append([]string{}, all...)
+
+	// Remove strings that are substrings of other strings
+	for changed := true; changed; {
+		changed = false
+		for i, s := range layout {
+			if s == "" {
+				continue
+			}
+			for j, t := range layout {
+				if i != j && t != "" && strings.Contains(s, t) {
+					changed = true
+					layout[j] = ""
+				}
+			}
+		}
+	}
+
+	// Join strings where one suffix matches another prefix.
+	for {
+		// Find best i, j, k such that layout[i][len-k:] == layout[j][:k],
+		// maximizing overlap length k.
+		besti := -1
+		bestj := -1
+		bestk := 0
+		for i, s := range layout {
+			if s == "" {
+				continue
+			}
+			for j, t := range layout {
+				if i == j {
+					continue
+				}
+				for k := bestk + 1; k <= len(s) && k <= len(t); k++ {
+					if s[len(s)-k:] == t[:k] {
+						besti = i
+						bestj = j
+						bestk = k
+					}
+				}
+			}
+		}
+		if bestk > 0 {
+			layout[besti] += layout[bestj][bestk:]
+			layout[bestj] = ""
+			continue
+		}
+		break
+	}
+
+	text := strings.Join(layout, "")
+
+	atom := map[string]uint32{}
+	for _, s := range all {
+		off := strings.Index(text, s)
+		if off < 0 {
+			panic("lost string " + s)
+		}
+		atom[s] = uint32(off<<8 | len(s))
+	}
+
+	// Generate the Go code.
+	fmt.Printf("// generated by go run gen.go; DO NOT EDIT\n\n")
+	fmt.Printf("package atom\n\nconst (\n")
+	for _, s := range all {
+		fmt.Printf("\t%s Atom = %#x\n", identifier(s), atom[s])
+	}
+	fmt.Printf(")\n\n")
+
+	fmt.Printf("const hash0 = %#x\n\n", best.h0)
+	fmt.Printf("const maxAtomLen = %d\n\n", maxLen)
+
+	fmt.Printf("var table = [1<<%d]Atom{\n", best.k)
+	for i, s := range best.tab {
+		if s == "" {
+			continue
+		}
+		fmt.Printf("\t%#x: %#x, // %s\n", i, atom[s], s)
+	}
+	fmt.Printf("}\n")
+	datasize := (1 << best.k) * 4
+
+	fmt.Printf("const atomText =\n")
+	textsize := len(text)
+	for len(text) > 60 {
+		fmt.Printf("\t%q +\n", text[:60])
+		text = text[60:]
+	}
+	fmt.Printf("\t%q\n\n", text)
+
+	fmt.Fprintf(os.Stderr, "%d atoms; %d string bytes + %d tables = %d total data\n", len(all), textsize, datasize, textsize+datasize)
+}
+
+type byLen []string
+
+func (x byLen) Less(i, j int) bool { return len(x[i]) > len(x[j]) }
+func (x byLen) Swap(i, j int)      { x[i], x[j] = x[j], x[i] }
+func (x byLen) Len() int           { return len(x) }
+
+// fnv computes the FNV hash with an arbitrary starting value h.
+func fnv(h uint32, s string) uint32 {
+	for i := 0; i < len(s); i++ {
+		h ^= uint32(s[i])
+		h *= 16777619
+	}
+	return h
+}
+
+// A table represents an attempt at constructing the lookup table.
+// The lookup table uses cuckoo hashing, meaning that each string
+// can be found in one of two positions.
+type table struct {
+	h0   uint32
+	k    uint
+	mask uint32
+	tab  []string
+}
+
+// hash returns the two hashes for s.
+func (t *table) hash(s string) (h1, h2 uint32) {
+	h := fnv(t.h0, s)
+	h1 = h & t.mask
+	h2 = (h >> 16) & t.mask
+	return
+}
+
+// init initializes the table with the given parameters.
+// h0 is the initial hash value,
+// k is the number of bits of hash value to use, and
+// x is the list of strings to store in the table.
+// init returns false if the table cannot be constructed.
+func (t *table) init(h0 uint32, k uint, x []string) bool {
+	t.h0 = h0
+	t.k = k
+	t.tab = make([]string, 1<<k)
+	t.mask = 1<<k - 1
+	for _, s := range x {
+		if !t.insert(s) {
+			return false
+		}
+	}
+	return true
+}
+
+// insert inserts s in the table.
+func (t *table) insert(s string) bool {
+	h1, h2 := t.hash(s)
+	if t.tab[h1] == "" {
+		t.tab[h1] = s
+		return true
+	}
+	if t.tab[h2] == "" {
+		t.tab[h2] = s
+		return true
+	}
+	if t.push(h1, 0) {
+		t.tab[h1] = s
+		return true
+	}
+	if t.push(h2, 0) {
+		t.tab[h2] = s
+		return true
+	}
+	return false
+}
+
+// push attempts to push aside the entry in slot i.
+func (t *table) push(i uint32, depth int) bool {
+	if depth > len(t.tab) {
+		return false
+	}
+	s := t.tab[i]
+	h1, h2 := t.hash(s)
+	j := h1 + h2 - i
+	if t.tab[j] != "" && !t.push(j, depth+1) {
+		return false
+	}
+	t.tab[j] = s
+	return true
+}
+
+// The lists of element names and attribute keys were taken from
+// https://html.spec.whatwg.org/multipage/indices.html#index
+// as of the "HTML Living Standard - Last Updated 21 February 2015" version.
+
+var elements = []string{
+	"a",
+	"abbr",
+	"address",
+	"area",
+	"article",
+	"aside",
+	"audio",
+	"b",
+	"base",
+	"bdi",
+	"bdo",
+	"blockquote",
+	"body",
+	"br",
+	"button",
+	"canvas",
+	"caption",
+	"cite",
+	"code",
+	"col",
+	"colgroup",
+	"command",
+	"data",
+	"datalist",
+	"dd",
+	"del",
+	"details",
+	"dfn",
+	"dialog",
+	"div",
+	"dl",
+	"dt",
+	"em",
+	"embed",
+	"fieldset",
+	"figcaption",
+	"figure",
+	"footer",
+	"form",
+	"h1",
+	"h2",
+	"h3",
+	"h4",
+	"h5",
+	"h6",
+	"head",
+	"header",
+	"hgroup",
+	"hr",
+	"html",
+	"i",
+	"iframe",
+	"img",
+	"input",
+	"ins",
+	"kbd",
+	"keygen",
+	"label",
+	"legend",
+	"li",
+	"link",
+	"map",
+	"mark",
+	"menu",
+	"menuitem",
+	"meta",
+	"meter",
+	"nav",
+	"noscript",
+	"object",
+	"ol",
+	"optgroup",
+	"option",
+	"output",
+	"p",
+	"param",
+	"pre",
+	"progress",
+	"q",
+	"rp",
+	"rt",
+	"ruby",
+	"s",
+	"samp",
+	"script",
+	"section",
+	"select",
+	"small",
+	"source",
+	"span",
+	"strong",
+	"style",
+	"sub",
+	"summary",
+	"sup",
+	"table",
+	"tbody",
+	"td",
+	"template",
+	"textarea",
+	"tfoot",
+	"th",
+	"thead",
+	"time",
+	"title",
+	"tr",
+	"track",
+	"u",
+	"ul",
+	"var",
+	"video",
+	"wbr",
+}
+
+// https://html.spec.whatwg.org/multipage/indices.html#attributes-3
+
+var attributes = []string{
+	"abbr",
+	"accept",
+	"accept-charset",
+	"accesskey",
+	"action",
+	"alt",
+	"async",
+	"autocomplete",
+	"autofocus",
+	"autoplay",
+	"challenge",
+	"charset",
+	"checked",
+	"cite",
+	"class",
+	"cols",
+	"colspan",
+	"command",
+	"content",
+	"contenteditable",
+	"contextmenu",
+	"controls",
+	"coords",
+	"crossorigin",
+	"data",
+	"datetime",
+	"default",
+	"defer",
+	"dir",
+	"dirname",
+	"disabled",
+	"download",
+	"draggable",
+	"dropzone",
+	"enctype",
+	"for",
+	"form",
+	"formaction",
+	"formenctype",
+	"formmethod",
+	"formnovalidate",
+	"formtarget",
+	"headers",
+	"height",
+	"hidden",
+	"high",
+	"href",
+	"hreflang",
+	"http-equiv",
+	"icon",
+	"id",
+	"inputmode",
+	"ismap",
+	"itemid",
+	"itemprop",
+	"itemref",
+	"itemscope",
+	"itemtype",
+	"keytype",
+	"kind",
+	"label",
+	"lang",
+	"list",
+	"loop",
+	"low",
+	"manifest",
+	"max",
+	"maxlength",
+	"media",
+	"mediagroup",
+	"method",
+	"min",
+	"minlength",
+	"multiple",
+	"muted",
+	"name",
+	"novalidate",
+	"open",
+	"optimum",
+	"pattern",
+	"ping",
+	"placeholder",
+	"poster",
+	"preload",
+	"radiogroup",
+	"readonly",
+	"rel",
+	"required",
+	"reversed",
+	"rows",
+	"rowspan",
+	"sandbox",
+	"spellcheck",
+	"scope",
+	"scoped",
+	"seamless",
+	"selected",
+	"shape",
+	"size",
+	"sizes",
+	"sortable",
+	"sorted",
+	"span",
+	"src",
+	"srcdoc",
+	"srclang",
+	"start",
+	"step",
+	"style",
+	"tabindex",
+	"target",
+	"title",
+	"translate",
+	"type",
+	"typemustmatch",
+	"usemap",
+	"value",
+	"width",
+	"wrap",
+}
+
+var eventHandlers = []string{
+	"onabort",
+	"onautocomplete",
+	"onautocompleteerror",
+	"onafterprint",
+	"onbeforeprint",
+	"onbeforeunload",
+	"onblur",
+	"oncancel",
+	"oncanplay",
+	"oncanplaythrough",
+	"onchange",
+	"onclick",
+	"onclose",
+	"oncontextmenu",
+	"oncuechange",
+	"ondblclick",
+	"ondrag",
+	"ondragend",
+	"ondragenter",
+	"ondragleave",
+	"ondragover",
+	"ondragstart",
+	"ondrop",
+	"ondurationchange",
+	"onemptied",
+	"onended",
+	"onerror",
+	"onfocus",
+	"onhashchange",
+	"oninput",
+	"oninvalid",
+	"onkeydown",
+	"onkeypress",
+	"onkeyup",
+	"onlanguagechange",
+	"onload",
+	"onloadeddata",
+	"onloadedmetadata",
+	"onloadstart",
+	"onmessage",
+	"onmousedown",
+	"onmousemove",
+	"onmouseout",
+	"onmouseover",
+	"onmouseup",
+	"onmousewheel",
+	"onoffline",
+	"ononline",
+	"onpagehide",
+	"onpageshow",
+	"onpause",
+	"onplay",
+	"onplaying",
+	"onpopstate",
+	"onprogress",
+	"onratechange",
+	"onreset",
+	"onresize",
+	"onscroll",
+	"onseeked",
+	"onseeking",
+	"onselect",
+	"onshow",
+	"onsort",
+	"onstalled",
+	"onstorage",
+	"onsubmit",
+	"onsuspend",
+	"ontimeupdate",
+	"ontoggle",
+	"onunload",
+	"onvolumechange",
+	"onwaiting",
+}
+
+// extra are ad-hoc values not covered by any of the lists above.
+var extra = []string{
+	"align",
+	"annotation",
+	"annotation-xml",
+	"applet",
+	"basefont",
+	"bgsound",
+	"big",
+	"blink",
+	"center",
+	"color",
+	"desc",
+	"face",
+	"font",
+	"foreignObject", // HTML is case-insensitive, but SVG-embedded-in-HTML is case-sensitive.
+	"foreignobject",
+	"frame",
+	"frameset",
+	"image",
+	"isindex",
+	"listing",
+	"malignmark",
+	"marquee",
+	"math",
+	"mglyph",
+	"mi",
+	"mn",
+	"mo",
+	"ms",
+	"mtext",
+	"nobr",
+	"noembed",
+	"noframes",
+	"plaintext",
+	"prompt",
+	"public",
+	"spacer",
+	"strike",
+	"svg",
+	"system",
+	"tt",
+	"xmp",
+}
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/atom/table.go b/Godeps/_workspace/src/golang.org/x/net/html/atom/table.go
new file mode 100644
index 00000000..2605ba31
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/atom/table.go
@@ -0,0 +1,713 @@
+// generated by go run gen.go; DO NOT EDIT
+
+package atom
+
+const (
+	A                   Atom = 0x1
+	Abbr                Atom = 0x4
+	Accept              Atom = 0x2106
+	AcceptCharset       Atom = 0x210e
+	Accesskey           Atom = 0x3309
+	Action              Atom = 0x1f606
+	Address             Atom = 0x4f307
+	Align               Atom = 0x1105
+	Alt                 Atom = 0x4503
+	Annotation          Atom = 0x1670a
+	AnnotationXml       Atom = 0x1670e
+	Applet              Atom = 0x2b306
+	Area                Atom = 0x2fa04
+	Article             Atom = 0x38807
+	Aside               Atom = 0x8305
+	Async               Atom = 0x7b05
+	Audio               Atom = 0xa605
+	Autocomplete        Atom = 0x1fc0c
+	Autofocus           Atom = 0xb309
+	Autoplay            Atom = 0xce08
+	B                   Atom = 0x101
+	Base                Atom = 0xd604
+	Basefont            Atom = 0xd608
+	Bdi                 Atom = 0x1a03
+	Bdo                 Atom = 0xe703
+	Bgsound             Atom = 0x11807
+	Big                 Atom = 0x12403
+	Blink               Atom = 0x12705
+	Blockquote          Atom = 0x12c0a
+	Body                Atom = 0x2f04
+	Br                  Atom = 0x202
+	Button              Atom = 0x13606
+	Canvas              Atom = 0x7f06
+	Caption             Atom = 0x1bb07
+	Center              Atom = 0x5b506
+	Challenge           Atom = 0x21f09
+	Charset             Atom = 0x2807
+	Checked             Atom = 0x32807
+	Cite                Atom = 0x3c804
+	Class               Atom = 0x4de05
+	Code                Atom = 0x14904
+	Col                 Atom = 0x15003
+	Colgroup            Atom = 0x15008
+	Color               Atom = 0x15d05
+	Cols                Atom = 0x16204
+	Colspan             Atom = 0x16207
+	Command             Atom = 0x17507
+	Content             Atom = 0x42307
+	Contenteditable     Atom = 0x4230f
+	Contextmenu         Atom = 0x3310b
+	Controls            Atom = 0x18808
+	Coords              Atom = 0x19406
+	Crossorigin         Atom = 0x19f0b
+	Data                Atom = 0x44a04
+	Datalist            Atom = 0x44a08
+	Datetime            Atom = 0x23c08
+	Dd                  Atom = 0x26702
+	Default             Atom = 0x8607
+	Defer               Atom = 0x14b05
+	Del                 Atom = 0x3ef03
+	Desc                Atom = 0x4db04
+	Details             Atom = 0x4807
+	Dfn                 Atom = 0x6103
+	Dialog              Atom = 0x1b06
+	Dir                 Atom = 0x6903
+	Dirname             Atom = 0x6907
+	Disabled            Atom = 0x10c08
+	Div                 Atom = 0x11303
+	Dl                  Atom = 0x11e02
+	Download            Atom = 0x40008
+	Draggable           Atom = 0x17b09
+	Dropzone            Atom = 0x39108
+	Dt                  Atom = 0x50902
+	Em                  Atom = 0x6502
+	Embed               Atom = 0x6505
+	Enctype             Atom = 0x21107
+	Face                Atom = 0x5b304
+	Fieldset            Atom = 0x1b008
+	Figcaption          Atom = 0x1b80a
+	Figure              Atom = 0x1cc06
+	Font                Atom = 0xda04
+	Footer              Atom = 0x8d06
+	For                 Atom = 0x1d803
+	ForeignObject       Atom = 0x1d80d
+	Foreignobject       Atom = 0x1e50d
+	Form                Atom = 0x1f204
+	Formaction          Atom = 0x1f20a
+	Formenctype         Atom = 0x20d0b
+	Formmethod          Atom = 0x2280a
+	Formnovalidate      Atom = 0x2320e
+	Formtarget          Atom = 0x2470a
+	Frame               Atom = 0x9a05
+	Frameset            Atom = 0x9a08
+	H1                  Atom = 0x26e02
+	H2                  Atom = 0x29402
+	H3                  Atom = 0x2a702
+	H4                  Atom = 0x2e902
+	H5                  Atom = 0x2f302
+	H6                  Atom = 0x50b02
+	Head                Atom = 0x2d504
+	Header              Atom = 0x2d506
+	Headers             Atom = 0x2d507
+	Height              Atom = 0x25106
+	Hgroup              Atom = 0x25906
+	Hidden              Atom = 0x26506
+	High                Atom = 0x26b04
+	Hr                  Atom = 0x27002
+	Href                Atom = 0x27004
+	Hreflang            Atom = 0x27008
+	Html                Atom = 0x25504
+	HttpEquiv           Atom = 0x2780a
+	I                   Atom = 0x601
+	Icon                Atom = 0x42204
+	Id                  Atom = 0x8502
+	Iframe              Atom = 0x29606
+	Image               Atom = 0x29c05
+	Img                 Atom = 0x2a103
+	Input               Atom = 0x3e805
+	Inputmode           Atom = 0x3e809
+	Ins                 Atom = 0x1a803
+	Isindex             Atom = 0x2a907
+	Ismap               Atom = 0x2b005
+	Itemid              Atom = 0x33c06
+	Itemprop            Atom = 0x3c908
+	Itemref             Atom = 0x5ad07
+	Itemscope           Atom = 0x2b909
+	Itemtype            Atom = 0x2c308
+	Kbd                 Atom = 0x1903
+	Keygen              Atom = 0x3906
+	Keytype             Atom = 0x53707
+	Kind                Atom = 0x10904
+	Label               Atom = 0xf005
+	Lang                Atom = 0x27404
+	Legend              Atom = 0x18206
+	Li                  Atom = 0x1202
+	Link                Atom = 0x12804
+	List                Atom = 0x44e04
+	Listing             Atom = 0x44e07
+	Loop                Atom = 0xf404
+	Low                 Atom = 0x11f03
+	Malignmark          Atom = 0x100a
+	Manifest            Atom = 0x5f108
+	Map                 Atom = 0x2b203
+	Mark                Atom = 0x1604
+	Marquee             Atom = 0x2cb07
+	Math                Atom = 0x2d204
+	Max                 Atom = 0x2e103
+	Maxlength           Atom = 0x2e109
+	Media               Atom = 0x6e05
+	Mediagroup          Atom = 0x6e0a
+	Menu                Atom = 0x33804
+	Menuitem            Atom = 0x33808
+	Meta                Atom = 0x45d04
+	Meter               Atom = 0x24205
+	Method              Atom = 0x22c06
+	Mglyph              Atom = 0x2a206
+	Mi                  Atom = 0x2eb02
+	Min                 Atom = 0x2eb03
+	Minlength           Atom = 0x2eb09
+	Mn                  Atom = 0x23502
+	Mo                  Atom = 0x3ed02
+	Ms                  Atom = 0x2bc02
+	Mtext               Atom = 0x2f505
+	Multiple            Atom = 0x30308
+	Muted               Atom = 0x30b05
+	Name                Atom = 0x6c04
+	Nav                 Atom = 0x3e03
+	Nobr                Atom = 0x5704
+	Noembed             Atom = 0x6307
+	Noframes            Atom = 0x9808
+	Noscript            Atom = 0x3d208
+	Novalidate          Atom = 0x2360a
+	Object              Atom = 0x1ec06
+	Ol                  Atom = 0xc902
+	Onabort             Atom = 0x13a07
+	Onafterprint        Atom = 0x1c00c
+	Onautocomplete      Atom = 0x1fa0e
+	Onautocompleteerror Atom = 0x1fa13
+	Onbeforeprint       Atom = 0x6040d
+	Onbeforeunload      Atom = 0x4e70e
+	Onblur              Atom = 0xaa06
+	Oncancel            Atom = 0xe908
+	Oncanplay           Atom = 0x28509
+	Oncanplaythrough    Atom = 0x28510
+	Onchange            Atom = 0x3a708
+	Onclick             Atom = 0x31007
+	Onclose             Atom = 0x31707
+	Oncontextmenu       Atom = 0x32f0d
+	Oncuechange         Atom = 0x3420b
+	Ondblclick          Atom = 0x34d0a
+	Ondrag              Atom = 0x35706
+	Ondragend           Atom = 0x35709
+	Ondragenter         Atom = 0x3600b
+	Ondragleave         Atom = 0x36b0b
+	Ondragover          Atom = 0x3760a
+	Ondragstart         Atom = 0x3800b
+	Ondrop              Atom = 0x38f06
+	Ondurationchange    Atom = 0x39f10
+	Onemptied           Atom = 0x39609
+	Onended             Atom = 0x3af07
+	Onerror             Atom = 0x3b607
+	Onfocus             Atom = 0x3bd07
+	Onhashchange        Atom = 0x3da0c
+	Oninput             Atom = 0x3e607
+	Oninvalid           Atom = 0x3f209
+	Onkeydown           Atom = 0x3fb09
+	Onkeypress          Atom = 0x4080a
+	Onkeyup             Atom = 0x41807
+	Onlanguagechange    Atom = 0x43210
+	Onload              Atom = 0x44206
+	Onloadeddata        Atom = 0x4420c
+	Onloadedmetadata    Atom = 0x45510
+	Onloadstart         Atom = 0x46b0b
+	Onmessage           Atom = 0x47609
+	Onmousedown         Atom = 0x47f0b
+	Onmousemove         Atom = 0x48a0b
+	Onmouseout          Atom = 0x4950a
+	Onmouseover         Atom = 0x4a20b
+	Onmouseup           Atom = 0x4ad09
+	Onmousewheel        Atom = 0x4b60c
+	Onoffline           Atom = 0x4c209
+	Ononline            Atom = 0x4cb08
+	Onpagehide          Atom = 0x4d30a
+	Onpageshow          Atom = 0x4fe0a
+	Onpause             Atom = 0x50d07
+	Onplay              Atom = 0x51706
+	Onplaying           Atom = 0x51709
+	Onpopstate          Atom = 0x5200a
+	Onprogress          Atom = 0x52a0a
+	Onratechange        Atom = 0x53e0c
+	Onreset             Atom = 0x54a07
+	Onresize            Atom = 0x55108
+	Onscroll            Atom = 0x55f08
+	Onseeked            Atom = 0x56708
+	Onseeking           Atom = 0x56f09
+	Onselect            Atom = 0x57808
+	Onshow              Atom = 0x58206
+	Onsort              Atom = 0x58b06
+	Onstalled           Atom = 0x59509
+	Onstorage           Atom = 0x59e09
+	Onsubmit            Atom = 0x5a708
+	Onsuspend           Atom = 0x5bb09
+	Ontimeupdate        Atom = 0xdb0c
+	Ontoggle            Atom = 0x5c408
+	Onunload            Atom = 0x5cc08
+	Onvolumechange      Atom = 0x5d40e
+	Onwaiting           Atom = 0x5e209
+	Open                Atom = 0x3cf04
+	Optgroup            Atom = 0xf608
+	Optimum             Atom = 0x5eb07
+	Option              Atom = 0x60006
+	Output              Atom = 0x49c06
+	P                   Atom = 0xc01
+	Param               Atom = 0xc05
+	Pattern             Atom = 0x5107
+	Ping                Atom = 0x7704
+	Placeholder         Atom = 0xc30b
+	Plaintext           Atom = 0xfd09
+	Poster              Atom = 0x15706
+	Pre                 Atom = 0x25e03
+	Preload             Atom = 0x25e07
+	Progress            Atom = 0x52c08
+	Prompt              Atom = 0x5fa06
+	Public              Atom = 0x41e06
+	Q                   Atom = 0x13101
+	Radiogroup          Atom = 0x30a
+	Readonly            Atom = 0x2fb08
+	Rel                 Atom = 0x25f03
+	Required            Atom = 0x1d008
+	Reversed            Atom = 0x5a08
+	Rows                Atom = 0x9204
+	Rowspan             Atom = 0x9207
+	Rp                  Atom = 0x1c602
+	Rt                  Atom = 0x13f02
+	Ruby                Atom = 0xaf04
+	S                   Atom = 0x2c01
+	Samp                Atom = 0x4e04
+	Sandbox             Atom = 0xbb07
+	Scope               Atom = 0x2bd05
+	Scoped              Atom = 0x2bd06
+	Script              Atom = 0x3d406
+	Seamless            Atom = 0x31c08
+	Section             Atom = 0x4e207
+	Select              Atom = 0x57a06
+	Selected            Atom = 0x57a08
+	Shape               Atom = 0x4f905
+	Size                Atom = 0x55504
+	Sizes               Atom = 0x55505
+	Small               Atom = 0x18f05
+	Sortable            Atom = 0x58d08
+	Sorted              Atom = 0x19906
+	Source              Atom = 0x1aa06
+	Spacer              Atom = 0x2db06
+	Span                Atom = 0x9504
+	Spellcheck          Atom = 0x3230a
+	Src                 Atom = 0x3c303
+	Srcdoc              Atom = 0x3c306
+	Srclang             Atom = 0x41107
+	Start               Atom = 0x38605
+	Step                Atom = 0x5f704
+	Strike              Atom = 0x53306
+	Strong              Atom = 0x55906
+	Style               Atom = 0x61105
+	Sub                 Atom = 0x5a903
+	Summary             Atom = 0x61607
+	Sup                 Atom = 0x61d03
+	Svg                 Atom = 0x62003
+	System              Atom = 0x62306
+	Tabindex            Atom = 0x46308
+	Table               Atom = 0x42d05
+	Target              Atom = 0x24b06
+	Tbody               Atom = 0x2e05
+	Td                  Atom = 0x4702
+	Template            Atom = 0x62608
+	Textarea            Atom = 0x2f608
+	Tfoot               Atom = 0x8c05
+	Th                  Atom = 0x22e02
+	Thead               Atom = 0x2d405
+	Time                Atom = 0xdd04
+	Title               Atom = 0xa105
+	Tr                  Atom = 0x10502
+	Track               Atom = 0x10505
+	Translate           Atom = 0x14009
+	Tt                  Atom = 0x5302
+	Type                Atom = 0x21404
+	Typemustmatch       Atom = 0x2140d
+	U                   Atom = 0xb01
+	Ul                  Atom = 0x8a02
+	Usemap              Atom = 0x51106
+	Value               Atom = 0x4005
+	Var                 Atom = 0x11503
+	Video               Atom = 0x28105
+	Wbr                 Atom = 0x12103
+	Width               Atom = 0x50705
+	Wrap                Atom = 0x58704
+	Xmp                 Atom = 0xc103
+)
+
+const hash0 = 0xc17da63e
+
+const maxAtomLen = 19
+
+var table = [1 << 9]Atom{
+	0x1:   0x48a0b, // onmousemove
+	0x2:   0x5e209, // onwaiting
+	0x3:   0x1fa13, // onautocompleteerror
+	0x4:   0x5fa06, // prompt
+	0x7:   0x5eb07, // optimum
+	0x8:   0x1604,  // mark
+	0xa:   0x5ad07, // itemref
+	0xb:   0x4fe0a, // onpageshow
+	0xc:   0x57a06, // select
+	0xd:   0x17b09, // draggable
+	0xe:   0x3e03,  // nav
+	0xf:   0x17507, // command
+	0x11:  0xb01,   // u
+	0x14:  0x2d507, // headers
+	0x15:  0x44a08, // datalist
+	0x17:  0x4e04,  // samp
+	0x1a:  0x3fb09, // onkeydown
+	0x1b:  0x55f08, // onscroll
+	0x1c:  0x15003, // col
+	0x20:  0x3c908, // itemprop
+	0x21:  0x2780a, // http-equiv
+	0x22:  0x61d03, // sup
+	0x24:  0x1d008, // required
+	0x2b:  0x25e07, // preload
+	0x2c:  0x6040d, // onbeforeprint
+	0x2d:  0x3600b, // ondragenter
+	0x2e:  0x50902, // dt
+	0x2f:  0x5a708, // onsubmit
+	0x30:  0x27002, // hr
+	0x31:  0x32f0d, // oncontextmenu
+	0x33:  0x29c05, // image
+	0x34:  0x50d07, // onpause
+	0x35:  0x25906, // hgroup
+	0x36:  0x7704,  // ping
+	0x37:  0x57808, // onselect
+	0x3a:  0x11303, // div
+	0x3b:  0x1fa0e, // onautocomplete
+	0x40:  0x2eb02, // mi
+	0x41:  0x31c08, // seamless
+	0x42:  0x2807,  // charset
+	0x43:  0x8502,  // id
+	0x44:  0x5200a, // onpopstate
+	0x45:  0x3ef03, // del
+	0x46:  0x2cb07, // marquee
+	0x47:  0x3309,  // accesskey
+	0x49:  0x8d06,  // footer
+	0x4a:  0x44e04, // list
+	0x4b:  0x2b005, // ismap
+	0x51:  0x33804, // menu
+	0x52:  0x2f04,  // body
+	0x55:  0x9a08,  // frameset
+	0x56:  0x54a07, // onreset
+	0x57:  0x12705, // blink
+	0x58:  0xa105,  // title
+	0x59:  0x38807, // article
+	0x5b:  0x22e02, // th
+	0x5d:  0x13101, // q
+	0x5e:  0x3cf04, // open
+	0x5f:  0x2fa04, // area
+	0x61:  0x44206, // onload
+	0x62:  0xda04,  // font
+	0x63:  0xd604,  // base
+	0x64:  0x16207, // colspan
+	0x65:  0x53707, // keytype
+	0x66:  0x11e02, // dl
+	0x68:  0x1b008, // fieldset
+	0x6a:  0x2eb03, // min
+	0x6b:  0x11503, // var
+	0x6f:  0x2d506, // header
+	0x70:  0x13f02, // rt
+	0x71:  0x15008, // colgroup
+	0x72:  0x23502, // mn
+	0x74:  0x13a07, // onabort
+	0x75:  0x3906,  // keygen
+	0x76:  0x4c209, // onoffline
+	0x77:  0x21f09, // challenge
+	0x78:  0x2b203, // map
+	0x7a:  0x2e902, // h4
+	0x7b:  0x3b607, // onerror
+	0x7c:  0x2e109, // maxlength
+	0x7d:  0x2f505, // mtext
+	0x7e:  0xbb07,  // sandbox
+	0x7f:  0x58b06, // onsort
+	0x80:  0x100a,  // malignmark
+	0x81:  0x45d04, // meta
+	0x82:  0x7b05,  // async
+	0x83:  0x2a702, // h3
+	0x84:  0x26702, // dd
+	0x85:  0x27004, // href
+	0x86:  0x6e0a,  // mediagroup
+	0x87:  0x19406, // coords
+	0x88:  0x41107, // srclang
+	0x89:  0x34d0a, // ondblclick
+	0x8a:  0x4005,  // value
+	0x8c:  0xe908,  // oncancel
+	0x8e:  0x3230a, // spellcheck
+	0x8f:  0x9a05,  // frame
+	0x91:  0x12403, // big
+	0x94:  0x1f606, // action
+	0x95:  0x6903,  // dir
+	0x97:  0x2fb08, // readonly
+	0x99:  0x42d05, // table
+	0x9a:  0x61607, // summary
+	0x9b:  0x12103, // wbr
+	0x9c:  0x30a,   // radiogroup
+	0x9d:  0x6c04,  // name
+	0x9f:  0x62306, // system
+	0xa1:  0x15d05, // color
+	0xa2:  0x7f06,  // canvas
+	0xa3:  0x25504, // html
+	0xa5:  0x56f09, // onseeking
+	0xac:  0x4f905, // shape
+	0xad:  0x25f03, // rel
+	0xae:  0x28510, // oncanplaythrough
+	0xaf:  0x3760a, // ondragover
+	0xb0:  0x62608, // template
+	0xb1:  0x1d80d, // foreignObject
+	0xb3:  0x9204,  // rows
+	0xb6:  0x44e07, // listing
+	0xb7:  0x49c06, // output
+	0xb9:  0x3310b, // contextmenu
+	0xbb:  0x11f03, // low
+	0xbc:  0x1c602, // rp
+	0xbd:  0x5bb09, // onsuspend
+	0xbe:  0x13606, // button
+	0xbf:  0x4db04, // desc
+	0xc1:  0x4e207, // section
+	0xc2:  0x52a0a, // onprogress
+	0xc3:  0x59e09, // onstorage
+	0xc4:  0x2d204, // math
+	0xc5:  0x4503,  // alt
+	0xc7:  0x8a02,  // ul
+	0xc8:  0x5107,  // pattern
+	0xc9:  0x4b60c, // onmousewheel
+	0xca:  0x35709, // ondragend
+	0xcb:  0xaf04,  // ruby
+	0xcc:  0xc01,   // p
+	0xcd:  0x31707, // onclose
+	0xce:  0x24205, // meter
+	0xcf:  0x11807, // bgsound
+	0xd2:  0x25106, // height
+	0xd4:  0x101,   // b
+	0xd5:  0x2c308, // itemtype
+	0xd8:  0x1bb07, // caption
+	0xd9:  0x10c08, // disabled
+	0xdb:  0x33808, // menuitem
+	0xdc:  0x62003, // svg
+	0xdd:  0x18f05, // small
+	0xde:  0x44a04, // data
+	0xe0:  0x4cb08, // ononline
+	0xe1:  0x2a206, // mglyph
+	0xe3:  0x6505,  // embed
+	0xe4:  0x10502, // tr
+	0xe5:  0x46b0b, // onloadstart
+	0xe7:  0x3c306, // srcdoc
+	0xeb:  0x5c408, // ontoggle
+	0xed:  0xe703,  // bdo
+	0xee:  0x4702,  // td
+	0xef:  0x8305,  // aside
+	0xf0:  0x29402, // h2
+	0xf1:  0x52c08, // progress
+	0xf2:  0x12c0a, // blockquote
+	0xf4:  0xf005,  // label
+	0xf5:  0x601,   // i
+	0xf7:  0x9207,  // rowspan
+	0xfb:  0x51709, // onplaying
+	0xfd:  0x2a103, // img
+	0xfe:  0xf608,  // optgroup
+	0xff:  0x42307, // content
+	0x101: 0x53e0c, // onratechange
+	0x103: 0x3da0c, // onhashchange
+	0x104: 0x4807,  // details
+	0x106: 0x40008, // download
+	0x109: 0x14009, // translate
+	0x10b: 0x4230f, // contenteditable
+	0x10d: 0x36b0b, // ondragleave
+	0x10e: 0x2106,  // accept
+	0x10f: 0x57a08, // selected
+	0x112: 0x1f20a, // formaction
+	0x113: 0x5b506, // center
+	0x115: 0x45510, // onloadedmetadata
+	0x116: 0x12804, // link
+	0x117: 0xdd04,  // time
+	0x118: 0x19f0b, // crossorigin
+	0x119: 0x3bd07, // onfocus
+	0x11a: 0x58704, // wrap
+	0x11b: 0x42204, // icon
+	0x11d: 0x28105, // video
+	0x11e: 0x4de05, // class
+	0x121: 0x5d40e, // onvolumechange
+	0x122: 0xaa06,  // onblur
+	0x123: 0x2b909, // itemscope
+	0x124: 0x61105, // style
+	0x127: 0x41e06, // public
+	0x129: 0x2320e, // formnovalidate
+	0x12a: 0x58206, // onshow
+	0x12c: 0x51706, // onplay
+	0x12d: 0x3c804, // cite
+	0x12e: 0x2bc02, // ms
+	0x12f: 0xdb0c,  // ontimeupdate
+	0x130: 0x10904, // kind
+	0x131: 0x2470a, // formtarget
+	0x135: 0x3af07, // onended
+	0x136: 0x26506, // hidden
+	0x137: 0x2c01,  // s
+	0x139: 0x2280a, // formmethod
+	0x13a: 0x3e805, // input
+	0x13c: 0x50b02, // h6
+	0x13d: 0xc902,  // ol
+	0x13e: 0x3420b, // oncuechange
+	0x13f: 0x1e50d, // foreignobject
+	0x143: 0x4e70e, // onbeforeunload
+	0x144: 0x2bd05, // scope
+	0x145: 0x39609, // onemptied
+	0x146: 0x14b05, // defer
+	0x147: 0xc103,  // xmp
+	0x148: 0x39f10, // ondurationchange
+	0x149: 0x1903,  // kbd
+	0x14c: 0x47609, // onmessage
+	0x14d: 0x60006, // option
+	0x14e: 0x2eb09, // minlength
+	0x14f: 0x32807, // checked
+	0x150: 0xce08,  // autoplay
+	0x152: 0x202,   // br
+	0x153: 0x2360a, // novalidate
+	0x156: 0x6307,  // noembed
+	0x159: 0x31007, // onclick
+	0x15a: 0x47f0b, // onmousedown
+	0x15b: 0x3a708, // onchange
+	0x15e: 0x3f209, // oninvalid
+	0x15f: 0x2bd06, // scoped
+	0x160: 0x18808, // controls
+	0x161: 0x30b05, // muted
+	0x162: 0x58d08, // sortable
+	0x163: 0x51106, // usemap
+	0x164: 0x1b80a, // figcaption
+	0x165: 0x35706, // ondrag
+	0x166: 0x26b04, // high
+	0x168: 0x3c303, // src
+	0x169: 0x15706, // poster
+	0x16b: 0x1670e, // annotation-xml
+	0x16c: 0x5f704, // step
+	0x16d: 0x4,     // abbr
+	0x16e: 0x1b06,  // dialog
+	0x170: 0x1202,  // li
+	0x172: 0x3ed02, // mo
+	0x175: 0x1d803, // for
+	0x176: 0x1a803, // ins
+	0x178: 0x55504, // size
+	0x179: 0x43210, // onlanguagechange
+	0x17a: 0x8607,  // default
+	0x17b: 0x1a03,  // bdi
+	0x17c: 0x4d30a, // onpagehide
+	0x17d: 0x6907,  // dirname
+	0x17e: 0x21404, // type
+	0x17f: 0x1f204, // form
+	0x181: 0x28509, // oncanplay
+	0x182: 0x6103,  // dfn
+	0x183: 0x46308, // tabindex
+	0x186: 0x6502,  // em
+	0x187: 0x27404, // lang
+	0x189: 0x39108, // dropzone
+	0x18a: 0x4080a, // onkeypress
+	0x18b: 0x23c08, // datetime
+	0x18c: 0x16204, // cols
+	0x18d: 0x1,     // a
+	0x18e: 0x4420c, // onloadeddata
+	0x190: 0xa605,  // audio
+	0x192: 0x2e05,  // tbody
+	0x193: 0x22c06, // method
+	0x195: 0xf404,  // loop
+	0x196: 0x29606, // iframe
+	0x198: 0x2d504, // head
+	0x19e: 0x5f108, // manifest
+	0x19f: 0xb309,  // autofocus
+	0x1a0: 0x14904, // code
+	0x1a1: 0x55906, // strong
+	0x1a2: 0x30308, // multiple
+	0x1a3: 0xc05,   // param
+	0x1a6: 0x21107, // enctype
+	0x1a7: 0x5b304, // face
+	0x1a8: 0xfd09,  // plaintext
+	0x1a9: 0x26e02, // h1
+	0x1aa: 0x59509, // onstalled
+	0x1ad: 0x3d406, // script
+	0x1ae: 0x2db06, // spacer
+	0x1af: 0x55108, // onresize
+	0x1b0: 0x4a20b, // onmouseover
+	0x1b1: 0x5cc08, // onunload
+	0x1b2: 0x56708, // onseeked
+	0x1b4: 0x2140d, // typemustmatch
+	0x1b5: 0x1cc06, // figure
+	0x1b6: 0x4950a, // onmouseout
+	0x1b7: 0x25e03, // pre
+	0x1b8: 0x50705, // width
+	0x1b9: 0x19906, // sorted
+	0x1bb: 0x5704,  // nobr
+	0x1be: 0x5302,  // tt
+	0x1bf: 0x1105,  // align
+	0x1c0: 0x3e607, // oninput
+	0x1c3: 0x41807, // onkeyup
+	0x1c6: 0x1c00c, // onafterprint
+	0x1c7: 0x210e,  // accept-charset
+	0x1c8: 0x33c06, // itemid
+	0x1c9: 0x3e809, // inputmode
+	0x1cb: 0x53306, // strike
+	0x1cc: 0x5a903, // sub
+	0x1cd: 0x10505, // track
+	0x1ce: 0x38605, // start
+	0x1d0: 0xd608,  // basefont
+	0x1d6: 0x1aa06, // source
+	0x1d7: 0x18206, // legend
+	0x1d8: 0x2d405, // thead
+	0x1da: 0x8c05,  // tfoot
+	0x1dd: 0x1ec06, // object
+	0x1de: 0x6e05,  // media
+	0x1df: 0x1670a, // annotation
+	0x1e0: 0x20d0b, // formenctype
+	0x1e2: 0x3d208, // noscript
+	0x1e4: 0x55505, // sizes
+	0x1e5: 0x1fc0c, // autocomplete
+	0x1e6: 0x9504,  // span
+	0x1e7: 0x9808,  // noframes
+	0x1e8: 0x24b06, // target
+	0x1e9: 0x38f06, // ondrop
+	0x1ea: 0x2b306, // applet
+	0x1ec: 0x5a08,  // reversed
+	0x1f0: 0x2a907, // isindex
+	0x1f3: 0x27008, // hreflang
+	0x1f5: 0x2f302, // h5
+	0x1f6: 0x4f307, // address
+	0x1fa: 0x2e103, // max
+	0x1fb: 0xc30b,  // placeholder
+	0x1fc: 0x2f608, // textarea
+	0x1fe: 0x4ad09, // onmouseup
+	0x1ff: 0x3800b, // ondragstart
+}
+
+const atomText = "abbradiogrouparamalignmarkbdialogaccept-charsetbodyaccesskey" +
+	"genavaluealtdetailsampatternobreversedfnoembedirnamediagroup" +
+	"ingasyncanvasidefaultfooterowspanoframesetitleaudionblurubya" +
+	"utofocusandboxmplaceholderautoplaybasefontimeupdatebdoncance" +
+	"labelooptgrouplaintextrackindisabledivarbgsoundlowbrbigblink" +
+	"blockquotebuttonabortranslatecodefercolgroupostercolorcolspa" +
+	"nnotation-xmlcommandraggablegendcontrolsmallcoordsortedcross" +
+	"originsourcefieldsetfigcaptionafterprintfigurequiredforeignO" +
+	"bjectforeignobjectformactionautocompleteerrorformenctypemust" +
+	"matchallengeformmethodformnovalidatetimeterformtargetheightm" +
+	"lhgroupreloadhiddenhigh1hreflanghttp-equivideoncanplaythroug" +
+	"h2iframeimageimglyph3isindexismappletitemscopeditemtypemarqu" +
+	"eematheaderspacermaxlength4minlength5mtextareadonlymultiplem" +
+	"utedonclickoncloseamlesspellcheckedoncontextmenuitemidoncuec" +
+	"hangeondblclickondragendondragenterondragleaveondragoverondr" +
+	"agstarticleondropzonemptiedondurationchangeonendedonerroronf" +
+	"ocusrcdocitempropenoscriptonhashchangeoninputmodeloninvalido" +
+	"nkeydownloadonkeypressrclangonkeyupublicontenteditableonlang" +
+	"uagechangeonloadeddatalistingonloadedmetadatabindexonloadsta" +
+	"rtonmessageonmousedownonmousemoveonmouseoutputonmouseoveronm" +
+	"ouseuponmousewheelonofflineononlineonpagehidesclassectionbef" +
+	"oreunloaddresshapeonpageshowidth6onpausemaponplayingonpopsta" +
+	"teonprogresstrikeytypeonratechangeonresetonresizestrongonscr" +
+	"ollonseekedonseekingonselectedonshowraponsortableonstalledon" +
+	"storageonsubmitemrefacenteronsuspendontoggleonunloadonvolume" +
+	"changeonwaitingoptimumanifestepromptoptionbeforeprintstylesu" +
+	"mmarysupsvgsystemplate"
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/atom/table_test.go b/Godeps/_workspace/src/golang.org/x/net/html/atom/table_test.go
new file mode 100644
index 00000000..0f2ecce4
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/atom/table_test.go
@@ -0,0 +1,351 @@
+// generated by go run gen.go -test; DO NOT EDIT
+
+package atom
+
+var testAtomList = []string{
+	"a",
+	"abbr",
+	"abbr",
+	"accept",
+	"accept-charset",
+	"accesskey",
+	"action",
+	"address",
+	"align",
+	"alt",
+	"annotation",
+	"annotation-xml",
+	"applet",
+	"area",
+	"article",
+	"aside",
+	"async",
+	"audio",
+	"autocomplete",
+	"autofocus",
+	"autoplay",
+	"b",
+	"base",
+	"basefont",
+	"bdi",
+	"bdo",
+	"bgsound",
+	"big",
+	"blink",
+	"blockquote",
+	"body",
+	"br",
+	"button",
+	"canvas",
+	"caption",
+	"center",
+	"challenge",
+	"charset",
+	"checked",
+	"cite",
+	"cite",
+	"class",
+	"code",
+	"col",
+	"colgroup",
+	"color",
+	"cols",
+	"colspan",
+	"command",
+	"command",
+	"content",
+	"contenteditable",
+	"contextmenu",
+	"controls",
+	"coords",
+	"crossorigin",
+	"data",
+	"data",
+	"datalist",
+	"datetime",
+	"dd",
+	"default",
+	"defer",
+	"del",
+	"desc",
+	"details",
+	"dfn",
+	"dialog",
+	"dir",
+	"dirname",
+	"disabled",
+	"div",
+	"dl",
+	"download",
+	"draggable",
+	"dropzone",
+	"dt",
+	"em",
+	"embed",
+	"enctype",
+	"face",
+	"fieldset",
+	"figcaption",
+	"figure",
+	"font",
+	"footer",
+	"for",
+	"foreignObject",
+	"foreignobject",
+	"form",
+	"form",
+	"formaction",
+	"formenctype",
+	"formmethod",
+	"formnovalidate",
+	"formtarget",
+	"frame",
+	"frameset",
+	"h1",
+	"h2",
+	"h3",
+	"h4",
+	"h5",
+	"h6",
+	"head",
+	"header",
+	"headers",
+	"height",
+	"hgroup",
+	"hidden",
+	"high",
+	"hr",
+	"href",
+	"hreflang",
+	"html",
+	"http-equiv",
+	"i",
+	"icon",
+	"id",
+	"iframe",
+	"image",
+	"img",
+	"input",
+	"inputmode",
+	"ins",
+	"isindex",
+	"ismap",
+	"itemid",
+	"itemprop",
+	"itemref",
+	"itemscope",
+	"itemtype",
+	"kbd",
+	"keygen",
+	"keytype",
+	"kind",
+	"label",
+	"label",
+	"lang",
+	"legend",
+	"li",
+	"link",
+	"list",
+	"listing",
+	"loop",
+	"low",
+	"malignmark",
+	"manifest",
+	"map",
+	"mark",
+	"marquee",
+	"math",
+	"max",
+	"maxlength",
+	"media",
+	"mediagroup",
+	"menu",
+	"menuitem",
+	"meta",
+	"meter",
+	"method",
+	"mglyph",
+	"mi",
+	"min",
+	"minlength",
+	"mn",
+	"mo",
+	"ms",
+	"mtext",
+	"multiple",
+	"muted",
+	"name",
+	"nav",
+	"nobr",
+	"noembed",
+	"noframes",
+	"noscript",
+	"novalidate",
+	"object",
+	"ol",
+	"onabort",
+	"onafterprint",
+	"onautocomplete",
+	"onautocompleteerror",
+	"onbeforeprint",
+	"onbeforeunload",
+	"onblur",
+	"oncancel",
+	"oncanplay",
+	"oncanplaythrough",
+	"onchange",
+	"onclick",
+	"onclose",
+	"oncontextmenu",
+	"oncuechange",
+	"ondblclick",
+	"ondrag",
+	"ondragend",
+	"ondragenter",
+	"ondragleave",
+	"ondragover",
+	"ondragstart",
+	"ondrop",
+	"ondurationchange",
+	"onemptied",
+	"onended",
+	"onerror",
+	"onfocus",
+	"onhashchange",
+	"oninput",
+	"oninvalid",
+	"onkeydown",
+	"onkeypress",
+	"onkeyup",
+	"onlanguagechange",
+	"onload",
+	"onloadeddata",
+	"onloadedmetadata",
+	"onloadstart",
+	"onmessage",
+	"onmousedown",
+	"onmousemove",
+	"onmouseout",
+	"onmouseover",
+	"onmouseup",
+	"onmousewheel",
+	"onoffline",
+	"ononline",
+	"onpagehide",
+	"onpageshow",
+	"onpause",
+	"onplay",
+	"onplaying",
+	"onpopstate",
+	"onprogress",
+	"onratechange",
+	"onreset",
+	"onresize",
+	"onscroll",
+	"onseeked",
+	"onseeking",
+	"onselect",
+	"onshow",
+	"onsort",
+	"onstalled",
+	"onstorage",
+	"onsubmit",
+	"onsuspend",
+	"ontimeupdate",
+	"ontoggle",
+	"onunload",
+	"onvolumechange",
+	"onwaiting",
+	"open",
+	"optgroup",
+	"optimum",
+	"option",
+	"output",
+	"p",
+	"param",
+	"pattern",
+	"ping",
+	"placeholder",
+	"plaintext",
+	"poster",
+	"pre",
+	"preload",
+	"progress",
+	"prompt",
+	"public",
+	"q",
+	"radiogroup",
+	"readonly",
+	"rel",
+	"required",
+	"reversed",
+	"rows",
+	"rowspan",
+	"rp",
+	"rt",
+	"ruby",
+	"s",
+	"samp",
+	"sandbox",
+	"scope",
+	"scoped",
+	"script",
+	"seamless",
+	"section",
+	"select",
+	"selected",
+	"shape",
+	"size",
+	"sizes",
+	"small",
+	"sortable",
+	"sorted",
+	"source",
+	"spacer",
+	"span",
+	"span",
+	"spellcheck",
+	"src",
+	"srcdoc",
+	"srclang",
+	"start",
+	"step",
+	"strike",
+	"strong",
+	"style",
+	"style",
+	"sub",
+	"summary",
+	"sup",
+	"svg",
+	"system",
+	"tabindex",
+	"table",
+	"target",
+	"tbody",
+	"td",
+	"template",
+	"textarea",
+	"tfoot",
+	"th",
+	"thead",
+	"time",
+	"title",
+	"title",
+	"tr",
+	"track",
+	"translate",
+	"tt",
+	"type",
+	"typemustmatch",
+	"u",
+	"ul",
+	"usemap",
+	"value",
+	"var",
+	"video",
+	"wbr",
+	"width",
+	"wrap",
+	"xmp",
+}
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/charset/charset.go b/Godeps/_workspace/src/golang.org/x/net/html/charset/charset.go
new file mode 100644
index 00000000..fd7eb585
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/charset/charset.go
@@ -0,0 +1,244 @@
+// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package charset provides common text encodings for HTML documents.
+//
+// The mapping from encoding labels to encodings is defined at
+// https://encoding.spec.whatwg.org/.
+package charset
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"mime"
+	"strings"
+	"unicode/utf8"
+
+	"golang.org/x/net/html"
+	"golang.org/x/text/encoding"
+	"golang.org/x/text/encoding/charmap"
+	"golang.org/x/text/transform"
+)
+
+// Lookup returns the encoding with the specified label, and its canonical
+// name. It returns nil and the empty string if label is not one of the
+// standard encodings for HTML. Matching is case-insensitive and ignores
+// leading and trailing whitespace.
+func Lookup(label string) (e encoding.Encoding, name string) {
+	label = strings.ToLower(strings.Trim(label, "\t\n\r\f "))
+	enc := encodings[label]
+	return enc.e, enc.name
+}
+
+// DetermineEncoding determines the encoding of an HTML document by examining
+// up to the first 1024 bytes of content and the declared Content-Type.
+//
+// See http://www.whatwg.org/specs/web-apps/current-work/multipage/parsing.html#determining-the-character-encoding
+func DetermineEncoding(content []byte, contentType string) (e encoding.Encoding, name string, certain bool) {
+	if len(content) > 1024 {
+		content = content[:1024]
+	}
+
+	for _, b := range boms {
+		if bytes.HasPrefix(content, b.bom) {
+			e, name = Lookup(b.enc)
+			return e, name, true
+		}
+	}
+
+	if _, params, err := mime.ParseMediaType(contentType); err == nil {
+		if cs, ok := params["charset"]; ok {
+			if e, name = Lookup(cs); e != nil {
+				return e, name, true
+			}
+		}
+	}
+
+	if len(content) > 0 {
+		e, name = prescan(content)
+		if e != nil {
+			return e, name, false
+		}
+	}
+
+	// Try to detect UTF-8.
+	// First eliminate any partial rune at the end.
+	for i := len(content) - 1; i >= 0 && i > len(content)-4; i-- {
+		b := content[i]
+		if b < 0x80 {
+			break
+		}
+		if utf8.RuneStart(b) {
+			content = content[:i]
+			break
+		}
+	}
+	hasHighBit := false
+	for _, c := range content {
+		if c >= 0x80 {
+			hasHighBit = true
+			break
+		}
+	}
+	if hasHighBit && utf8.Valid(content) {
+		return encoding.Nop, "utf-8", false
+	}
+
+	// TODO: change default depending on user's locale?
+	return charmap.Windows1252, "windows-1252", false
+}
+
+// NewReader returns an io.Reader that converts the content of r to UTF-8.
+// It calls DetermineEncoding to find out what r's encoding is.
+func NewReader(r io.Reader, contentType string) (io.Reader, error) {
+	preview := make([]byte, 1024)
+	n, err := io.ReadFull(r, preview)
+	switch {
+	case err == io.ErrUnexpectedEOF:
+		preview = preview[:n]
+		r = bytes.NewReader(preview)
+	case err != nil:
+		return nil, err
+	default:
+		r = io.MultiReader(bytes.NewReader(preview), r)
+	}
+
+	if e, _, _ := DetermineEncoding(preview, contentType); e != encoding.Nop {
+		r = transform.NewReader(r, e.NewDecoder())
+	}
+	return r, nil
+}
+
+// NewReaderLabel returns a reader that converts from the specified charset to
+// UTF-8. It uses Lookup to find the encoding that corresponds to label, and
+// returns an error if Lookup returns nil. It is suitable for use as
+// encoding/xml.Decoder's CharsetReader function.
+func NewReaderLabel(label string, input io.Reader) (io.Reader, error) {
+	e, _ := Lookup(label)
+	if e == nil {
+		return nil, fmt.Errorf("unsupported charset: %q", label)
+	}
+	return transform.NewReader(input, e.NewDecoder()), nil
+}
+
+func prescan(content []byte) (e encoding.Encoding, name string) {
+	z := html.NewTokenizer(bytes.NewReader(content))
+	for {
+		switch z.Next() {
+		case html.ErrorToken:
+			return nil, ""
+
+		case html.StartTagToken, html.SelfClosingTagToken:
+			tagName, hasAttr := z.TagName()
+			if !bytes.Equal(tagName, []byte("meta")) {
+				continue
+			}
+			attrList := make(map[string]bool)
+			gotPragma := false
+
+			const (
+				dontKnow = iota
+				doNeedPragma
+				doNotNeedPragma
+			)
+			needPragma := dontKnow
+
+			name = ""
+			e = nil
+			for hasAttr {
+				var key, val []byte
+				key, val, hasAttr = z.TagAttr()
+				ks := string(key)
+				if attrList[ks] {
+					continue
+				}
+				attrList[ks] = true
+				for i, c := range val {
+					if 'A' <= c && c <= 'Z' {
+						val[i] = c + 0x20
+					}
+				}
+
+				switch ks {
+				case "http-equiv":
+					if bytes.Equal(val, []byte("content-type")) {
+						gotPragma = true
+					}
+
+				case "content":
+					if e == nil {
+						name = fromMetaElement(string(val))
+						if name != "" {
+							e, name = Lookup(name)
+							if e != nil {
+								needPragma = doNeedPragma
+							}
+						}
+					}
+
+				case "charset":
+					e, name = Lookup(string(val))
+					needPragma = doNotNeedPragma
+				}
+			}
+
+			if needPragma == dontKnow || needPragma == doNeedPragma && !gotPragma {
+				continue
+			}
+
+			if strings.HasPrefix(name, "utf-16") {
+				name = "utf-8"
+				e = encoding.Nop
+			}
+
+			if e != nil {
+				return e, name
+			}
+		}
+	}
+}
+
+func fromMetaElement(s string) string {
+	for s != "" {
+		csLoc := strings.Index(s, "charset")
+		if csLoc == -1 {
+			return ""
+		}
+		s = s[csLoc+len("charset"):]
+		s = strings.TrimLeft(s, " \t\n\f\r")
+		if !strings.HasPrefix(s, "=") {
+			continue
+		}
+		s = s[1:]
+		s = strings.TrimLeft(s, " \t\n\f\r")
+		if s == "" {
+			return ""
+		}
+		if q := s[0]; q == '"' || q == '\'' {
+			s = s[1:]
+			closeQuote := strings.IndexRune(s, rune(q))
+			if closeQuote == -1 {
+				return ""
+			}
+			return s[:closeQuote]
+		}
+
+		end := strings.IndexAny(s, "; \t\n\f\r")
+		if end == -1 {
+			end = len(s)
+		}
+		return s[:end]
+	}
+	return ""
+}
+
+var boms = []struct {
+	bom []byte
+	enc string
+}{
+	{[]byte{0xfe, 0xff}, "utf-16be"},
+	{[]byte{0xff, 0xfe}, "utf-16le"},
+	{[]byte{0xef, 0xbb, 0xbf}, "utf-8"},
+}
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/charset/charset_test.go b/Godeps/_workspace/src/golang.org/x/net/html/charset/charset_test.go
new file mode 100644
index 00000000..8b10399d
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/charset/charset_test.go
@@ -0,0 +1,236 @@
+// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package charset
+
+import (
+	"bytes"
+	"encoding/xml"
+	"io/ioutil"
+	"runtime"
+	"strings"
+	"testing"
+
+	"golang.org/x/text/transform"
+)
+
+func transformString(t transform.Transformer, s string) (string, error) {
+	r := transform.NewReader(strings.NewReader(s), t)
+	b, err := ioutil.ReadAll(r)
+	return string(b), err
+}
+
+var testCases = []struct {
+	utf8, other, otherEncoding string
+}{
+	{"Résumé", "Résumé", "utf8"},
+	{"Résumé", "R\xe9sum\xe9", "latin1"},
+	{"これは漢字です。", "S0\x8c0o0\"oW[g0Y0\x020", "UTF-16LE"},
+	{"これは漢字です。", "0S0\x8c0oo\"[W0g0Y0\x02", "UTF-16BE"},
+	{"Hello, world", "Hello, world", "ASCII"},
+	{"Gdańsk", "Gda\xf1sk", "ISO-8859-2"},
+	{"Ââ Čč Đđ Ŋŋ Õõ Šš Žž Åå Ää", "\xc2\xe2 \xc8\xe8 \xa9\xb9 \xaf\xbf \xd5\xf5 \xaa\xba \xac\xbc \xc5\xe5 \xc4\xe4", "ISO-8859-10"},
+	{"สำหรับ", "\xca\xd3\xcb\xc3\u047a", "ISO-8859-11"},
+	{"latviešu", "latvie\xf0u", "ISO-8859-13"},
+	{"Seònaid", "Se\xf2naid", "ISO-8859-14"},
+	{"€1 is cheap", "\xa41 is cheap", "ISO-8859-15"},
+	{"românește", "rom\xe2ne\xbate", "ISO-8859-16"},
+	{"nutraĵo", "nutra\xbco", "ISO-8859-3"},
+	{"Kalâdlit", "Kal\xe2dlit", "ISO-8859-4"},
+	{"русский", "\xe0\xe3\xe1\xe1\xda\xd8\xd9", "ISO-8859-5"},
+	{"ελληνικά", "\xe5\xeb\xeb\xe7\xed\xe9\xea\xdc", "ISO-8859-7"},
+	{"Kağan", "Ka\xf0an", "ISO-8859-9"},
+	{"Résumé", "R\x8esum\x8e", "macintosh"},
+	{"Gdańsk", "Gda\xf1sk", "windows-1250"},
+	{"русский", "\xf0\xf3\xf1\xf1\xea\xe8\xe9", "windows-1251"},
+	{"Résumé", "R\xe9sum\xe9", "windows-1252"},
+	{"ελληνικά", "\xe5\xeb\xeb\xe7\xed\xe9\xea\xdc", "windows-1253"},
+	{"Kağan", "Ka\xf0an", "windows-1254"},
+	{"עִבְרִית", "\xf2\xc4\xe1\xc0\xf8\xc4\xe9\xfa", "windows-1255"},
+	{"العربية", "\xc7\xe1\xda\xd1\xc8\xed\xc9", "windows-1256"},
+	{"latviešu", "latvie\xf0u", "windows-1257"},
+	{"Việt", "Vi\xea\xf2t", "windows-1258"},
+	{"สำหรับ", "\xca\xd3\xcb\xc3\u047a", "windows-874"},
+	{"русский", "\xd2\xd5\xd3\xd3\xcb\xc9\xca", "KOI8-R"},
+	{"українська", "\xd5\xcb\xd2\xc1\xa7\xce\xd3\xd8\xcb\xc1", "KOI8-U"},
+	{"Hello 常用國字標準字體表", "Hello \xb1`\xa5\u03b0\xea\xa6r\xbc\u0437\u01e6r\xc5\xe9\xaa\xed", "big5"},
+	{"Hello 常用國字標準字體表", "Hello \xb3\xa3\xd3\xc3\x87\xf8\xd7\xd6\x98\xcb\x9c\xca\xd7\xd6\xf3\x77\xb1\xed", "gbk"},
+	{"Hello 常用國字標準字體表", "Hello \xb3\xa3\xd3\xc3\x87\xf8\xd7\xd6\x98\xcb\x9c\xca\xd7\xd6\xf3\x77\xb1\xed", "gb18030"},
+	{"עִבְרִית", "\x81\x30\xfb\x30\x81\x30\xf6\x34\x81\x30\xf9\x33\x81\x30\xf6\x30\x81\x30\xfb\x36\x81\x30\xf6\x34\x81\x30\xfa\x31\x81\x30\xfb\x38", "gb18030"},
+	{"㧯", "\x82\x31\x89\x38", "gb18030"},
+	{"これは漢字です。", "\x82\xb1\x82\xea\x82\xcd\x8a\xbf\x8e\x9a\x82\xc5\x82\xb7\x81B", "SJIS"},
+	{"Hello, 世界!", "Hello, \x90\xa2\x8aE!", "SJIS"},
+	{"ｲｳｴｵｶ", "\xb2\xb3\xb4\xb5\xb6", "SJIS"},
+	{"これは漢字です。", "\xa4\xb3\xa4\xec\xa4\u03f4\xc1\xbb\xfa\xa4\u01e4\xb9\xa1\xa3", "EUC-JP"},
+	{"Hello, 世界!", "Hello, \x1b$B@$3&\x1b(B!", "ISO-2022-JP"},
+	{"네이트 | 즐거움의 시작, 슈파스(Spaβ) NATE", "\xb3\xd7\xc0\xcc\xc6\xae | \xc1\xf1\xb0\xc5\xbf\xf2\xc0\xc7 \xbd\xc3\xc0\xdb, \xbd\xb4\xc6\xc4\xbd\xba(Spa\xa5\xe2) NATE", "EUC-KR"},
+}
+
+func TestDecode(t *testing.T) {
+	for _, tc := range testCases {
+		e, _ := Lookup(tc.otherEncoding)
+		if e == nil {
+			t.Errorf("%s: not found", tc.otherEncoding)
+			continue
+		}
+		s, err := transformString(e.NewDecoder(), tc.other)
+		if err != nil {
+			t.Errorf("%s: decode %q: %v", tc.otherEncoding, tc.other, err)
+			continue
+		}
+		if s != tc.utf8 {
+			t.Errorf("%s: got %q, want %q", tc.otherEncoding, s, tc.utf8)
+		}
+	}
+}
+
+func TestEncode(t *testing.T) {
+	for _, tc := range testCases {
+		e, _ := Lookup(tc.otherEncoding)
+		if e == nil {
+			t.Errorf("%s: not found", tc.otherEncoding)
+			continue
+		}
+		s, err := transformString(e.NewEncoder(), tc.utf8)
+		if err != nil {
+			t.Errorf("%s: encode %q: %s", tc.otherEncoding, tc.utf8, err)
+			continue
+		}
+		if s != tc.other {
+			t.Errorf("%s: got %q, want %q", tc.otherEncoding, s, tc.other)
+		}
+	}
+}
+
+// TestNames verifies that you can pass an encoding's name to Lookup and get
+// the same encoding back (except for "replacement").
+func TestNames(t *testing.T) {
+	for _, e := range encodings {
+		if e.name == "replacement" {
+			continue
+		}
+		_, got := Lookup(e.name)
+		if got != e.name {
+			t.Errorf("got %q, want %q", got, e.name)
+			continue
+		}
+	}
+}
+
+var sniffTestCases = []struct {
+	filename, declared, want string
+}{
+	{"HTTP-charset.html", "text/html; charset=iso-8859-15", "iso-8859-15"},
+	{"UTF-16LE-BOM.html", "", "utf-16le"},
+	{"UTF-16BE-BOM.html", "", "utf-16be"},
+	{"meta-content-attribute.html", "text/html", "iso-8859-15"},
+	{"meta-charset-attribute.html", "text/html", "iso-8859-15"},
+	{"No-encoding-declaration.html", "text/html", "utf-8"},
+	{"HTTP-vs-UTF-8-BOM.html", "text/html; charset=iso-8859-15", "utf-8"},
+	{"HTTP-vs-meta-content.html", "text/html; charset=iso-8859-15", "iso-8859-15"},
+	{"HTTP-vs-meta-charset.html", "text/html; charset=iso-8859-15", "iso-8859-15"},
+	{"UTF-8-BOM-vs-meta-content.html", "text/html", "utf-8"},
+	{"UTF-8-BOM-vs-meta-charset.html", "text/html", "utf-8"},
+}
+
+func TestSniff(t *testing.T) {
+	switch runtime.GOOS {
+	case "nacl": // platforms that don't permit direct file system access
+		t.Skipf("not supported on %q", runtime.GOOS)
+	}
+
+	for _, tc := range sniffTestCases {
+		content, err := ioutil.ReadFile("testdata/" + tc.filename)
+		if err != nil {
+			t.Errorf("%s: error reading file: %v", tc.filename, err)
+			continue
+		}
+
+		_, name, _ := DetermineEncoding(content, tc.declared)
+		if name != tc.want {
+			t.Errorf("%s: got %q, want %q", tc.filename, name, tc.want)
+			continue
+		}
+	}
+}
+
+func TestReader(t *testing.T) {
+	switch runtime.GOOS {
+	case "nacl": // platforms that don't permit direct file system access
+		t.Skipf("not supported on %q", runtime.GOOS)
+	}
+
+	for _, tc := range sniffTestCases {
+		content, err := ioutil.ReadFile("testdata/" + tc.filename)
+		if err != nil {
+			t.Errorf("%s: error reading file: %v", tc.filename, err)
+			continue
+		}
+
+		r, err := NewReader(bytes.NewReader(content), tc.declared)
+		if err != nil {
+			t.Errorf("%s: error creating reader: %v", tc.filename, err)
+			continue
+		}
+
+		got, err := ioutil.ReadAll(r)
+		if err != nil {
+			t.Errorf("%s: error reading from charset.NewReader: %v", tc.filename, err)
+			continue
+		}
+
+		e, _ := Lookup(tc.want)
+		want, err := ioutil.ReadAll(transform.NewReader(bytes.NewReader(content), e.NewDecoder()))
+		if err != nil {
+			t.Errorf("%s: error decoding with hard-coded charset name: %v", tc.filename, err)
+			continue
+		}
+
+		if !bytes.Equal(got, want) {
+			t.Errorf("%s: got %q, want %q", tc.filename, got, want)
+			continue
+		}
+	}
+}
+
+var metaTestCases = []struct {
+	meta, want string
+}{
+	{"", ""},
+	{"text/html", ""},
+	{"text/html; charset utf-8", ""},
+	{"text/html; charset=latin-2", "latin-2"},
+	{"text/html; charset; charset = utf-8", "utf-8"},
+	{`charset="big5"`, "big5"},
+	{"charset='shift_jis'", "shift_jis"},
+}
+
+func TestFromMeta(t *testing.T) {
+	for _, tc := range metaTestCases {
+		got := fromMetaElement(tc.meta)
+		if got != tc.want {
+			t.Errorf("%q: got %q, want %q", tc.meta, got, tc.want)
+		}
+	}
+}
+
+func TestXML(t *testing.T) {
+	const s = "<?xml version=\"1.0\" encoding=\"windows-1252\"?><a><Word>r\xe9sum\xe9</Word></a>"
+
+	d := xml.NewDecoder(strings.NewReader(s))
+	d.CharsetReader = NewReaderLabel
+
+	var a struct {
+		Word string
+	}
+	err := d.Decode(&a)
+	if err != nil {
+		t.Fatalf("Decode: %v", err)
+	}
+
+	want := "résumé"
+	if a.Word != want {
+		t.Errorf("got %q, want %q", a.Word, want)
+	}
+}
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/charset/gen.go b/Godeps/_workspace/src/golang.org/x/net/html/charset/gen.go
new file mode 100644
index 00000000..828347f4
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/charset/gen.go
@@ -0,0 +1,111 @@
+// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build ignore
+
+package main
+
+// Download https://encoding.spec.whatwg.org/encodings.json and use it to
+// generate table.go.
+
+import (
+	"encoding/json"
+	"fmt"
+	"log"
+	"net/http"
+	"strings"
+)
+
+type enc struct {
+	Name   string
+	Labels []string
+}
+
+type group struct {
+	Encodings []enc
+	Heading   string
+}
+
+const specURL = "https://encoding.spec.whatwg.org/encodings.json"
+
+func main() {
+	resp, err := http.Get(specURL)
+	if err != nil {
+		log.Fatalf("error fetching %s: %s", specURL, err)
+	}
+	if resp.StatusCode != 200 {
+		log.Fatalf("error fetching %s: HTTP status %s", specURL, resp.Status)
+	}
+	defer resp.Body.Close()
+
+	var groups []group
+	d := json.NewDecoder(resp.Body)
+	err = d.Decode(&groups)
+	if err != nil {
+		log.Fatalf("error reading encodings.json: %s", err)
+	}
+
+	fmt.Println("// generated by go run gen.go; DO NOT EDIT")
+	fmt.Println()
+	fmt.Println("package charset")
+	fmt.Println()
+
+	fmt.Println("import (")
+	fmt.Println(`"golang.org/x/text/encoding"`)
+	for _, pkg := range []string{"charmap", "japanese", "korean", "simplifiedchinese", "traditionalchinese", "unicode"} {
+		fmt.Printf("\"golang.org/x/text/encoding/%s\"\n", pkg)
+	}
+	fmt.Println(")")
+	fmt.Println()
+
+	fmt.Println("var encodings = map[string]struct{e encoding.Encoding; name string} {")
+	for _, g := range groups {
+		for _, e := range g.Encodings {
+			goName, ok := miscNames[e.Name]
+			if !ok {
+				for k, v := range prefixes {
+					if strings.HasPrefix(e.Name, k) {
+						goName = v + e.Name[len(k):]
+						break
+					}
+				}
+				if goName == "" {
+					log.Fatalf("unrecognized encoding name: %s", e.Name)
+				}
+			}
+
+			for _, label := range e.Labels {
+				fmt.Printf("%q: {%s, %q},\n", label, goName, e.Name)
+			}
+		}
+	}
+	fmt.Println("}")
+}
+
+var prefixes = map[string]string{
+	"iso-8859-": "charmap.ISO8859_",
+	"windows-":  "charmap.Windows",
+}
+
+var miscNames = map[string]string{
+	"utf-8":          "encoding.Nop",
+	"ibm866":         "charmap.CodePage866",
+	"iso-8859-8-i":   "charmap.ISO8859_8",
+	"koi8-r":         "charmap.KOI8R",
+	"koi8-u":         "charmap.KOI8U",
+	"macintosh":      "charmap.Macintosh",
+	"x-mac-cyrillic": "charmap.MacintoshCyrillic",
+	"gbk":            "simplifiedchinese.GBK",
+	"gb18030":        "simplifiedchinese.GB18030",
+	"hz-gb-2312":     "simplifiedchinese.HZGB2312",
+	"big5":           "traditionalchinese.Big5",
+	"euc-jp":         "japanese.EUCJP",
+	"iso-2022-jp":    "japanese.ISO2022JP",
+	"shift_jis":      "japanese.ShiftJIS",
+	"euc-kr":         "korean.EUCKR",
+	"replacement":    "encoding.Replacement",
+	"utf-16be":       "unicode.UTF16(unicode.BigEndian, unicode.IgnoreBOM)",
+	"utf-16le":       "unicode.UTF16(unicode.LittleEndian, unicode.IgnoreBOM)",
+	"x-user-defined": "charmap.XUserDefined",
+}
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/charset/table.go b/Godeps/_workspace/src/golang.org/x/net/html/charset/table.go
new file mode 100644
index 00000000..aa0d9484
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/charset/table.go
@@ -0,0 +1,235 @@
+// generated by go run gen.go; DO NOT EDIT
+
+package charset
+
+import (
+	"golang.org/x/text/encoding"
+	"golang.org/x/text/encoding/charmap"
+	"golang.org/x/text/encoding/japanese"
+	"golang.org/x/text/encoding/korean"
+	"golang.org/x/text/encoding/simplifiedchinese"
+	"golang.org/x/text/encoding/traditionalchinese"
+	"golang.org/x/text/encoding/unicode"
+)
+
+var encodings = map[string]struct {
+	e    encoding.Encoding
+	name string
+}{
+	"unicode-1-1-utf-8":   {encoding.Nop, "utf-8"},
+	"utf-8":               {encoding.Nop, "utf-8"},
+	"utf8":                {encoding.Nop, "utf-8"},
+	"866":                 {charmap.CodePage866, "ibm866"},
+	"cp866":               {charmap.CodePage866, "ibm866"},
+	"csibm866":            {charmap.CodePage866, "ibm866"},
+	"ibm866":              {charmap.CodePage866, "ibm866"},
+	"csisolatin2":         {charmap.ISO8859_2, "iso-8859-2"},
+	"iso-8859-2":          {charmap.ISO8859_2, "iso-8859-2"},
+	"iso-ir-101":          {charmap.ISO8859_2, "iso-8859-2"},
+	"iso8859-2":           {charmap.ISO8859_2, "iso-8859-2"},
+	"iso88592":            {charmap.ISO8859_2, "iso-8859-2"},
+	"iso_8859-2":          {charmap.ISO8859_2, "iso-8859-2"},
+	"iso_8859-2:1987":     {charmap.ISO8859_2, "iso-8859-2"},
+	"l2":                  {charmap.ISO8859_2, "iso-8859-2"},
+	"latin2":              {charmap.ISO8859_2, "iso-8859-2"},
+	"csisolatin3":         {charmap.ISO8859_3, "iso-8859-3"},
+	"iso-8859-3":          {charmap.ISO8859_3, "iso-8859-3"},
+	"iso-ir-109":          {charmap.ISO8859_3, "iso-8859-3"},
+	"iso8859-3":           {charmap.ISO8859_3, "iso-8859-3"},
+	"iso88593":            {charmap.ISO8859_3, "iso-8859-3"},
+	"iso_8859-3":          {charmap.ISO8859_3, "iso-8859-3"},
+	"iso_8859-3:1988":     {charmap.ISO8859_3, "iso-8859-3"},
+	"l3":                  {charmap.ISO8859_3, "iso-8859-3"},
+	"latin3":              {charmap.ISO8859_3, "iso-8859-3"},
+	"csisolatin4":         {charmap.ISO8859_4, "iso-8859-4"},
+	"iso-8859-4":          {charmap.ISO8859_4, "iso-8859-4"},
+	"iso-ir-110":          {charmap.ISO8859_4, "iso-8859-4"},
+	"iso8859-4":           {charmap.ISO8859_4, "iso-8859-4"},
+	"iso88594":            {charmap.ISO8859_4, "iso-8859-4"},
+	"iso_8859-4":          {charmap.ISO8859_4, "iso-8859-4"},
+	"iso_8859-4:1988":     {charmap.ISO8859_4, "iso-8859-4"},
+	"l4":                  {charmap.ISO8859_4, "iso-8859-4"},
+	"latin4":              {charmap.ISO8859_4, "iso-8859-4"},
+	"csisolatincyrillic":  {charmap.ISO8859_5, "iso-8859-5"},
+	"cyrillic":            {charmap.ISO8859_5, "iso-8859-5"},
+	"iso-8859-5":          {charmap.ISO8859_5, "iso-8859-5"},
+	"iso-ir-144":          {charmap.ISO8859_5, "iso-8859-5"},
+	"iso8859-5":           {charmap.ISO8859_5, "iso-8859-5"},
+	"iso88595":            {charmap.ISO8859_5, "iso-8859-5"},
+	"iso_8859-5":          {charmap.ISO8859_5, "iso-8859-5"},
+	"iso_8859-5:1988":     {charmap.ISO8859_5, "iso-8859-5"},
+	"arabic":              {charmap.ISO8859_6, "iso-8859-6"},
+	"asmo-708":            {charmap.ISO8859_6, "iso-8859-6"},
+	"csiso88596e":         {charmap.ISO8859_6, "iso-8859-6"},
+	"csiso88596i":         {charmap.ISO8859_6, "iso-8859-6"},
+	"csisolatinarabic":    {charmap.ISO8859_6, "iso-8859-6"},
+	"ecma-114":            {charmap.ISO8859_6, "iso-8859-6"},
+	"iso-8859-6":          {charmap.ISO8859_6, "iso-8859-6"},
+	"iso-8859-6-e":        {charmap.ISO8859_6, "iso-8859-6"},
+	"iso-8859-6-i":        {charmap.ISO8859_6, "iso-8859-6"},
+	"iso-ir-127":          {charmap.ISO8859_6, "iso-8859-6"},
+	"iso8859-6":           {charmap.ISO8859_6, "iso-8859-6"},
+	"iso88596":            {charmap.ISO8859_6, "iso-8859-6"},
+	"iso_8859-6":          {charmap.ISO8859_6, "iso-8859-6"},
+	"iso_8859-6:1987":     {charmap.ISO8859_6, "iso-8859-6"},
+	"csisolatingreek":     {charmap.ISO8859_7, "iso-8859-7"},
+	"ecma-118":            {charmap.ISO8859_7, "iso-8859-7"},
+	"elot_928":            {charmap.ISO8859_7, "iso-8859-7"},
+	"greek":               {charmap.ISO8859_7, "iso-8859-7"},
+	"greek8":              {charmap.ISO8859_7, "iso-8859-7"},
+	"iso-8859-7":          {charmap.ISO8859_7, "iso-8859-7"},
+	"iso-ir-126":          {charmap.ISO8859_7, "iso-8859-7"},
+	"iso8859-7":           {charmap.ISO8859_7, "iso-8859-7"},
+	"iso88597":            {charmap.ISO8859_7, "iso-8859-7"},
+	"iso_8859-7":          {charmap.ISO8859_7, "iso-8859-7"},
+	"iso_8859-7:1987":     {charmap.ISO8859_7, "iso-8859-7"},
+	"sun_eu_greek":        {charmap.ISO8859_7, "iso-8859-7"},
+	"csiso88598e":         {charmap.ISO8859_8, "iso-8859-8"},
+	"csisolatinhebrew":    {charmap.ISO8859_8, "iso-8859-8"},
+	"hebrew":              {charmap.ISO8859_8, "iso-8859-8"},
+	"iso-8859-8":          {charmap.ISO8859_8, "iso-8859-8"},
+	"iso-8859-8-e":        {charmap.ISO8859_8, "iso-8859-8"},
+	"iso-ir-138":          {charmap.ISO8859_8, "iso-8859-8"},
+	"iso8859-8":           {charmap.ISO8859_8, "iso-8859-8"},
+	"iso88598":            {charmap.ISO8859_8, "iso-8859-8"},
+	"iso_8859-8":          {charmap.ISO8859_8, "iso-8859-8"},
+	"iso_8859-8:1988":     {charmap.ISO8859_8, "iso-8859-8"},
+	"visual":              {charmap.ISO8859_8, "iso-8859-8"},
+	"csiso88598i":         {charmap.ISO8859_8, "iso-8859-8-i"},
+	"iso-8859-8-i":        {charmap.ISO8859_8, "iso-8859-8-i"},
+	"logical":             {charmap.ISO8859_8, "iso-8859-8-i"},
+	"csisolatin6":         {charmap.ISO8859_10, "iso-8859-10"},
+	"iso-8859-10":         {charmap.ISO8859_10, "iso-8859-10"},
+	"iso-ir-157":          {charmap.ISO8859_10, "iso-8859-10"},
+	"iso8859-10":          {charmap.ISO8859_10, "iso-8859-10"},
+	"iso885910":           {charmap.ISO8859_10, "iso-8859-10"},
+	"l6":                  {charmap.ISO8859_10, "iso-8859-10"},
+	"latin6":              {charmap.ISO8859_10, "iso-8859-10"},
+	"iso-8859-13":         {charmap.ISO8859_13, "iso-8859-13"},
+	"iso8859-13":          {charmap.ISO8859_13, "iso-8859-13"},
+	"iso885913":           {charmap.ISO8859_13, "iso-8859-13"},
+	"iso-8859-14":         {charmap.ISO8859_14, "iso-8859-14"},
+	"iso8859-14":          {charmap.ISO8859_14, "iso-8859-14"},
+	"iso885914":           {charmap.ISO8859_14, "iso-8859-14"},
+	"csisolatin9":         {charmap.ISO8859_15, "iso-8859-15"},
+	"iso-8859-15":         {charmap.ISO8859_15, "iso-8859-15"},
+	"iso8859-15":          {charmap.ISO8859_15, "iso-8859-15"},
+	"iso885915":           {charmap.ISO8859_15, "iso-8859-15"},
+	"iso_8859-15":         {charmap.ISO8859_15, "iso-8859-15"},
+	"l9":                  {charmap.ISO8859_15, "iso-8859-15"},
+	"iso-8859-16":         {charmap.ISO8859_16, "iso-8859-16"},
+	"cskoi8r":             {charmap.KOI8R, "koi8-r"},
+	"koi":                 {charmap.KOI8R, "koi8-r"},
+	"koi8":                {charmap.KOI8R, "koi8-r"},
+	"koi8-r":              {charmap.KOI8R, "koi8-r"},
+	"koi8_r":              {charmap.KOI8R, "koi8-r"},
+	"koi8-u":              {charmap.KOI8U, "koi8-u"},
+	"csmacintosh":         {charmap.Macintosh, "macintosh"},
+	"mac":                 {charmap.Macintosh, "macintosh"},
+	"macintosh":           {charmap.Macintosh, "macintosh"},
+	"x-mac-roman":         {charmap.Macintosh, "macintosh"},
+	"dos-874":             {charmap.Windows874, "windows-874"},
+	"iso-8859-11":         {charmap.Windows874, "windows-874"},
+	"iso8859-11":          {charmap.Windows874, "windows-874"},
+	"iso885911":           {charmap.Windows874, "windows-874"},
+	"tis-620":             {charmap.Windows874, "windows-874"},
+	"windows-874":         {charmap.Windows874, "windows-874"},
+	"cp1250":              {charmap.Windows1250, "windows-1250"},
+	"windows-1250":        {charmap.Windows1250, "windows-1250"},
+	"x-cp1250":            {charmap.Windows1250, "windows-1250"},
+	"cp1251":              {charmap.Windows1251, "windows-1251"},
+	"windows-1251":        {charmap.Windows1251, "windows-1251"},
+	"x-cp1251":            {charmap.Windows1251, "windows-1251"},
+	"ansi_x3.4-1968":      {charmap.Windows1252, "windows-1252"},
+	"ascii":               {charmap.Windows1252, "windows-1252"},
+	"cp1252":              {charmap.Windows1252, "windows-1252"},
+	"cp819":               {charmap.Windows1252, "windows-1252"},
+	"csisolatin1":         {charmap.Windows1252, "windows-1252"},
+	"ibm819":              {charmap.Windows1252, "windows-1252"},
+	"iso-8859-1":          {charmap.Windows1252, "windows-1252"},
+	"iso-ir-100":          {charmap.Windows1252, "windows-1252"},
+	"iso8859-1":           {charmap.Windows1252, "windows-1252"},
+	"iso88591":            {charmap.Windows1252, "windows-1252"},
+	"iso_8859-1":          {charmap.Windows1252, "windows-1252"},
+	"iso_8859-1:1987":     {charmap.Windows1252, "windows-1252"},
+	"l1":                  {charmap.Windows1252, "windows-1252"},
+	"latin1":              {charmap.Windows1252, "windows-1252"},
+	"us-ascii":            {charmap.Windows1252, "windows-1252"},
+	"windows-1252":        {charmap.Windows1252, "windows-1252"},
+	"x-cp1252":            {charmap.Windows1252, "windows-1252"},
+	"cp1253":              {charmap.Windows1253, "windows-1253"},
+	"windows-1253":        {charmap.Windows1253, "windows-1253"},
+	"x-cp1253":            {charmap.Windows1253, "windows-1253"},
+	"cp1254":              {charmap.Windows1254, "windows-1254"},
+	"csisolatin5":         {charmap.Windows1254, "windows-1254"},
+	"iso-8859-9":          {charmap.Windows1254, "windows-1254"},
+	"iso-ir-148":          {charmap.Windows1254, "windows-1254"},
+	"iso8859-9":           {charmap.Windows1254, "windows-1254"},
+	"iso88599":            {charmap.Windows1254, "windows-1254"},
+	"iso_8859-9":          {charmap.Windows1254, "windows-1254"},
+	"iso_8859-9:1989":     {charmap.Windows1254, "windows-1254"},
+	"l5":                  {charmap.Windows1254, "windows-1254"},
+	"latin5":              {charmap.Windows1254, "windows-1254"},
+	"windows-1254":        {charmap.Windows1254, "windows-1254"},
+	"x-cp1254":            {charmap.Windows1254, "windows-1254"},
+	"cp1255":              {charmap.Windows1255, "windows-1255"},
+	"windows-1255":        {charmap.Windows1255, "windows-1255"},
+	"x-cp1255":            {charmap.Windows1255, "windows-1255"},
+	"cp1256":              {charmap.Windows1256, "windows-1256"},
+	"windows-1256":        {charmap.Windows1256, "windows-1256"},
+	"x-cp1256":            {charmap.Windows1256, "windows-1256"},
+	"cp1257":              {charmap.Windows1257, "windows-1257"},
+	"windows-1257":        {charmap.Windows1257, "windows-1257"},
+	"x-cp1257":            {charmap.Windows1257, "windows-1257"},
+	"cp1258":              {charmap.Windows1258, "windows-1258"},
+	"windows-1258":        {charmap.Windows1258, "windows-1258"},
+	"x-cp1258":            {charmap.Windows1258, "windows-1258"},
+	"x-mac-cyrillic":      {charmap.MacintoshCyrillic, "x-mac-cyrillic"},
+	"x-mac-ukrainian":     {charmap.MacintoshCyrillic, "x-mac-cyrillic"},
+	"chinese":             {simplifiedchinese.GBK, "gbk"},
+	"csgb2312":            {simplifiedchinese.GBK, "gbk"},
+	"csiso58gb231280":     {simplifiedchinese.GBK, "gbk"},
+	"gb2312":              {simplifiedchinese.GBK, "gbk"},
+	"gb_2312":             {simplifiedchinese.GBK, "gbk"},
+	"gb_2312-80":          {simplifiedchinese.GBK, "gbk"},
+	"gbk":                 {simplifiedchinese.GBK, "gbk"},
+	"iso-ir-58":           {simplifiedchinese.GBK, "gbk"},
+	"x-gbk":               {simplifiedchinese.GBK, "gbk"},
+	"gb18030":             {simplifiedchinese.GB18030, "gb18030"},
+	"hz-gb-2312":          {simplifiedchinese.HZGB2312, "hz-gb-2312"},
+	"big5":                {traditionalchinese.Big5, "big5"},
+	"big5-hkscs":          {traditionalchinese.Big5, "big5"},
+	"cn-big5":             {traditionalchinese.Big5, "big5"},
+	"csbig5":              {traditionalchinese.Big5, "big5"},
+	"x-x-big5":            {traditionalchinese.Big5, "big5"},
+	"cseucpkdfmtjapanese": {japanese.EUCJP, "euc-jp"},
+	"euc-jp":              {japanese.EUCJP, "euc-jp"},
+	"x-euc-jp":            {japanese.EUCJP, "euc-jp"},
+	"csiso2022jp":         {japanese.ISO2022JP, "iso-2022-jp"},
+	"iso-2022-jp":         {japanese.ISO2022JP, "iso-2022-jp"},
+	"csshiftjis":          {japanese.ShiftJIS, "shift_jis"},
+	"ms_kanji":            {japanese.ShiftJIS, "shift_jis"},
+	"shift-jis":           {japanese.ShiftJIS, "shift_jis"},
+	"shift_jis":           {japanese.ShiftJIS, "shift_jis"},
+	"sjis":                {japanese.ShiftJIS, "shift_jis"},
+	"windows-31j":         {japanese.ShiftJIS, "shift_jis"},
+	"x-sjis":              {japanese.ShiftJIS, "shift_jis"},
+	"cseuckr":             {korean.EUCKR, "euc-kr"},
+	"csksc56011987":       {korean.EUCKR, "euc-kr"},
+	"euc-kr":              {korean.EUCKR, "euc-kr"},
+	"iso-ir-149":          {korean.EUCKR, "euc-kr"},
+	"korean":              {korean.EUCKR, "euc-kr"},
+	"ks_c_5601-1987":      {korean.EUCKR, "euc-kr"},
+	"ks_c_5601-1989":      {korean.EUCKR, "euc-kr"},
+	"ksc5601":             {korean.EUCKR, "euc-kr"},
+	"ksc_5601":            {korean.EUCKR, "euc-kr"},
+	"windows-949":         {korean.EUCKR, "euc-kr"},
+	"csiso2022kr":         {encoding.Replacement, "replacement"},
+	"iso-2022-kr":         {encoding.Replacement, "replacement"},
+	"iso-2022-cn":         {encoding.Replacement, "replacement"},
+	"iso-2022-cn-ext":     {encoding.Replacement, "replacement"},
+	"utf-16be":            {unicode.UTF16(unicode.BigEndian, unicode.IgnoreBOM), "utf-16be"},
+	"utf-16":              {unicode.UTF16(unicode.LittleEndian, unicode.IgnoreBOM), "utf-16le"},
+	"utf-16le":            {unicode.UTF16(unicode.LittleEndian, unicode.IgnoreBOM), "utf-16le"},
+	"x-user-defined":      {charmap.XUserDefined, "x-user-defined"},
+}
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/HTTP-charset.html b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/HTTP-charset.html
new file mode 100644
index 00000000..9915fa0e
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/HTTP-charset.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html  lang="en" >
+<head>
+  <title>HTTP charset</title>
+<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
+<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
+<link rel="stylesheet" type="text/css" href="./generatedtests.css">
+<script src="http://w3c-test.org/resources/testharness.js"></script>
+<script src="http://w3c-test.org/resources/testharnessreport.js"></script>
+<meta name='flags' content='http'>
+<meta name="assert" content="The character encoding of a page can be set using the HTTP header charset declaration.">
+<style type='text/css'>
+.test div { width: 50px; }</style>
+<link rel="stylesheet" type="text/css" href="the-input-byte-stream/support/encodingtests-15.css">
+</head>
+<body>
+<p class='title'>HTTP charset</p>
+
+
+<div id='log'></div>
+
+
+<div class='test'><div id='box' class='ýäè'>&#xA0;</div></div>
+
+
+
+
+
+<div class='description'>
+<p class="assertion" title="Assertion">The character encoding of a page can be set using the HTTP header charset declaration.</p>
+<div class="notes"><p><p>The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector <code>.test div.&#x00C3;&#x0153;&#x00C3;&#x20AC;&#x00C3;&#x0161;</code>. This matches the sequence of bytes above when they are interpreted as ISO 8859-15. If the class name matches the selector then the test will pass.</p><p>The only character encoding declaration for this HTML file is in the HTTP header, which sets the encoding to ISO 8859-15.</p></p>
+</div>
+</div>
+<div class="nexttest"><div><a href="generate?test=the-input-byte-stream-003">Next test</a></div><div class="doctype">HTML5</div>
+<p class="jump">the-input-byte-stream-001<br /><a href="/International/tests/html5/the-input-byte-stream/results-basics#basics" target="_blank">Result summary &amp; related tests</a><br /><a href="http://w3c-test.org/framework/details/i18n-html5/the-input-byte-stream-001" target="_blank">Detailed results for this test</a><br/>	<a href="http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream" target="_blank">Link to spec</a></p>
+<div class='prereq'>Assumptions: <ul><li>The default encoding for the browser you are testing is not set to ISO 8859-15.</li>
+				<li>The test is read from a server that supports HTTP.</li></ul></div>
+</div>
+<script>
+test(function() {
+assert_equals(document.getElementById('box').offsetWidth, 100);
+}, " ");
+</script>
+
+</body>
+</html>
+
+
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/HTTP-vs-UTF-8-BOM.html b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/HTTP-vs-UTF-8-BOM.html
new file mode 100644
index 00000000..26e5d8b4
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/HTTP-vs-UTF-8-BOM.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html  lang="en" >
+<head>
+  <title>HTTP vs UTF-8 BOM</title>
+<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
+<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
+<link rel="stylesheet" type="text/css" href="./generatedtests.css">
+<script src="http://w3c-test.org/resources/testharness.js"></script>
+<script src="http://w3c-test.org/resources/testharnessreport.js"></script>
+<meta name='flags' content='http'>
+<meta name="assert" content="A character encoding set in the HTTP header has lower precedence than the UTF-8 signature.">
+<style type='text/css'>
+.test div { width: 50px; }</style>
+<link rel="stylesheet" type="text/css" href="the-input-byte-stream/support/encodingtests-utf8.css">
+</head>
+<body>
+<p class='title'>HTTP vs UTF-8 BOM</p>
+
+
+<div id='log'></div>
+
+
+<div class='test'><div id='box' class='ýäè'>&#xA0;</div></div>
+
+
+
+
+
+<div class='description'>
+<p class="assertion" title="Assertion">A character encoding set in the HTTP header has lower precedence than the UTF-8 signature.</p>
+<div class="notes"><p><p>The HTTP header attempts to set the character encoding to ISO 8859-15. The page starts with a UTF-8 signature.</p><p>The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector <code>.test div.&#x00FD;&#x00E4;&#x00E8;</code>. This matches the sequence of bytes above when they are interpreted as UTF-8. If the class name matches the selector then the test will pass.</p><p>If the test is unsuccessful, the characters &#x00EF;&#x00BB;&#x00BF; should appear at the top of the page.  These represent the bytes that make up the UTF-8 signature when encountered in the ISO 8859-15 encoding.</p></p>
+</div>
+</div>
+<div class="nexttest"><div><a href="generate?test=the-input-byte-stream-022">Next test</a></div><div class="doctype">HTML5</div>
+<p class="jump">the-input-byte-stream-034<br /><a href="/International/tests/html5/the-input-byte-stream/results-basics#precedence" target="_blank">Result summary &amp; related tests</a><br /><a href="http://w3c-test.org/framework/details/i18n-html5/the-input-byte-stream-034" target="_blank">Detailed results for this test</a><br/>	<a href="http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream" target="_blank">Link to spec</a></p>
+<div class='prereq'>Assumptions: <ul><li>The default encoding for the browser you are testing is not set to ISO 8859-15.</li>
+				<li>The test is read from a server that supports HTTP.</li></ul></div>
+</div>
+<script>
+test(function() {
+assert_equals(document.getElementById('box').offsetWidth, 100);
+}, " ");
+</script>
+
+</body>
+</html>
+
+
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/HTTP-vs-meta-charset.html b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/HTTP-vs-meta-charset.html
new file mode 100644
index 00000000..2f07e951
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/HTTP-vs-meta-charset.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html  lang="en" >
+<head>
+ <meta charset="iso-8859-1" > <title>HTTP vs meta charset</title>
+<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
+<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
+<link rel="stylesheet" type="text/css" href="./generatedtests.css">
+<script src="http://w3c-test.org/resources/testharness.js"></script>
+<script src="http://w3c-test.org/resources/testharnessreport.js"></script>
+<meta name='flags' content='http'>
+<meta name="assert" content="The HTTP header has a higher precedence than an encoding declaration in a meta charset attribute.">
+<style type='text/css'>
+.test div { width: 50px; }.test div { width: 90px; }
+</style>
+<link rel="stylesheet" type="text/css" href="the-input-byte-stream/support/encodingtests-15.css">
+</head>
+<body>
+<p class='title'>HTTP vs meta charset</p>
+
+
+<div id='log'></div>
+
+
+<div class='test'><div id='box' class='ýäè'>&#xA0;</div></div>
+
+
+
+
+
+<div class='description'>
+<p class="assertion" title="Assertion">The HTTP header has a higher precedence than an encoding declaration in a meta charset attribute.</p>
+<div class="notes"><p><p>The HTTP header attempts to set the character encoding to ISO 8859-15. The page contains an encoding declaration in a meta charset attribute that attempts to set the character encoding to ISO 8859-1.</p><p>The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector <code>.test div.&#x00C3;&#x0153;&#x00C3;&#x20AC;&#x00C3;&#x0161;</code>. This matches the sequence of bytes above when they are interpreted as ISO 8859-15. If the class name matches the selector then the test will pass.</p></p>
+</div>
+</div>
+<div class="nexttest"><div><a href="generate?test=the-input-byte-stream-037">Next test</a></div><div class="doctype">HTML5</div>
+<p class="jump">the-input-byte-stream-018<br /><a href="/International/tests/html5/the-input-byte-stream/results-basics#precedence" target="_blank">Result summary &amp; related tests</a><br /><a href="http://w3c-test.org/framework/details/i18n-html5/the-input-byte-stream-018" target="_blank">Detailed results for this test</a><br/>	<a href="http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream" target="_blank">Link to spec</a></p>
+<div class='prereq'>Assumptions: <ul><li>The default encoding for the browser you are testing is not set to ISO 8859-15.</li>
+				<li>The test is read from a server that supports HTTP.</li></ul></div>
+</div>
+<script>
+test(function() {
+assert_equals(document.getElementById('box').offsetWidth, 100);
+}, " ");
+</script>
+
+</body>
+</html>
+
+
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/HTTP-vs-meta-content.html b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/HTTP-vs-meta-content.html
new file mode 100644
index 00000000..6853cdde
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/HTTP-vs-meta-content.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html  lang="en" >
+<head>
+ <meta http-equiv="content-type" content="text/html;charset=iso-8859-1" > <title>HTTP vs meta content</title>
+<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
+<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
+<link rel="stylesheet" type="text/css" href="./generatedtests.css">
+<script src="http://w3c-test.org/resources/testharness.js"></script>
+<script src="http://w3c-test.org/resources/testharnessreport.js"></script>
+<meta name='flags' content='http'>
+<meta name="assert" content="The HTTP header has a higher precedence than an encoding declaration in a meta content attribute.">
+<style type='text/css'>
+.test div { width: 50px; }.test div { width: 90px; }
+</style>
+<link rel="stylesheet" type="text/css" href="the-input-byte-stream/support/encodingtests-15.css">
+</head>
+<body>
+<p class='title'>HTTP vs meta content</p>
+
+
+<div id='log'></div>
+
+
+<div class='test'><div id='box' class='ýäè'>&#xA0;</div></div>
+
+
+
+
+
+<div class='description'>
+<p class="assertion" title="Assertion">The HTTP header has a higher precedence than an encoding declaration in a meta content attribute.</p>
+<div class="notes"><p><p>The HTTP header attempts to set the character encoding to ISO 8859-15. The page contains an encoding declaration in a meta content attribute that attempts to set the character encoding to ISO 8859-1.</p><p>The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector <code>.test div.&#x00C3;&#x0153;&#x00C3;&#x20AC;&#x00C3;&#x0161;</code>. This matches the sequence of bytes above when they are interpreted as ISO 8859-15. If the class name matches the selector then the test will pass.</p></p>
+</div>
+</div>
+<div class="nexttest"><div><a href="generate?test=the-input-byte-stream-018">Next test</a></div><div class="doctype">HTML5</div>
+<p class="jump">the-input-byte-stream-016<br /><a href="/International/tests/html5/the-input-byte-stream/results-basics#precedence" target="_blank">Result summary &amp; related tests</a><br /><a href="http://w3c-test.org/framework/details/i18n-html5/the-input-byte-stream-016" target="_blank">Detailed results for this test</a><br/>	<a href="http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream" target="_blank">Link to spec</a></p>
+<div class='prereq'>Assumptions: <ul><li>The default encoding for the browser you are testing is not set to ISO 8859-15.</li>
+				<li>The test is read from a server that supports HTTP.</li></ul></div>
+</div>
+<script>
+test(function() {
+assert_equals(document.getElementById('box').offsetWidth, 100);
+}, " ");
+</script>
+
+</body>
+</html>
+
+
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/No-encoding-declaration.html b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/No-encoding-declaration.html
new file mode 100644
index 00000000..612e26c6
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/No-encoding-declaration.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html  lang="en" >
+<head>
+  <title>No encoding declaration</title>
+<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
+<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
+<link rel="stylesheet" type="text/css" href="./generatedtests.css">
+<script src="http://w3c-test.org/resources/testharness.js"></script>
+<script src="http://w3c-test.org/resources/testharnessreport.js"></script>
+<meta name='flags' content='http'>
+<meta name="assert" content="A page with no encoding information in HTTP, BOM, XML declaration or meta element will be treated as UTF-8.">
+<style type='text/css'>
+.test div { width: 50px; }</style>
+<link rel="stylesheet" type="text/css" href="the-input-byte-stream/support/encodingtests-utf8.css">
+</head>
+<body>
+<p class='title'>No encoding declaration</p>
+
+
+<div id='log'></div>
+
+
+<div class='test'><div id='box' class='ýäè'>&#xA0;</div></div>
+
+
+
+
+
+<div class='description'>
+<p class="assertion" title="Assertion">A page with no encoding information in HTTP, BOM, XML declaration or meta element will be treated as UTF-8.</p>
+<div class="notes"><p><p>The test on this page contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector <code>.test div.&#x00FD;&#x00E4;&#x00E8;</code>. This matches the sequence of bytes above when they are interpreted as UTF-8. If the class name matches the selector then the test will pass.</p></p>
+</div>
+</div>
+<div class="nexttest"><div><a href="generate?test=the-input-byte-stream-034">Next test</a></div><div class="doctype">HTML5</div>
+<p class="jump">the-input-byte-stream-015<br /><a href="/International/tests/html5/the-input-byte-stream/results-basics#basics" target="_blank">Result summary &amp; related tests</a><br /><a href="http://w3c-test.org/framework/details/i18n-html5/the-input-byte-stream-015" target="_blank">Detailed results for this test</a><br/>	<a href="http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream" target="_blank">Link to spec</a></p>
+<div class='prereq'>Assumptions: <ul><li>The test is read from a server that supports HTTP.</li></ul></div>
+</div>
+<script>
+test(function() {
+assert_equals(document.getElementById('box').offsetWidth, 100);
+}, " ");
+</script>
+
+</body>
+</html>
+
+
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/README b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/README
new file mode 100644
index 00000000..38ef0f9f
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/README
@@ -0,0 +1,9 @@
+These test cases come from
+http://www.w3.org/International/tests/repository/html5/the-input-byte-stream/results-basics
+
+Distributed under both the W3C Test Suite License
+(http://www.w3.org/Consortium/Legal/2008/04-testsuite-license)
+and the W3C 3-clause BSD License
+(http://www.w3.org/Consortium/Legal/2008/03-bsd-license).
+To contribute to a W3C Test Suite, see the policies and contribution
+forms (http://www.w3.org/2004/10/27-testcases).
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/UTF-16BE-BOM.html b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/UTF-16BE-BOM.html
new file mode 100644
index 00000000..3abf7a93
Binary files /dev/null and b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/UTF-16BE-BOM.html differ
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/UTF-16LE-BOM.html b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/UTF-16LE-BOM.html
new file mode 100644
index 00000000..76254c98
Binary files /dev/null and b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/UTF-16LE-BOM.html differ
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/UTF-8-BOM-vs-meta-charset.html b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/UTF-8-BOM-vs-meta-charset.html
new file mode 100644
index 00000000..83de4333
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/UTF-8-BOM-vs-meta-charset.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html  lang="en" >
+<head>
+ <meta charset="iso-8859-15"> <title>UTF-8 BOM vs meta charset</title>
+<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
+<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
+<link rel="stylesheet" type="text/css" href="./generatedtests.css">
+<script src="http://w3c-test.org/resources/testharness.js"></script>
+<script src="http://w3c-test.org/resources/testharnessreport.js"></script>
+<meta name='flags' content='http'>
+<meta name="assert" content="A page with a UTF-8 BOM will be recognized as UTF-8 even if the meta charset attribute declares a different encoding.">
+<style type='text/css'>
+.test div { width: 50px; }.test div { width: 90px; }
+</style>
+<link rel="stylesheet" type="text/css" href="the-input-byte-stream/support/encodingtests-utf8.css">
+</head>
+<body>
+<p class='title'>UTF-8 BOM vs meta charset</p>
+
+
+<div id='log'></div>
+
+
+<div class='test'><div id='box' class='ýäè'>&#xA0;</div></div>
+
+
+
+
+
+<div class='description'>
+<p class="assertion" title="Assertion">A page with a UTF-8 BOM will be recognized as UTF-8 even if the meta charset attribute declares a different encoding.</p>
+<div class="notes"><p><p>The page contains an encoding declaration in a meta charset attribute that attempts to set the character encoding to ISO 8859-15, but the file starts with a UTF-8 signature.</p><p>The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector <code>.test div.&#x00FD;&#x00E4;&#x00E8;</code>. This matches the sequence of bytes above when they are interpreted as UTF-8. If the class name matches the selector then the test will pass.</p></p>
+</div>
+</div>
+<div class="nexttest"><div><a href="generate?test=the-input-byte-stream-024">Next test</a></div><div class="doctype">HTML5</div>
+<p class="jump">the-input-byte-stream-038<br /><a href="/International/tests/html5/the-input-byte-stream/results-basics#precedence" target="_blank">Result summary &amp; related tests</a><br /><a href="http://w3c-test.org/framework/details/i18n-html5/the-input-byte-stream-038" target="_blank">Detailed results for this test</a><br/>	<a href="http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream" target="_blank">Link to spec</a></p>
+<div class='prereq'>Assumptions: <ul><li>The default encoding for the browser you are testing is not set to ISO 8859-15.</li>
+				<li>The test is read from a server that supports HTTP.</li></ul></div>
+</div>
+<script>
+test(function() {
+assert_equals(document.getElementById('box').offsetWidth, 100);
+}, " ");
+</script>
+
+</body>
+</html>
+
+
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/UTF-8-BOM-vs-meta-content.html b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/UTF-8-BOM-vs-meta-content.html
new file mode 100644
index 00000000..501aac2d
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/UTF-8-BOM-vs-meta-content.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html  lang="en" >
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=iso-8859-15"> <title>UTF-8 BOM vs meta content</title>
+<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
+<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
+<link rel="stylesheet" type="text/css" href="./generatedtests.css">
+<script src="http://w3c-test.org/resources/testharness.js"></script>
+<script src="http://w3c-test.org/resources/testharnessreport.js"></script>
+<meta name='flags' content='http'>
+<meta name="assert" content="A page with a UTF-8 BOM will be recognized as UTF-8 even if the meta content attribute declares a different encoding.">
+<style type='text/css'>
+.test div { width: 50px; }</style>
+<link rel="stylesheet" type="text/css" href="the-input-byte-stream/support/encodingtests-utf8.css">
+</head>
+<body>
+<p class='title'>UTF-8 BOM vs meta content</p>
+
+
+<div id='log'></div>
+
+
+<div class='test'><div id='box' class='ýäè'>&#xA0;</div></div>
+
+
+
+
+
+<div class='description'>
+<p class="assertion" title="Assertion">A page with a UTF-8 BOM will be recognized as UTF-8 even if the meta content attribute declares a different encoding.</p>
+<div class="notes"><p><p>The page contains an encoding declaration in a meta content attribute that attempts to set the character encoding to ISO 8859-15, but the file starts with a UTF-8 signature.</p><p>The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector <code>.test div.&#x00FD;&#x00E4;&#x00E8;</code>. This matches the sequence of bytes above when they are interpreted as UTF-8. If the class name matches the selector then the test will pass.</p></p>
+</div>
+</div>
+<div class="nexttest"><div><a href="generate?test=the-input-byte-stream-038">Next test</a></div><div class="doctype">HTML5</div>
+<p class="jump">the-input-byte-stream-037<br /><a href="/International/tests/html5/the-input-byte-stream/results-basics#precedence" target="_blank">Result summary &amp; related tests</a><br /><a href="http://w3c-test.org/framework/details/i18n-html5/the-input-byte-stream-037" target="_blank">Detailed results for this test</a><br/>	<a href="http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream" target="_blank">Link to spec</a></p>
+<div class='prereq'>Assumptions: <ul><li>The default encoding for the browser you are testing is not set to ISO 8859-15.</li>
+				<li>The test is read from a server that supports HTTP.</li></ul></div>
+</div>
+<script>
+test(function() {
+assert_equals(document.getElementById('box').offsetWidth, 100);
+}, " ");
+</script>
+
+</body>
+</html>
+
+
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/meta-charset-attribute.html b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/meta-charset-attribute.html
new file mode 100644
index 00000000..2d7d25ab
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/meta-charset-attribute.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html  lang="en" >
+<head>
+ <meta charset="iso-8859-15"> <title>meta charset attribute</title>
+<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
+<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
+<link rel="stylesheet" type="text/css" href="./generatedtests.css">
+<script src="http://w3c-test.org/resources/testharness.js"></script>
+<script src="http://w3c-test.org/resources/testharnessreport.js"></script>
+<meta name='flags' content='http'>
+<meta name="assert" content="The character encoding of the page can be set by a meta element with charset attribute.">
+<style type='text/css'>
+.test div { width: 50px; }</style>
+<link rel="stylesheet" type="text/css" href="the-input-byte-stream/support/encodingtests-15.css">
+</head>
+<body>
+<p class='title'>meta charset attribute</p>
+
+
+<div id='log'></div>
+
+
+<div class='test'><div id='box' class='ýäè'>&#xA0;</div></div>
+
+
+
+
+
+<div class='description'>
+<p class="assertion" title="Assertion">The character encoding of the page can be set by a meta element with charset attribute.</p>
+<div class="notes"><p><p>The only character encoding declaration for this HTML file is in the charset attribute of the meta element, which declares the encoding to be ISO 8859-15.</p><p>The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector <code>.test div.&#x00C3;&#x0153;&#x00C3;&#x20AC;&#x00C3;&#x0161;</code>. This matches the sequence of bytes above when they are interpreted as ISO 8859-15. If the class name matches the selector then the test will pass.</p></p>
+</div>
+</div>
+<div class="nexttest"><div><a href="generate?test=the-input-byte-stream-015">Next test</a></div><div class="doctype">HTML5</div>
+<p class="jump">the-input-byte-stream-009<br /><a href="/International/tests/html5/the-input-byte-stream/results-basics#basics" target="_blank">Result summary &amp; related tests</a><br /><a href="http://w3c-test.org/framework/details/i18n-html5/the-input-byte-stream-009" target="_blank">Detailed results for this test</a><br/>	<a href="http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream" target="_blank">Link to spec</a></p>
+<div class='prereq'>Assumptions: <ul><li>The default encoding for the browser you are testing is not set to ISO 8859-15.</li>
+				<li>The test is read from a server that supports HTTP.</li></ul></div>
+</div>
+<script>
+test(function() {
+assert_equals(document.getElementById('box').offsetWidth, 100);
+}, " ");
+</script>
+
+</body>
+</html>
+
+
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/meta-content-attribute.html b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/meta-content-attribute.html
new file mode 100644
index 00000000..1c3f228e
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/meta-content-attribute.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html  lang="en" >
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=iso-8859-15"> <title>meta content attribute</title>
+<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
+<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
+<link rel="stylesheet" type="text/css" href="./generatedtests.css">
+<script src="http://w3c-test.org/resources/testharness.js"></script>
+<script src="http://w3c-test.org/resources/testharnessreport.js"></script>
+<meta name='flags' content='http'>
+<meta name="assert" content="The character encoding of the page can be set by a meta element with http-equiv and content attributes.">
+<style type='text/css'>
+.test div { width: 50px; }</style>
+<link rel="stylesheet" type="text/css" href="the-input-byte-stream/support/encodingtests-15.css">
+</head>
+<body>
+<p class='title'>meta content attribute</p>
+
+
+<div id='log'></div>
+
+
+<div class='test'><div id='box' class='ýäè'>&#xA0;</div></div>
+
+
+
+
+
+<div class='description'>
+<p class="assertion" title="Assertion">The character encoding of the page can be set by a meta element with http-equiv and content attributes.</p>
+<div class="notes"><p><p>The only character encoding declaration for this HTML file is in the content attribute of the meta element, which declares the encoding to be ISO 8859-15.</p><p>The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector <code>.test div.&#x00C3;&#x0153;&#x00C3;&#x20AC;&#x00C3;&#x0161;</code>. This matches the sequence of bytes above when they are interpreted as ISO 8859-15. If the class name matches the selector then the test will pass.</p></p>
+</div>
+</div>
+<div class="nexttest"><div><a href="generate?test=the-input-byte-stream-009">Next test</a></div><div class="doctype">HTML5</div>
+<p class="jump">the-input-byte-stream-007<br /><a href="/International/tests/html5/the-input-byte-stream/results-basics#basics" target="_blank">Result summary &amp; related tests</a><br /><a href="http://w3c-test.org/framework/details/i18n-html5/the-input-byte-stream-007" target="_blank">Detailed results for this test</a><br/>	<a href="http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream" target="_blank">Link to spec</a></p>
+<div class='prereq'>Assumptions: <ul><li>The default encoding for the browser you are testing is not set to ISO 8859-15.</li>
+				<li>The test is read from a server that supports HTTP.</li></ul></div>
+</div>
+<script>
+test(function() {
+assert_equals(document.getElementById('box').offsetWidth, 100);
+}, " ");
+</script>
+
+</body>
+</html>
+
+
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/const.go b/Godeps/_workspace/src/golang.org/x/net/html/const.go
new file mode 100644
index 00000000..52f651ff
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/const.go
@@ -0,0 +1,102 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package html
+
+// Section 12.2.3.2 of the HTML5 specification says "The following elements
+// have varying levels of special parsing rules".
+// https://html.spec.whatwg.org/multipage/syntax.html#the-stack-of-open-elements
+var isSpecialElementMap = map[string]bool{
+	"address":    true,
+	"applet":     true,
+	"area":       true,
+	"article":    true,
+	"aside":      true,
+	"base":       true,
+	"basefont":   true,
+	"bgsound":    true,
+	"blockquote": true,
+	"body":       true,
+	"br":         true,
+	"button":     true,
+	"caption":    true,
+	"center":     true,
+	"col":        true,
+	"colgroup":   true,
+	"dd":         true,
+	"details":    true,
+	"dir":        true,
+	"div":        true,
+	"dl":         true,
+	"dt":         true,
+	"embed":      true,
+	"fieldset":   true,
+	"figcaption": true,
+	"figure":     true,
+	"footer":     true,
+	"form":       true,
+	"frame":      true,
+	"frameset":   true,
+	"h1":         true,
+	"h2":         true,
+	"h3":         true,
+	"h4":         true,
+	"h5":         true,
+	"h6":         true,
+	"head":       true,
+	"header":     true,
+	"hgroup":     true,
+	"hr":         true,
+	"html":       true,
+	"iframe":     true,
+	"img":        true,
+	"input":      true,
+	"isindex":    true,
+	"li":         true,
+	"link":       true,
+	"listing":    true,
+	"marquee":    true,
+	"menu":       true,
+	"meta":       true,
+	"nav":        true,
+	"noembed":    true,
+	"noframes":   true,
+	"noscript":   true,
+	"object":     true,
+	"ol":         true,
+	"p":          true,
+	"param":      true,
+	"plaintext":  true,
+	"pre":        true,
+	"script":     true,
+	"section":    true,
+	"select":     true,
+	"source":     true,
+	"style":      true,
+	"summary":    true,
+	"table":      true,
+	"tbody":      true,
+	"td":         true,
+	"template":   true,
+	"textarea":   true,
+	"tfoot":      true,
+	"th":         true,
+	"thead":      true,
+	"title":      true,
+	"tr":         true,
+	"track":      true,
+	"ul":         true,
+	"wbr":        true,
+	"xmp":        true,
+}
+
+func isSpecialElement(element *Node) bool {
+	switch element.Namespace {
+	case "", "html":
+		return isSpecialElementMap[element.Data]
+	case "svg":
+		return element.Data == "foreignObject"
+	}
+	return false
+}
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/doc.go b/Godeps/_workspace/src/golang.org/x/net/html/doc.go
new file mode 100644
index 00000000..b453fe1e
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/doc.go
@@ -0,0 +1,106 @@
+// Copyright 2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+/*
+Package html implements an HTML5-compliant tokenizer and parser.
+
+Tokenization is done by creating a Tokenizer for an io.Reader r. It is the
+caller's responsibility to ensure that r provides UTF-8 encoded HTML.
+
+	z := html.NewTokenizer(r)
+
+Given a Tokenizer z, the HTML is tokenized by repeatedly calling z.Next(),
+which parses the next token and returns its type, or an error:
+
+	for {
+		tt := z.Next()
+		if tt == html.ErrorToken {
+			// ...
+			return ...
+		}
+		// Process the current token.
+	}
+
+There are two APIs for retrieving the current token. The high-level API is to
+call Token; the low-level API is to call Text or TagName / TagAttr. Both APIs
+allow optionally calling Raw after Next but before Token, Text, TagName, or
+TagAttr. In EBNF notation, the valid call sequence per token is:
+
+	Next {Raw} [ Token | Text | TagName {TagAttr} ]
+
+Token returns an independent data structure that completely describes a token.
+Entities (such as "&lt;") are unescaped, tag names and attribute keys are
+lower-cased, and attributes are collected into a []Attribute. For example:
+
+	for {
+		if z.Next() == html.ErrorToken {
+			// Returning io.EOF indicates success.
+			return z.Err()
+		}
+		emitToken(z.Token())
+	}
+
+The low-level API performs fewer allocations and copies, but the contents of
+the []byte values returned by Text, TagName and TagAttr may change on the next
+call to Next. For example, to extract an HTML page's anchor text:
+
+	depth := 0
+	for {
+		tt := z.Next()
+		switch tt {
+		case ErrorToken:
+			return z.Err()
+		case TextToken:
+			if depth > 0 {
+				// emitBytes should copy the []byte it receives,
+				// if it doesn't process it immediately.
+				emitBytes(z.Text())
+			}
+		case StartTagToken, EndTagToken:
+			tn, _ := z.TagName()
+			if len(tn) == 1 && tn[0] == 'a' {
+				if tt == StartTagToken {
+					depth++
+				} else {
+					depth--
+				}
+			}
+		}
+	}
+
+Parsing is done by calling Parse with an io.Reader, which returns the root of
+the parse tree (the document element) as a *Node. It is the caller's
+responsibility to ensure that the Reader provides UTF-8 encoded HTML. For
+example, to process each anchor node in depth-first order:
+
+	doc, err := html.Parse(r)
+	if err != nil {
+		// ...
+	}
+	var f func(*html.Node)
+	f = func(n *html.Node) {
+		if n.Type == html.ElementNode && n.Data == "a" {
+			// Do something with n...
+		}
+		for c := n.FirstChild; c != nil; c = c.NextSibling {
+			f(c)
+		}
+	}
+	f(doc)
+
+The relevant specifications include:
+https://html.spec.whatwg.org/multipage/syntax.html and
+https://html.spec.whatwg.org/multipage/syntax.html#tokenization
+*/
+package html
+
+// The tokenization algorithm implemented by this package is not a line-by-line
+// transliteration of the relatively verbose state-machine in the WHATWG
+// specification. A more direct approach is used instead, where the program
+// counter implies the state, such as whether it is tokenizing a tag or a text
+// node. Specification compliance is verified by checking expected and actual
+// outputs over a test suite rather than aiming for algorithmic fidelity.
+
+// TODO(nigeltao): Does a DOM API belong in this package or a separate one?
+// TODO(nigeltao): How does parsing interact with a JavaScript engine?
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/doctype.go b/Godeps/_workspace/src/golang.org/x/net/html/doctype.go
new file mode 100644
index 00000000..c484e5a9
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/doctype.go
@@ -0,0 +1,156 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package html
+
+import (
+	"strings"
+)
+
+// parseDoctype parses the data from a DoctypeToken into a name,
+// public identifier, and system identifier. It returns a Node whose Type
+// is DoctypeNode, whose Data is the name, and which has attributes
+// named "system" and "public" for the two identifiers if they were present.
+// quirks is whether the document should be parsed in "quirks mode".
+func parseDoctype(s string) (n *Node, quirks bool) {
+	n = &Node{Type: DoctypeNode}
+
+	// Find the name.
+	space := strings.IndexAny(s, whitespace)
+	if space == -1 {
+		space = len(s)
+	}
+	n.Data = s[:space]
+	// The comparison to "html" is case-sensitive.
+	if n.Data != "html" {
+		quirks = true
+	}
+	n.Data = strings.ToLower(n.Data)
+	s = strings.TrimLeft(s[space:], whitespace)
+
+	if len(s) < 6 {
+		// It can't start with "PUBLIC" or "SYSTEM".
+		// Ignore the rest of the string.
+		return n, quirks || s != ""
+	}
+
+	key := strings.ToLower(s[:6])
+	s = s[6:]
+	for key == "public" || key == "system" {
+		s = strings.TrimLeft(s, whitespace)
+		if s == "" {
+			break
+		}
+		quote := s[0]
+		if quote != '"' && quote != '\'' {
+			break
+		}
+		s = s[1:]
+		q := strings.IndexRune(s, rune(quote))
+		var id string
+		if q == -1 {
+			id = s
+			s = ""
+		} else {
+			id = s[:q]
+			s = s[q+1:]
+		}
+		n.Attr = append(n.Attr, Attribute{Key: key, Val: id})
+		if key == "public" {
+			key = "system"
+		} else {
+			key = ""
+		}
+	}
+
+	if key != "" || s != "" {
+		quirks = true
+	} else if len(n.Attr) > 0 {
+		if n.Attr[0].Key == "public" {
+			public := strings.ToLower(n.Attr[0].Val)
+			switch public {
+			case "-//w3o//dtd w3 html strict 3.0//en//", "-/w3d/dtd html 4.0 transitional/en", "html":
+				quirks = true
+			default:
+				for _, q := range quirkyIDs {
+					if strings.HasPrefix(public, q) {
+						quirks = true
+						break
+					}
+				}
+			}
+			// The following two public IDs only cause quirks mode if there is no system ID.
+			if len(n.Attr) == 1 && (strings.HasPrefix(public, "-//w3c//dtd html 4.01 frameset//") ||
+				strings.HasPrefix(public, "-//w3c//dtd html 4.01 transitional//")) {
+				quirks = true
+			}
+		}
+		if lastAttr := n.Attr[len(n.Attr)-1]; lastAttr.Key == "system" &&
+			strings.ToLower(lastAttr.Val) == "http://www.ibm.com/data/dtd/v11/ibmxhtml1-transitional.dtd" {
+			quirks = true
+		}
+	}
+
+	return n, quirks
+}
+
+// quirkyIDs is a list of public doctype identifiers that cause a document
+// to be interpreted in quirks mode. The identifiers should be in lower case.
+var quirkyIDs = []string{
+	"+//silmaril//dtd html pro v0r11 19970101//",
+	"-//advasoft ltd//dtd html 3.0 aswedit + extensions//",
+	"-//as//dtd html 3.0 aswedit + extensions//",
+	"-//ietf//dtd html 2.0 level 1//",
+	"-//ietf//dtd html 2.0 level 2//",
+	"-//ietf//dtd html 2.0 strict level 1//",
+	"-//ietf//dtd html 2.0 strict level 2//",
+	"-//ietf//dtd html 2.0 strict//",
+	"-//ietf//dtd html 2.0//",
+	"-//ietf//dtd html 2.1e//",
+	"-//ietf//dtd html 3.0//",
+	"-//ietf//dtd html 3.2 final//",
+	"-//ietf//dtd html 3.2//",
+	"-//ietf//dtd html 3//",
+	"-//ietf//dtd html level 0//",
+	"-//ietf//dtd html level 1//",
+	"-//ietf//dtd html level 2//",
+	"-//ietf//dtd html level 3//",
+	"-//ietf//dtd html strict level 0//",
+	"-//ietf//dtd html strict level 1//",
+	"-//ietf//dtd html strict level 2//",
+	"-//ietf//dtd html strict level 3//",
+	"-//ietf//dtd html strict//",
+	"-//ietf//dtd html//",
+	"-//metrius//dtd metrius presentational//",
+	"-//microsoft//dtd internet explorer 2.0 html strict//",
+	"-//microsoft//dtd internet explorer 2.0 html//",
+	"-//microsoft//dtd internet explorer 2.0 tables//",
+	"-//microsoft//dtd internet explorer 3.0 html strict//",
+	"-//microsoft//dtd internet explorer 3.0 html//",
+	"-//microsoft//dtd internet explorer 3.0 tables//",
+	"-//netscape comm. corp.//dtd html//",
+	"-//netscape comm. corp.//dtd strict html//",
+	"-//o'reilly and associates//dtd html 2.0//",
+	"-//o'reilly and associates//dtd html extended 1.0//",
+	"-//o'reilly and associates//dtd html extended relaxed 1.0//",
+	"-//softquad software//dtd hotmetal pro 6.0::19990601::extensions to html 4.0//",
+	"-//softquad//dtd hotmetal pro 4.0::19971010::extensions to html 4.0//",
+	"-//spyglass//dtd html 2.0 extended//",
+	"-//sq//dtd html 2.0 hotmetal + extensions//",
+	"-//sun microsystems corp.//dtd hotjava html//",
+	"-//sun microsystems corp.//dtd hotjava strict html//",
+	"-//w3c//dtd html 3 1995-03-24//",
+	"-//w3c//dtd html 3.2 draft//",
+	"-//w3c//dtd html 3.2 final//",
+	"-//w3c//dtd html 3.2//",
+	"-//w3c//dtd html 3.2s draft//",
+	"-//w3c//dtd html 4.0 frameset//",
+	"-//w3c//dtd html 4.0 transitional//",
+	"-//w3c//dtd html experimental 19960712//",
+	"-//w3c//dtd html experimental 970421//",
+	"-//w3c//dtd w3 html//",
+	"-//w3o//dtd w3 html 3.0//",
+	"-//webtechs//dtd mozilla html 2.0//",
+	"-//webtechs//dtd mozilla html//",
+}
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/entity.go b/Godeps/_workspace/src/golang.org/x/net/html/entity.go
new file mode 100644
index 00000000..a50c04c6
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/entity.go
@@ -0,0 +1,2253 @@
+// Copyright 2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package html
+
+// All entities that do not end with ';' are 6 or fewer bytes long.
+const longestEntityWithoutSemicolon = 6
+
+// entity is a map from HTML entity names to their values. The semicolon matters:
+// https://html.spec.whatwg.org/multipage/syntax.html#named-character-references
+// lists both "amp" and "amp;" as two separate entries.
+//
+// Note that the HTML5 list is larger than the HTML4 list at
+// http://www.w3.org/TR/html4/sgml/entities.html
+var entity = map[string]rune{
+	"AElig;":                           '\U000000C6',
+	"AMP;":                             '\U00000026',
+	"Aacute;":                          '\U000000C1',
+	"Abreve;":                          '\U00000102',
+	"Acirc;":                           '\U000000C2',
+	"Acy;":                             '\U00000410',
+	"Afr;":                             '\U0001D504',
+	"Agrave;":                          '\U000000C0',
+	"Alpha;":                           '\U00000391',
+	"Amacr;":                           '\U00000100',
+	"And;":                             '\U00002A53',
+	"Aogon;":                           '\U00000104',
+	"Aopf;":                            '\U0001D538',
+	"ApplyFunction;":                   '\U00002061',
+	"Aring;":                           '\U000000C5',
+	"Ascr;":                            '\U0001D49C',
+	"Assign;":                          '\U00002254',
+	"Atilde;":                          '\U000000C3',
+	"Auml;":                            '\U000000C4',
+	"Backslash;":                       '\U00002216',
+	"Barv;":                            '\U00002AE7',
+	"Barwed;":                          '\U00002306',
+	"Bcy;":                             '\U00000411',
+	"Because;":                         '\U00002235',
+	"Bernoullis;":                      '\U0000212C',
+	"Beta;":                            '\U00000392',
+	"Bfr;":                             '\U0001D505',
+	"Bopf;":                            '\U0001D539',
+	"Breve;":                           '\U000002D8',
+	"Bscr;":                            '\U0000212C',
+	"Bumpeq;":                          '\U0000224E',
+	"CHcy;":                            '\U00000427',
+	"COPY;":                            '\U000000A9',
+	"Cacute;":                          '\U00000106',
+	"Cap;":                             '\U000022D2',
+	"CapitalDifferentialD;":            '\U00002145',
+	"Cayleys;":                         '\U0000212D',
+	"Ccaron;":                          '\U0000010C',
+	"Ccedil;":                          '\U000000C7',
+	"Ccirc;":                           '\U00000108',
+	"Cconint;":                         '\U00002230',
+	"Cdot;":                            '\U0000010A',
+	"Cedilla;":                         '\U000000B8',
+	"CenterDot;":                       '\U000000B7',
+	"Cfr;":                             '\U0000212D',
+	"Chi;":                             '\U000003A7',
+	"CircleDot;":                       '\U00002299',
+	"CircleMinus;":                     '\U00002296',
+	"CirclePlus;":                      '\U00002295',
+	"CircleTimes;":                     '\U00002297',
+	"ClockwiseContourIntegral;":        '\U00002232',
+	"CloseCurlyDoubleQuote;":           '\U0000201D',
+	"CloseCurlyQuote;":                 '\U00002019',
+	"Colon;":                           '\U00002237',
+	"Colone;":                          '\U00002A74',
+	"Congruent;":                       '\U00002261',
+	"Conint;":                          '\U0000222F',
+	"ContourIntegral;":                 '\U0000222E',
+	"Copf;":                            '\U00002102',
+	"Coproduct;":                       '\U00002210',
+	"CounterClockwiseContourIntegral;": '\U00002233',
+	"Cross;":                    '\U00002A2F',
+	"Cscr;":                     '\U0001D49E',
+	"Cup;":                      '\U000022D3',
+	"CupCap;":                   '\U0000224D',
+	"DD;":                       '\U00002145',
+	"DDotrahd;":                 '\U00002911',
+	"DJcy;":                     '\U00000402',
+	"DScy;":                     '\U00000405',
+	"DZcy;":                     '\U0000040F',
+	"Dagger;":                   '\U00002021',
+	"Darr;":                     '\U000021A1',
+	"Dashv;":                    '\U00002AE4',
+	"Dcaron;":                   '\U0000010E',
+	"Dcy;":                      '\U00000414',
+	"Del;":                      '\U00002207',
+	"Delta;":                    '\U00000394',
+	"Dfr;":                      '\U0001D507',
+	"DiacriticalAcute;":         '\U000000B4',
+	"DiacriticalDot;":           '\U000002D9',
+	"DiacriticalDoubleAcute;":   '\U000002DD',
+	"DiacriticalGrave;":         '\U00000060',
+	"DiacriticalTilde;":         '\U000002DC',
+	"Diamond;":                  '\U000022C4',
+	"DifferentialD;":            '\U00002146',
+	"Dopf;":                     '\U0001D53B',
+	"Dot;":                      '\U000000A8',
+	"DotDot;":                   '\U000020DC',
+	"DotEqual;":                 '\U00002250',
+	"DoubleContourIntegral;":    '\U0000222F',
+	"DoubleDot;":                '\U000000A8',
+	"DoubleDownArrow;":          '\U000021D3',
+	"DoubleLeftArrow;":          '\U000021D0',
+	"DoubleLeftRightArrow;":     '\U000021D4',
+	"DoubleLeftTee;":            '\U00002AE4',
+	"DoubleLongLeftArrow;":      '\U000027F8',
+	"DoubleLongLeftRightArrow;": '\U000027FA',
+	"DoubleLongRightArrow;":     '\U000027F9',
+	"DoubleRightArrow;":         '\U000021D2',
+	"DoubleRightTee;":           '\U000022A8',
+	"DoubleUpArrow;":            '\U000021D1',
+	"DoubleUpDownArrow;":        '\U000021D5',
+	"DoubleVerticalBar;":        '\U00002225',
+	"DownArrow;":                '\U00002193',
+	"DownArrowBar;":             '\U00002913',
+	"DownArrowUpArrow;":         '\U000021F5',
+	"DownBreve;":                '\U00000311',
+	"DownLeftRightVector;":      '\U00002950',
+	"DownLeftTeeVector;":        '\U0000295E',
+	"DownLeftVector;":           '\U000021BD',
+	"DownLeftVectorBar;":        '\U00002956',
+	"DownRightTeeVector;":       '\U0000295F',
+	"DownRightVector;":          '\U000021C1',
+	"DownRightVectorBar;":       '\U00002957',
+	"DownTee;":                  '\U000022A4',
+	"DownTeeArrow;":             '\U000021A7',
+	"Downarrow;":                '\U000021D3',
+	"Dscr;":                     '\U0001D49F',
+	"Dstrok;":                   '\U00000110',
+	"ENG;":                      '\U0000014A',
+	"ETH;":                      '\U000000D0',
+	"Eacute;":                   '\U000000C9',
+	"Ecaron;":                   '\U0000011A',
+	"Ecirc;":                    '\U000000CA',
+	"Ecy;":                      '\U0000042D',
+	"Edot;":                     '\U00000116',
+	"Efr;":                      '\U0001D508',
+	"Egrave;":                   '\U000000C8',
+	"Element;":                  '\U00002208',
+	"Emacr;":                    '\U00000112',
+	"EmptySmallSquare;":         '\U000025FB',
+	"EmptyVerySmallSquare;":     '\U000025AB',
+	"Eogon;":                    '\U00000118',
+	"Eopf;":                     '\U0001D53C',
+	"Epsilon;":                  '\U00000395',
+	"Equal;":                    '\U00002A75',
+	"EqualTilde;":               '\U00002242',
+	"Equilibrium;":              '\U000021CC',
+	"Escr;":                     '\U00002130',
+	"Esim;":                     '\U00002A73',
+	"Eta;":                      '\U00000397',
+	"Euml;":                     '\U000000CB',
+	"Exists;":                   '\U00002203',
+	"ExponentialE;":             '\U00002147',
+	"Fcy;":                      '\U00000424',
+	"Ffr;":                      '\U0001D509',
+	"FilledSmallSquare;":        '\U000025FC',
+	"FilledVerySmallSquare;":    '\U000025AA',
+	"Fopf;":                     '\U0001D53D',
+	"ForAll;":                   '\U00002200',
+	"Fouriertrf;":               '\U00002131',
+	"Fscr;":                     '\U00002131',
+	"GJcy;":                     '\U00000403',
+	"GT;":                       '\U0000003E',
+	"Gamma;":                    '\U00000393',
+	"Gammad;":                   '\U000003DC',
+	"Gbreve;":                   '\U0000011E',
+	"Gcedil;":                   '\U00000122',
+	"Gcirc;":                    '\U0000011C',
+	"Gcy;":                      '\U00000413',
+	"Gdot;":                     '\U00000120',
+	"Gfr;":                      '\U0001D50A',
+	"Gg;":                       '\U000022D9',
+	"Gopf;":                     '\U0001D53E',
+	"GreaterEqual;":             '\U00002265',
+	"GreaterEqualLess;":         '\U000022DB',
+	"GreaterFullEqual;":         '\U00002267',
+	"GreaterGreater;":           '\U00002AA2',
+	"GreaterLess;":              '\U00002277',
+	"GreaterSlantEqual;":        '\U00002A7E',
+	"GreaterTilde;":             '\U00002273',
+	"Gscr;":                     '\U0001D4A2',
+	"Gt;":                       '\U0000226B',
+	"HARDcy;":                   '\U0000042A',
+	"Hacek;":                    '\U000002C7',
+	"Hat;":                      '\U0000005E',
+	"Hcirc;":                    '\U00000124',
+	"Hfr;":                      '\U0000210C',
+	"HilbertSpace;":             '\U0000210B',
+	"Hopf;":                     '\U0000210D',
+	"HorizontalLine;":           '\U00002500',
+	"Hscr;":                     '\U0000210B',
+	"Hstrok;":                   '\U00000126',
+	"HumpDownHump;":             '\U0000224E',
+	"HumpEqual;":                '\U0000224F',
+	"IEcy;":                     '\U00000415',
+	"IJlig;":                    '\U00000132',
+	"IOcy;":                     '\U00000401',
+	"Iacute;":                   '\U000000CD',
+	"Icirc;":                    '\U000000CE',
+	"Icy;":                      '\U00000418',
+	"Idot;":                     '\U00000130',
+	"Ifr;":                      '\U00002111',
+	"Igrave;":                   '\U000000CC',
+	"Im;":                       '\U00002111',
+	"Imacr;":                    '\U0000012A',
+	"ImaginaryI;":               '\U00002148',
+	"Implies;":                  '\U000021D2',
+	"Int;":                      '\U0000222C',
+	"Integral;":                 '\U0000222B',
+	"Intersection;":             '\U000022C2',
+	"InvisibleComma;":           '\U00002063',
+	"InvisibleTimes;":           '\U00002062',
+	"Iogon;":                    '\U0000012E',
+	"Iopf;":                     '\U0001D540',
+	"Iota;":                     '\U00000399',
+	"Iscr;":                     '\U00002110',
+	"Itilde;":                   '\U00000128',
+	"Iukcy;":                    '\U00000406',
+	"Iuml;":                     '\U000000CF',
+	"Jcirc;":                    '\U00000134',
+	"Jcy;":                      '\U00000419',
+	"Jfr;":                      '\U0001D50D',
+	"Jopf;":                     '\U0001D541',
+	"Jscr;":                     '\U0001D4A5',
+	"Jsercy;":                   '\U00000408',
+	"Jukcy;":                    '\U00000404',
+	"KHcy;":                     '\U00000425',
+	"KJcy;":                     '\U0000040C',
+	"Kappa;":                    '\U0000039A',
+	"Kcedil;":                   '\U00000136',
+	"Kcy;":                      '\U0000041A',
+	"Kfr;":                      '\U0001D50E',
+	"Kopf;":                     '\U0001D542',
+	"Kscr;":                     '\U0001D4A6',
+	"LJcy;":                     '\U00000409',
+	"LT;":                       '\U0000003C',
+	"Lacute;":                   '\U00000139',
+	"Lambda;":                   '\U0000039B',
+	"Lang;":                     '\U000027EA',
+	"Laplacetrf;":               '\U00002112',
+	"Larr;":                     '\U0000219E',
+	"Lcaron;":                   '\U0000013D',
+	"Lcedil;":                   '\U0000013B',
+	"Lcy;":                      '\U0000041B',
+	"LeftAngleBracket;":         '\U000027E8',
+	"LeftArrow;":                '\U00002190',
+	"LeftArrowBar;":             '\U000021E4',
+	"LeftArrowRightArrow;":      '\U000021C6',
+	"LeftCeiling;":              '\U00002308',
+	"LeftDoubleBracket;":        '\U000027E6',
+	"LeftDownTeeVector;":        '\U00002961',
+	"LeftDownVector;":           '\U000021C3',
+	"LeftDownVectorBar;":        '\U00002959',
+	"LeftFloor;":                '\U0000230A',
+	"LeftRightArrow;":           '\U00002194',
+	"LeftRightVector;":          '\U0000294E',
+	"LeftTee;":                  '\U000022A3',
+	"LeftTeeArrow;":             '\U000021A4',
+	"LeftTeeVector;":            '\U0000295A',
+	"LeftTriangle;":             '\U000022B2',
+	"LeftTriangleBar;":          '\U000029CF',
+	"LeftTriangleEqual;":        '\U000022B4',
+	"LeftUpDownVector;":         '\U00002951',
+	"LeftUpTeeVector;":          '\U00002960',
+	"LeftUpVector;":             '\U000021BF',
+	"LeftUpVectorBar;":          '\U00002958',
+	"LeftVector;":               '\U000021BC',
+	"LeftVectorBar;":            '\U00002952',
+	"Leftarrow;":                '\U000021D0',
+	"Leftrightarrow;":           '\U000021D4',
+	"LessEqualGreater;":         '\U000022DA',
+	"LessFullEqual;":            '\U00002266',
+	"LessGreater;":              '\U00002276',
+	"LessLess;":                 '\U00002AA1',
+	"LessSlantEqual;":           '\U00002A7D',
+	"LessTilde;":                '\U00002272',
+	"Lfr;":                      '\U0001D50F',
+	"Ll;":                       '\U000022D8',
+	"Lleftarrow;":               '\U000021DA',
+	"Lmidot;":                   '\U0000013F',
+	"LongLeftArrow;":            '\U000027F5',
+	"LongLeftRightArrow;":       '\U000027F7',
+	"LongRightArrow;":           '\U000027F6',
+	"Longleftarrow;":            '\U000027F8',
+	"Longleftrightarrow;":       '\U000027FA',
+	"Longrightarrow;":           '\U000027F9',
+	"Lopf;":                     '\U0001D543',
+	"LowerLeftArrow;":           '\U00002199',
+	"LowerRightArrow;":          '\U00002198',
+	"Lscr;":                     '\U00002112',
+	"Lsh;":                      '\U000021B0',
+	"Lstrok;":                   '\U00000141',
+	"Lt;":                       '\U0000226A',
+	"Map;":                      '\U00002905',
+	"Mcy;":                      '\U0000041C',
+	"MediumSpace;":              '\U0000205F',
+	"Mellintrf;":                '\U00002133',
+	"Mfr;":                      '\U0001D510',
+	"MinusPlus;":                '\U00002213',
+	"Mopf;":                     '\U0001D544',
+	"Mscr;":                     '\U00002133',
+	"Mu;":                       '\U0000039C',
+	"NJcy;":                     '\U0000040A',
+	"Nacute;":                   '\U00000143',
+	"Ncaron;":                   '\U00000147',
+	"Ncedil;":                   '\U00000145',
+	"Ncy;":                      '\U0000041D',
+	"NegativeMediumSpace;":      '\U0000200B',
+	"NegativeThickSpace;":       '\U0000200B',
+	"NegativeThinSpace;":        '\U0000200B',
+	"NegativeVeryThinSpace;":    '\U0000200B',
+	"NestedGreaterGreater;":     '\U0000226B',
+	"NestedLessLess;":           '\U0000226A',
+	"NewLine;":                  '\U0000000A',
+	"Nfr;":                      '\U0001D511',
+	"NoBreak;":                  '\U00002060',
+	"NonBreakingSpace;":         '\U000000A0',
+	"Nopf;":                     '\U00002115',
+	"Not;":                      '\U00002AEC',
+	"NotCongruent;":             '\U00002262',
+	"NotCupCap;":                '\U0000226D',
+	"NotDoubleVerticalBar;":     '\U00002226',
+	"NotElement;":               '\U00002209',
+	"NotEqual;":                 '\U00002260',
+	"NotExists;":                '\U00002204',
+	"NotGreater;":               '\U0000226F',
+	"NotGreaterEqual;":          '\U00002271',
+	"NotGreaterLess;":           '\U00002279',
+	"NotGreaterTilde;":          '\U00002275',
+	"NotLeftTriangle;":          '\U000022EA',
+	"NotLeftTriangleEqual;":     '\U000022EC',
+	"NotLess;":                  '\U0000226E',
+	"NotLessEqual;":             '\U00002270',
+	"NotLessGreater;":           '\U00002278',
+	"NotLessTilde;":             '\U00002274',
+	"NotPrecedes;":              '\U00002280',
+	"NotPrecedesSlantEqual;":    '\U000022E0',
+	"NotReverseElement;":        '\U0000220C',
+	"NotRightTriangle;":         '\U000022EB',
+	"NotRightTriangleEqual;":    '\U000022ED',
+	"NotSquareSubsetEqual;":     '\U000022E2',
+	"NotSquareSupersetEqual;":   '\U000022E3',
+	"NotSubsetEqual;":           '\U00002288',
+	"NotSucceeds;":              '\U00002281',
+	"NotSucceedsSlantEqual;":    '\U000022E1',
+	"NotSupersetEqual;":         '\U00002289',
+	"NotTilde;":                 '\U00002241',
+	"NotTildeEqual;":            '\U00002244',
+	"NotTildeFullEqual;":        '\U00002247',
+	"NotTildeTilde;":            '\U00002249',
+	"NotVerticalBar;":           '\U00002224',
+	"Nscr;":                     '\U0001D4A9',
+	"Ntilde;":                   '\U000000D1',
+	"Nu;":                       '\U0000039D',
+	"OElig;":                    '\U00000152',
+	"Oacute;":                   '\U000000D3',
+	"Ocirc;":                    '\U000000D4',
+	"Ocy;":                      '\U0000041E',
+	"Odblac;":                   '\U00000150',
+	"Ofr;":                      '\U0001D512',
+	"Ograve;":                   '\U000000D2',
+	"Omacr;":                    '\U0000014C',
+	"Omega;":                    '\U000003A9',
+	"Omicron;":                  '\U0000039F',
+	"Oopf;":                     '\U0001D546',
+	"OpenCurlyDoubleQuote;":     '\U0000201C',
+	"OpenCurlyQuote;":           '\U00002018',
+	"Or;":                       '\U00002A54',
+	"Oscr;":                     '\U0001D4AA',
+	"Oslash;":                   '\U000000D8',
+	"Otilde;":                   '\U000000D5',
+	"Otimes;":                   '\U00002A37',
+	"Ouml;":                     '\U000000D6',
+	"OverBar;":                  '\U0000203E',
+	"OverBrace;":                '\U000023DE',
+	"OverBracket;":              '\U000023B4',
+	"OverParenthesis;":          '\U000023DC',
+	"PartialD;":                 '\U00002202',
+	"Pcy;":                      '\U0000041F',
+	"Pfr;":                      '\U0001D513',
+	"Phi;":                      '\U000003A6',
+	"Pi;":                       '\U000003A0',
+	"PlusMinus;":                '\U000000B1',
+	"Poincareplane;":            '\U0000210C',
+	"Popf;":                     '\U00002119',
+	"Pr;":                       '\U00002ABB',
+	"Precedes;":                 '\U0000227A',
+	"PrecedesEqual;":            '\U00002AAF',
+	"PrecedesSlantEqual;":       '\U0000227C',
+	"PrecedesTilde;":            '\U0000227E',
+	"Prime;":                    '\U00002033',
+	"Product;":                  '\U0000220F',
+	"Proportion;":               '\U00002237',
+	"Proportional;":             '\U0000221D',
+	"Pscr;":                     '\U0001D4AB',
+	"Psi;":                      '\U000003A8',
+	"QUOT;":                     '\U00000022',
+	"Qfr;":                      '\U0001D514',
+	"Qopf;":                     '\U0000211A',
+	"Qscr;":                     '\U0001D4AC',
+	"RBarr;":                    '\U00002910',
+	"REG;":                      '\U000000AE',
+	"Racute;":                   '\U00000154',
+	"Rang;":                     '\U000027EB',
+	"Rarr;":                     '\U000021A0',
+	"Rarrtl;":                   '\U00002916',
+	"Rcaron;":                   '\U00000158',
+	"Rcedil;":                   '\U00000156',
+	"Rcy;":                      '\U00000420',
+	"Re;":                       '\U0000211C',
+	"ReverseElement;":           '\U0000220B',
+	"ReverseEquilibrium;":       '\U000021CB',
+	"ReverseUpEquilibrium;":     '\U0000296F',
+	"Rfr;":                      '\U0000211C',
+	"Rho;":                      '\U000003A1',
+	"RightAngleBracket;":        '\U000027E9',
+	"RightArrow;":               '\U00002192',
+	"RightArrowBar;":            '\U000021E5',
+	"RightArrowLeftArrow;":      '\U000021C4',
+	"RightCeiling;":             '\U00002309',
+	"RightDoubleBracket;":       '\U000027E7',
+	"RightDownTeeVector;":       '\U0000295D',
+	"RightDownVector;":          '\U000021C2',
+	"RightDownVectorBar;":       '\U00002955',
+	"RightFloor;":               '\U0000230B',
+	"RightTee;":                 '\U000022A2',
+	"RightTeeArrow;":            '\U000021A6',
+	"RightTeeVector;":           '\U0000295B',
+	"RightTriangle;":            '\U000022B3',
+	"RightTriangleBar;":         '\U000029D0',
+	"RightTriangleEqual;":       '\U000022B5',
+	"RightUpDownVector;":        '\U0000294F',
+	"RightUpTeeVector;":         '\U0000295C',
+	"RightUpVector;":            '\U000021BE',
+	"RightUpVectorBar;":         '\U00002954',
+	"RightVector;":              '\U000021C0',
+	"RightVectorBar;":           '\U00002953',
+	"Rightarrow;":               '\U000021D2',
+	"Ropf;":                     '\U0000211D',
+	"RoundImplies;":             '\U00002970',
+	"Rrightarrow;":              '\U000021DB',
+	"Rscr;":                     '\U0000211B',
+	"Rsh;":                      '\U000021B1',
+	"RuleDelayed;":              '\U000029F4',
+	"SHCHcy;":                   '\U00000429',
+	"SHcy;":                     '\U00000428',
+	"SOFTcy;":                   '\U0000042C',
+	"Sacute;":                   '\U0000015A',
+	"Sc;":                       '\U00002ABC',
+	"Scaron;":                   '\U00000160',
+	"Scedil;":                   '\U0000015E',
+	"Scirc;":                    '\U0000015C',
+	"Scy;":                      '\U00000421',
+	"Sfr;":                      '\U0001D516',
+	"ShortDownArrow;":           '\U00002193',
+	"ShortLeftArrow;":           '\U00002190',
+	"ShortRightArrow;":          '\U00002192',
+	"ShortUpArrow;":             '\U00002191',
+	"Sigma;":                    '\U000003A3',
+	"SmallCircle;":              '\U00002218',
+	"Sopf;":                     '\U0001D54A',
+	"Sqrt;":                     '\U0000221A',
+	"Square;":                   '\U000025A1',
+	"SquareIntersection;":       '\U00002293',
+	"SquareSubset;":             '\U0000228F',
+	"SquareSubsetEqual;":        '\U00002291',
+	"SquareSuperset;":           '\U00002290',
+	"SquareSupersetEqual;":      '\U00002292',
+	"SquareUnion;":              '\U00002294',
+	"Sscr;":                     '\U0001D4AE',
+	"Star;":                     '\U000022C6',
+	"Sub;":                      '\U000022D0',
+	"Subset;":                   '\U000022D0',
+	"SubsetEqual;":              '\U00002286',
+	"Succeeds;":                 '\U0000227B',
+	"SucceedsEqual;":            '\U00002AB0',
+	"SucceedsSlantEqual;":       '\U0000227D',
+	"SucceedsTilde;":            '\U0000227F',
+	"SuchThat;":                 '\U0000220B',
+	"Sum;":                      '\U00002211',
+	"Sup;":                      '\U000022D1',
+	"Superset;":                 '\U00002283',
+	"SupersetEqual;":            '\U00002287',
+	"Supset;":                   '\U000022D1',
+	"THORN;":                    '\U000000DE',
+	"TRADE;":                    '\U00002122',
+	"TSHcy;":                    '\U0000040B',
+	"TScy;":                     '\U00000426',
+	"Tab;":                      '\U00000009',
+	"Tau;":                      '\U000003A4',
+	"Tcaron;":                   '\U00000164',
+	"Tcedil;":                   '\U00000162',
+	"Tcy;":                      '\U00000422',
+	"Tfr;":                      '\U0001D517',
+	"Therefore;":                '\U00002234',
+	"Theta;":                    '\U00000398',
+	"ThinSpace;":                '\U00002009',
+	"Tilde;":                    '\U0000223C',
+	"TildeEqual;":               '\U00002243',
+	"TildeFullEqual;":           '\U00002245',
+	"TildeTilde;":               '\U00002248',
+	"Topf;":                     '\U0001D54B',
+	"TripleDot;":                '\U000020DB',
+	"Tscr;":                     '\U0001D4AF',
+	"Tstrok;":                   '\U00000166',
+	"Uacute;":                   '\U000000DA',
+	"Uarr;":                     '\U0000219F',
+	"Uarrocir;":                 '\U00002949',
+	"Ubrcy;":                    '\U0000040E',
+	"Ubreve;":                   '\U0000016C',
+	"Ucirc;":                    '\U000000DB',
+	"Ucy;":                      '\U00000423',
+	"Udblac;":                   '\U00000170',
+	"Ufr;":                      '\U0001D518',
+	"Ugrave;":                   '\U000000D9',
+	"Umacr;":                    '\U0000016A',
+	"UnderBar;":                 '\U0000005F',
+	"UnderBrace;":               '\U000023DF',
+	"UnderBracket;":             '\U000023B5',
+	"UnderParenthesis;":         '\U000023DD',
+	"Union;":                    '\U000022C3',
+	"UnionPlus;":                '\U0000228E',
+	"Uogon;":                    '\U00000172',
+	"Uopf;":                     '\U0001D54C',
+	"UpArrow;":                  '\U00002191',
+	"UpArrowBar;":               '\U00002912',
+	"UpArrowDownArrow;":         '\U000021C5',
+	"UpDownArrow;":              '\U00002195',
+	"UpEquilibrium;":            '\U0000296E',
+	"UpTee;":                    '\U000022A5',
+	"UpTeeArrow;":               '\U000021A5',
+	"Uparrow;":                  '\U000021D1',
+	"Updownarrow;":              '\U000021D5',
+	"UpperLeftArrow;":           '\U00002196',
+	"UpperRightArrow;":          '\U00002197',
+	"Upsi;":                     '\U000003D2',
+	"Upsilon;":                  '\U000003A5',
+	"Uring;":                    '\U0000016E',
+	"Uscr;":                     '\U0001D4B0',
+	"Utilde;":                   '\U00000168',
+	"Uuml;":                     '\U000000DC',
+	"VDash;":                    '\U000022AB',
+	"Vbar;":                     '\U00002AEB',
+	"Vcy;":                      '\U00000412',
+	"Vdash;":                    '\U000022A9',
+	"Vdashl;":                   '\U00002AE6',
+	"Vee;":                      '\U000022C1',
+	"Verbar;":                   '\U00002016',
+	"Vert;":                     '\U00002016',
+	"VerticalBar;":              '\U00002223',
+	"VerticalLine;":             '\U0000007C',
+	"VerticalSeparator;":        '\U00002758',
+	"VerticalTilde;":            '\U00002240',
+	"VeryThinSpace;":            '\U0000200A',
+	"Vfr;":                      '\U0001D519',
+	"Vopf;":                     '\U0001D54D',
+	"Vscr;":                     '\U0001D4B1',
+	"Vvdash;":                   '\U000022AA',
+	"Wcirc;":                    '\U00000174',
+	"Wedge;":                    '\U000022C0',
+	"Wfr;":                      '\U0001D51A',
+	"Wopf;":                     '\U0001D54E',
+	"Wscr;":                     '\U0001D4B2',
+	"Xfr;":                      '\U0001D51B',
+	"Xi;":                       '\U0000039E',
+	"Xopf;":                     '\U0001D54F',
+	"Xscr;":                     '\U0001D4B3',
+	"YAcy;":                     '\U0000042F',
+	"YIcy;":                     '\U00000407',
+	"YUcy;":                     '\U0000042E',
+	"Yacute;":                   '\U000000DD',
+	"Ycirc;":                    '\U00000176',
+	"Ycy;":                      '\U0000042B',
+	"Yfr;":                      '\U0001D51C',
+	"Yopf;":                     '\U0001D550',
+	"Yscr;":                     '\U0001D4B4',
+	"Yuml;":                     '\U00000178',
+	"ZHcy;":                     '\U00000416',
+	"Zacute;":                   '\U00000179',
+	"Zcaron;":                   '\U0000017D',
+	"Zcy;":                      '\U00000417',
+	"Zdot;":                     '\U0000017B',
+	"ZeroWidthSpace;":           '\U0000200B',
+	"Zeta;":                     '\U00000396',
+	"Zfr;":                      '\U00002128',
+	"Zopf;":                     '\U00002124',
+	"Zscr;":                     '\U0001D4B5',
+	"aacute;":                   '\U000000E1',
+	"abreve;":                   '\U00000103',
+	"ac;":                       '\U0000223E',
+	"acd;":                      '\U0000223F',
+	"acirc;":                    '\U000000E2',
+	"acute;":                    '\U000000B4',
+	"acy;":                      '\U00000430',
+	"aelig;":                    '\U000000E6',
+	"af;":                       '\U00002061',
+	"afr;":                      '\U0001D51E',
+	"agrave;":                   '\U000000E0',
+	"alefsym;":                  '\U00002135',
+	"aleph;":                    '\U00002135',
+	"alpha;":                    '\U000003B1',
+	"amacr;":                    '\U00000101',
+	"amalg;":                    '\U00002A3F',
+	"amp;":                      '\U00000026',
+	"and;":                      '\U00002227',
+	"andand;":                   '\U00002A55',
+	"andd;":                     '\U00002A5C',
+	"andslope;":                 '\U00002A58',
+	"andv;":                     '\U00002A5A',
+	"ang;":                      '\U00002220',
+	"ange;":                     '\U000029A4',
+	"angle;":                    '\U00002220',
+	"angmsd;":                   '\U00002221',
+	"angmsdaa;":                 '\U000029A8',
+	"angmsdab;":                 '\U000029A9',
+	"angmsdac;":                 '\U000029AA',
+	"angmsdad;":                 '\U000029AB',
+	"angmsdae;":                 '\U000029AC',
+	"angmsdaf;":                 '\U000029AD',
+	"angmsdag;":                 '\U000029AE',
+	"angmsdah;":                 '\U000029AF',
+	"angrt;":                    '\U0000221F',
+	"angrtvb;":                  '\U000022BE',
+	"angrtvbd;":                 '\U0000299D',
+	"angsph;":                   '\U00002222',
+	"angst;":                    '\U000000C5',
+	"angzarr;":                  '\U0000237C',
+	"aogon;":                    '\U00000105',
+	"aopf;":                     '\U0001D552',
+	"ap;":                       '\U00002248',
+	"apE;":                      '\U00002A70',
+	"apacir;":                   '\U00002A6F',
+	"ape;":                      '\U0000224A',
+	"apid;":                     '\U0000224B',
+	"apos;":                     '\U00000027',
+	"approx;":                   '\U00002248',
+	"approxeq;":                 '\U0000224A',
+	"aring;":                    '\U000000E5',
+	"ascr;":                     '\U0001D4B6',
+	"ast;":                      '\U0000002A',
+	"asymp;":                    '\U00002248',
+	"asympeq;":                  '\U0000224D',
+	"atilde;":                   '\U000000E3',
+	"auml;":                     '\U000000E4',
+	"awconint;":                 '\U00002233',
+	"awint;":                    '\U00002A11',
+	"bNot;":                     '\U00002AED',
+	"backcong;":                 '\U0000224C',
+	"backepsilon;":              '\U000003F6',
+	"backprime;":                '\U00002035',
+	"backsim;":                  '\U0000223D',
+	"backsimeq;":                '\U000022CD',
+	"barvee;":                   '\U000022BD',
+	"barwed;":                   '\U00002305',
+	"barwedge;":                 '\U00002305',
+	"bbrk;":                     '\U000023B5',
+	"bbrktbrk;":                 '\U000023B6',
+	"bcong;":                    '\U0000224C',
+	"bcy;":                      '\U00000431',
+	"bdquo;":                    '\U0000201E',
+	"becaus;":                   '\U00002235',
+	"because;":                  '\U00002235',
+	"bemptyv;":                  '\U000029B0',
+	"bepsi;":                    '\U000003F6',
+	"bernou;":                   '\U0000212C',
+	"beta;":                     '\U000003B2',
+	"beth;":                     '\U00002136',
+	"between;":                  '\U0000226C',
+	"bfr;":                      '\U0001D51F',
+	"bigcap;":                   '\U000022C2',
+	"bigcirc;":                  '\U000025EF',
+	"bigcup;":                   '\U000022C3',
+	"bigodot;":                  '\U00002A00',
+	"bigoplus;":                 '\U00002A01',
+	"bigotimes;":                '\U00002A02',
+	"bigsqcup;":                 '\U00002A06',
+	"bigstar;":                  '\U00002605',
+	"bigtriangledown;":          '\U000025BD',
+	"bigtriangleup;":            '\U000025B3',
+	"biguplus;":                 '\U00002A04',
+	"bigvee;":                   '\U000022C1',
+	"bigwedge;":                 '\U000022C0',
+	"bkarow;":                   '\U0000290D',
+	"blacklozenge;":             '\U000029EB',
+	"blacksquare;":              '\U000025AA',
+	"blacktriangle;":            '\U000025B4',
+	"blacktriangledown;":        '\U000025BE',
+	"blacktriangleleft;":        '\U000025C2',
+	"blacktriangleright;":       '\U000025B8',
+	"blank;":                    '\U00002423',
+	"blk12;":                    '\U00002592',
+	"blk14;":                    '\U00002591',
+	"blk34;":                    '\U00002593',
+	"block;":                    '\U00002588',
+	"bnot;":                     '\U00002310',
+	"bopf;":                     '\U0001D553',
+	"bot;":                      '\U000022A5',
+	"bottom;":                   '\U000022A5',
+	"bowtie;":                   '\U000022C8',
+	"boxDL;":                    '\U00002557',
+	"boxDR;":                    '\U00002554',
+	"boxDl;":                    '\U00002556',
+	"boxDr;":                    '\U00002553',
+	"boxH;":                     '\U00002550',
+	"boxHD;":                    '\U00002566',
+	"boxHU;":                    '\U00002569',
+	"boxHd;":                    '\U00002564',
+	"boxHu;":                    '\U00002567',
+	"boxUL;":                    '\U0000255D',
+	"boxUR;":                    '\U0000255A',
+	"boxUl;":                    '\U0000255C',
+	"boxUr;":                    '\U00002559',
+	"boxV;":                     '\U00002551',
+	"boxVH;":                    '\U0000256C',
+	"boxVL;":                    '\U00002563',
+	"boxVR;":                    '\U00002560',
+	"boxVh;":                    '\U0000256B',
+	"boxVl;":                    '\U00002562',
+	"boxVr;":                    '\U0000255F',
+	"boxbox;":                   '\U000029C9',
+	"boxdL;":                    '\U00002555',
+	"boxdR;":                    '\U00002552',
+	"boxdl;":                    '\U00002510',
+	"boxdr;":                    '\U0000250C',
+	"boxh;":                     '\U00002500',
+	"boxhD;":                    '\U00002565',
+	"boxhU;":                    '\U00002568',
+	"boxhd;":                    '\U0000252C',
+	"boxhu;":                    '\U00002534',
+	"boxminus;":                 '\U0000229F',
+	"boxplus;":                  '\U0000229E',
+	"boxtimes;":                 '\U000022A0',
+	"boxuL;":                    '\U0000255B',
+	"boxuR;":                    '\U00002558',
+	"boxul;":                    '\U00002518',
+	"boxur;":                    '\U00002514',
+	"boxv;":                     '\U00002502',
+	"boxvH;":                    '\U0000256A',
+	"boxvL;":                    '\U00002561',
+	"boxvR;":                    '\U0000255E',
+	"boxvh;":                    '\U0000253C',
+	"boxvl;":                    '\U00002524',
+	"boxvr;":                    '\U0000251C',
+	"bprime;":                   '\U00002035',
+	"breve;":                    '\U000002D8',
+	"brvbar;":                   '\U000000A6',
+	"bscr;":                     '\U0001D4B7',
+	"bsemi;":                    '\U0000204F',
+	"bsim;":                     '\U0000223D',
+	"bsime;":                    '\U000022CD',
+	"bsol;":                     '\U0000005C',
+	"bsolb;":                    '\U000029C5',
+	"bsolhsub;":                 '\U000027C8',
+	"bull;":                     '\U00002022',
+	"bullet;":                   '\U00002022',
+	"bump;":                     '\U0000224E',
+	"bumpE;":                    '\U00002AAE',
+	"bumpe;":                    '\U0000224F',
+	"bumpeq;":                   '\U0000224F',
+	"cacute;":                   '\U00000107',
+	"cap;":                      '\U00002229',
+	"capand;":                   '\U00002A44',
+	"capbrcup;":                 '\U00002A49',
+	"capcap;":                   '\U00002A4B',
+	"capcup;":                   '\U00002A47',
+	"capdot;":                   '\U00002A40',
+	"caret;":                    '\U00002041',
+	"caron;":                    '\U000002C7',
+	"ccaps;":                    '\U00002A4D',
+	"ccaron;":                   '\U0000010D',
+	"ccedil;":                   '\U000000E7',
+	"ccirc;":                    '\U00000109',
+	"ccups;":                    '\U00002A4C',
+	"ccupssm;":                  '\U00002A50',
+	"cdot;":                     '\U0000010B',
+	"cedil;":                    '\U000000B8',
+	"cemptyv;":                  '\U000029B2',
+	"cent;":                     '\U000000A2',
+	"centerdot;":                '\U000000B7',
+	"cfr;":                      '\U0001D520',
+	"chcy;":                     '\U00000447',
+	"check;":                    '\U00002713',
+	"checkmark;":                '\U00002713',
+	"chi;":                      '\U000003C7',
+	"cir;":                      '\U000025CB',
+	"cirE;":                     '\U000029C3',
+	"circ;":                     '\U000002C6',
+	"circeq;":                   '\U00002257',
+	"circlearrowleft;":          '\U000021BA',
+	"circlearrowright;":         '\U000021BB',
+	"circledR;":                 '\U000000AE',
+	"circledS;":                 '\U000024C8',
+	"circledast;":               '\U0000229B',
+	"circledcirc;":              '\U0000229A',
+	"circleddash;":              '\U0000229D',
+	"cire;":                     '\U00002257',
+	"cirfnint;":                 '\U00002A10',
+	"cirmid;":                   '\U00002AEF',
+	"cirscir;":                  '\U000029C2',
+	"clubs;":                    '\U00002663',
+	"clubsuit;":                 '\U00002663',
+	"colon;":                    '\U0000003A',
+	"colone;":                   '\U00002254',
+	"coloneq;":                  '\U00002254',
+	"comma;":                    '\U0000002C',
+	"commat;":                   '\U00000040',
+	"comp;":                     '\U00002201',
+	"compfn;":                   '\U00002218',
+	"complement;":               '\U00002201',
+	"complexes;":                '\U00002102',
+	"cong;":                     '\U00002245',
+	"congdot;":                  '\U00002A6D',
+	"conint;":                   '\U0000222E',
+	"copf;":                     '\U0001D554',
+	"coprod;":                   '\U00002210',
+	"copy;":                     '\U000000A9',
+	"copysr;":                   '\U00002117',
+	"crarr;":                    '\U000021B5',
+	"cross;":                    '\U00002717',
+	"cscr;":                     '\U0001D4B8',
+	"csub;":                     '\U00002ACF',
+	"csube;":                    '\U00002AD1',
+	"csup;":                     '\U00002AD0',
+	"csupe;":                    '\U00002AD2',
+	"ctdot;":                    '\U000022EF',
+	"cudarrl;":                  '\U00002938',
+	"cudarrr;":                  '\U00002935',
+	"cuepr;":                    '\U000022DE',
+	"cuesc;":                    '\U000022DF',
+	"cularr;":                   '\U000021B6',
+	"cularrp;":                  '\U0000293D',
+	"cup;":                      '\U0000222A',
+	"cupbrcap;":                 '\U00002A48',
+	"cupcap;":                   '\U00002A46',
+	"cupcup;":                   '\U00002A4A',
+	"cupdot;":                   '\U0000228D',
+	"cupor;":                    '\U00002A45',
+	"curarr;":                   '\U000021B7',
+	"curarrm;":                  '\U0000293C',
+	"curlyeqprec;":              '\U000022DE',
+	"curlyeqsucc;":              '\U000022DF',
+	"curlyvee;":                 '\U000022CE',
+	"curlywedge;":               '\U000022CF',
+	"curren;":                   '\U000000A4',
+	"curvearrowleft;":           '\U000021B6',
+	"curvearrowright;":          '\U000021B7',
+	"cuvee;":                    '\U000022CE',
+	"cuwed;":                    '\U000022CF',
+	"cwconint;":                 '\U00002232',
+	"cwint;":                    '\U00002231',
+	"cylcty;":                   '\U0000232D',
+	"dArr;":                     '\U000021D3',
+	"dHar;":                     '\U00002965',
+	"dagger;":                   '\U00002020',
+	"daleth;":                   '\U00002138',
+	"darr;":                     '\U00002193',
+	"dash;":                     '\U00002010',
+	"dashv;":                    '\U000022A3',
+	"dbkarow;":                  '\U0000290F',
+	"dblac;":                    '\U000002DD',
+	"dcaron;":                   '\U0000010F',
+	"dcy;":                      '\U00000434',
+	"dd;":                       '\U00002146',
+	"ddagger;":                  '\U00002021',
+	"ddarr;":                    '\U000021CA',
+	"ddotseq;":                  '\U00002A77',
+	"deg;":                      '\U000000B0',
+	"delta;":                    '\U000003B4',
+	"demptyv;":                  '\U000029B1',
+	"dfisht;":                   '\U0000297F',
+	"dfr;":                      '\U0001D521',
+	"dharl;":                    '\U000021C3',
+	"dharr;":                    '\U000021C2',
+	"diam;":                     '\U000022C4',
+	"diamond;":                  '\U000022C4',
+	"diamondsuit;":              '\U00002666',
+	"diams;":                    '\U00002666',
+	"die;":                      '\U000000A8',
+	"digamma;":                  '\U000003DD',
+	"disin;":                    '\U000022F2',
+	"div;":                      '\U000000F7',
+	"divide;":                   '\U000000F7',
+	"divideontimes;":            '\U000022C7',
+	"divonx;":                   '\U000022C7',
+	"djcy;":                     '\U00000452',
+	"dlcorn;":                   '\U0000231E',
+	"dlcrop;":                   '\U0000230D',
+	"dollar;":                   '\U00000024',
+	"dopf;":                     '\U0001D555',
+	"dot;":                      '\U000002D9',
+	"doteq;":                    '\U00002250',
+	"doteqdot;":                 '\U00002251',
+	"dotminus;":                 '\U00002238',
+	"dotplus;":                  '\U00002214',
+	"dotsquare;":                '\U000022A1',
+	"doublebarwedge;":           '\U00002306',
+	"downarrow;":                '\U00002193',
+	"downdownarrows;":           '\U000021CA',
+	"downharpoonleft;":          '\U000021C3',
+	"downharpoonright;":         '\U000021C2',
+	"drbkarow;":                 '\U00002910',
+	"drcorn;":                   '\U0000231F',
+	"drcrop;":                   '\U0000230C',
+	"dscr;":                     '\U0001D4B9',
+	"dscy;":                     '\U00000455',
+	"dsol;":                     '\U000029F6',
+	"dstrok;":                   '\U00000111',
+	"dtdot;":                    '\U000022F1',
+	"dtri;":                     '\U000025BF',
+	"dtrif;":                    '\U000025BE',
+	"duarr;":                    '\U000021F5',
+	"duhar;":                    '\U0000296F',
+	"dwangle;":                  '\U000029A6',
+	"dzcy;":                     '\U0000045F',
+	"dzigrarr;":                 '\U000027FF',
+	"eDDot;":                    '\U00002A77',
+	"eDot;":                     '\U00002251',
+	"eacute;":                   '\U000000E9',
+	"easter;":                   '\U00002A6E',
+	"ecaron;":                   '\U0000011B',
+	"ecir;":                     '\U00002256',
+	"ecirc;":                    '\U000000EA',
+	"ecolon;":                   '\U00002255',
+	"ecy;":                      '\U0000044D',
+	"edot;":                     '\U00000117',
+	"ee;":                       '\U00002147',
+	"efDot;":                    '\U00002252',
+	"efr;":                      '\U0001D522',
+	"eg;":                       '\U00002A9A',
+	"egrave;":                   '\U000000E8',
+	"egs;":                      '\U00002A96',
+	"egsdot;":                   '\U00002A98',
+	"el;":                       '\U00002A99',
+	"elinters;":                 '\U000023E7',
+	"ell;":                      '\U00002113',
+	"els;":                      '\U00002A95',
+	"elsdot;":                   '\U00002A97',
+	"emacr;":                    '\U00000113',
+	"empty;":                    '\U00002205',
+	"emptyset;":                 '\U00002205',
+	"emptyv;":                   '\U00002205',
+	"emsp;":                     '\U00002003',
+	"emsp13;":                   '\U00002004',
+	"emsp14;":                   '\U00002005',
+	"eng;":                      '\U0000014B',
+	"ensp;":                     '\U00002002',
+	"eogon;":                    '\U00000119',
+	"eopf;":                     '\U0001D556',
+	"epar;":                     '\U000022D5',
+	"eparsl;":                   '\U000029E3',
+	"eplus;":                    '\U00002A71',
+	"epsi;":                     '\U000003B5',
+	"epsilon;":                  '\U000003B5',
+	"epsiv;":                    '\U000003F5',
+	"eqcirc;":                   '\U00002256',
+	"eqcolon;":                  '\U00002255',
+	"eqsim;":                    '\U00002242',
+	"eqslantgtr;":               '\U00002A96',
+	"eqslantless;":              '\U00002A95',
+	"equals;":                   '\U0000003D',
+	"equest;":                   '\U0000225F',
+	"equiv;":                    '\U00002261',
+	"equivDD;":                  '\U00002A78',
+	"eqvparsl;":                 '\U000029E5',
+	"erDot;":                    '\U00002253',
+	"erarr;":                    '\U00002971',
+	"escr;":                     '\U0000212F',
+	"esdot;":                    '\U00002250',
+	"esim;":                     '\U00002242',
+	"eta;":                      '\U000003B7',
+	"eth;":                      '\U000000F0',
+	"euml;":                     '\U000000EB',
+	"euro;":                     '\U000020AC',
+	"excl;":                     '\U00000021',
+	"exist;":                    '\U00002203',
+	"expectation;":              '\U00002130',
+	"exponentiale;":             '\U00002147',
+	"fallingdotseq;":            '\U00002252',
+	"fcy;":                      '\U00000444',
+	"female;":                   '\U00002640',
+	"ffilig;":                   '\U0000FB03',
+	"fflig;":                    '\U0000FB00',
+	"ffllig;":                   '\U0000FB04',
+	"ffr;":                      '\U0001D523',
+	"filig;":                    '\U0000FB01',
+	"flat;":                     '\U0000266D',
+	"fllig;":                    '\U0000FB02',
+	"fltns;":                    '\U000025B1',
+	"fnof;":                     '\U00000192',
+	"fopf;":                     '\U0001D557',
+	"forall;":                   '\U00002200',
+	"fork;":                     '\U000022D4',
+	"forkv;":                    '\U00002AD9',
+	"fpartint;":                 '\U00002A0D',
+	"frac12;":                   '\U000000BD',
+	"frac13;":                   '\U00002153',
+	"frac14;":                   '\U000000BC',
+	"frac15;":                   '\U00002155',
+	"frac16;":                   '\U00002159',
+	"frac18;":                   '\U0000215B',
+	"frac23;":                   '\U00002154',
+	"frac25;":                   '\U00002156',
+	"frac34;":                   '\U000000BE',
+	"frac35;":                   '\U00002157',
+	"frac38;":                   '\U0000215C',
+	"frac45;":                   '\U00002158',
+	"frac56;":                   '\U0000215A',
+	"frac58;":                   '\U0000215D',
+	"frac78;":                   '\U0000215E',
+	"frasl;":                    '\U00002044',
+	"frown;":                    '\U00002322',
+	"fscr;":                     '\U0001D4BB',
+	"gE;":                       '\U00002267',
+	"gEl;":                      '\U00002A8C',
+	"gacute;":                   '\U000001F5',
+	"gamma;":                    '\U000003B3',
+	"gammad;":                   '\U000003DD',
+	"gap;":                      '\U00002A86',
+	"gbreve;":                   '\U0000011F',
+	"gcirc;":                    '\U0000011D',
+	"gcy;":                      '\U00000433',
+	"gdot;":                     '\U00000121',
+	"ge;":                       '\U00002265',
+	"gel;":                      '\U000022DB',
+	"geq;":                      '\U00002265',
+	"geqq;":                     '\U00002267',
+	"geqslant;":                 '\U00002A7E',
+	"ges;":                      '\U00002A7E',
+	"gescc;":                    '\U00002AA9',
+	"gesdot;":                   '\U00002A80',
+	"gesdoto;":                  '\U00002A82',
+	"gesdotol;":                 '\U00002A84',
+	"gesles;":                   '\U00002A94',
+	"gfr;":                      '\U0001D524',
+	"gg;":                       '\U0000226B',
+	"ggg;":                      '\U000022D9',
+	"gimel;":                    '\U00002137',
+	"gjcy;":                     '\U00000453',
+	"gl;":                       '\U00002277',
+	"glE;":                      '\U00002A92',
+	"gla;":                      '\U00002AA5',
+	"glj;":                      '\U00002AA4',
+	"gnE;":                      '\U00002269',
+	"gnap;":                     '\U00002A8A',
+	"gnapprox;":                 '\U00002A8A',
+	"gne;":                      '\U00002A88',
+	"gneq;":                     '\U00002A88',
+	"gneqq;":                    '\U00002269',
+	"gnsim;":                    '\U000022E7',
+	"gopf;":                     '\U0001D558',
+	"grave;":                    '\U00000060',
+	"gscr;":                     '\U0000210A',
+	"gsim;":                     '\U00002273',
+	"gsime;":                    '\U00002A8E',
+	"gsiml;":                    '\U00002A90',
+	"gt;":                       '\U0000003E',
+	"gtcc;":                     '\U00002AA7',
+	"gtcir;":                    '\U00002A7A',
+	"gtdot;":                    '\U000022D7',
+	"gtlPar;":                   '\U00002995',
+	"gtquest;":                  '\U00002A7C',
+	"gtrapprox;":                '\U00002A86',
+	"gtrarr;":                   '\U00002978',
+	"gtrdot;":                   '\U000022D7',
+	"gtreqless;":                '\U000022DB',
+	"gtreqqless;":               '\U00002A8C',
+	"gtrless;":                  '\U00002277',
+	"gtrsim;":                   '\U00002273',
+	"hArr;":                     '\U000021D4',
+	"hairsp;":                   '\U0000200A',
+	"half;":                     '\U000000BD',
+	"hamilt;":                   '\U0000210B',
+	"hardcy;":                   '\U0000044A',
+	"harr;":                     '\U00002194',
+	"harrcir;":                  '\U00002948',
+	"harrw;":                    '\U000021AD',
+	"hbar;":                     '\U0000210F',
+	"hcirc;":                    '\U00000125',
+	"hearts;":                   '\U00002665',
+	"heartsuit;":                '\U00002665',
+	"hellip;":                   '\U00002026',
+	"hercon;":                   '\U000022B9',
+	"hfr;":                      '\U0001D525',
+	"hksearow;":                 '\U00002925',
+	"hkswarow;":                 '\U00002926',
+	"hoarr;":                    '\U000021FF',
+	"homtht;":                   '\U0000223B',
+	"hookleftarrow;":            '\U000021A9',
+	"hookrightarrow;":           '\U000021AA',
+	"hopf;":                     '\U0001D559',
+	"horbar;":                   '\U00002015',
+	"hscr;":                     '\U0001D4BD',
+	"hslash;":                   '\U0000210F',
+	"hstrok;":                   '\U00000127',
+	"hybull;":                   '\U00002043',
+	"hyphen;":                   '\U00002010',
+	"iacute;":                   '\U000000ED',
+	"ic;":                       '\U00002063',
+	"icirc;":                    '\U000000EE',
+	"icy;":                      '\U00000438',
+	"iecy;":                     '\U00000435',
+	"iexcl;":                    '\U000000A1',
+	"iff;":                      '\U000021D4',
+	"ifr;":                      '\U0001D526',
+	"igrave;":                   '\U000000EC',
+	"ii;":                       '\U00002148',
+	"iiiint;":                   '\U00002A0C',
+	"iiint;":                    '\U0000222D',
+	"iinfin;":                   '\U000029DC',
+	"iiota;":                    '\U00002129',
+	"ijlig;":                    '\U00000133',
+	"imacr;":                    '\U0000012B',
+	"image;":                    '\U00002111',
+	"imagline;":                 '\U00002110',
+	"imagpart;":                 '\U00002111',
+	"imath;":                    '\U00000131',
+	"imof;":                     '\U000022B7',
+	"imped;":                    '\U000001B5',
+	"in;":                       '\U00002208',
+	"incare;":                   '\U00002105',
+	"infin;":                    '\U0000221E',
+	"infintie;":                 '\U000029DD',
+	"inodot;":                   '\U00000131',
+	"int;":                      '\U0000222B',
+	"intcal;":                   '\U000022BA',
+	"integers;":                 '\U00002124',
+	"intercal;":                 '\U000022BA',
+	"intlarhk;":                 '\U00002A17',
+	"intprod;":                  '\U00002A3C',
+	"iocy;":                     '\U00000451',
+	"iogon;":                    '\U0000012F',
+	"iopf;":                     '\U0001D55A',
+	"iota;":                     '\U000003B9',
+	"iprod;":                    '\U00002A3C',
+	"iquest;":                   '\U000000BF',
+	"iscr;":                     '\U0001D4BE',
+	"isin;":                     '\U00002208',
+	"isinE;":                    '\U000022F9',
+	"isindot;":                  '\U000022F5',
+	"isins;":                    '\U000022F4',
+	"isinsv;":                   '\U000022F3',
+	"isinv;":                    '\U00002208',
+	"it;":                       '\U00002062',
+	"itilde;":                   '\U00000129',
+	"iukcy;":                    '\U00000456',
+	"iuml;":                     '\U000000EF',
+	"jcirc;":                    '\U00000135',
+	"jcy;":                      '\U00000439',
+	"jfr;":                      '\U0001D527',
+	"jmath;":                    '\U00000237',
+	"jopf;":                     '\U0001D55B',
+	"jscr;":                     '\U0001D4BF',
+	"jsercy;":                   '\U00000458',
+	"jukcy;":                    '\U00000454',
+	"kappa;":                    '\U000003BA',
+	"kappav;":                   '\U000003F0',
+	"kcedil;":                   '\U00000137',
+	"kcy;":                      '\U0000043A',
+	"kfr;":                      '\U0001D528',
+	"kgreen;":                   '\U00000138',
+	"khcy;":                     '\U00000445',
+	"kjcy;":                     '\U0000045C',
+	"kopf;":                     '\U0001D55C',
+	"kscr;":                     '\U0001D4C0',
+	"lAarr;":                    '\U000021DA',
+	"lArr;":                     '\U000021D0',
+	"lAtail;":                   '\U0000291B',
+	"lBarr;":                    '\U0000290E',
+	"lE;":                       '\U00002266',
+	"lEg;":                      '\U00002A8B',
+	"lHar;":                     '\U00002962',
+	"lacute;":                   '\U0000013A',
+	"laemptyv;":                 '\U000029B4',
+	"lagran;":                   '\U00002112',
+	"lambda;":                   '\U000003BB',
+	"lang;":                     '\U000027E8',
+	"langd;":                    '\U00002991',
+	"langle;":                   '\U000027E8',
+	"lap;":                      '\U00002A85',
+	"laquo;":                    '\U000000AB',
+	"larr;":                     '\U00002190',
+	"larrb;":                    '\U000021E4',
+	"larrbfs;":                  '\U0000291F',
+	"larrfs;":                   '\U0000291D',
+	"larrhk;":                   '\U000021A9',
+	"larrlp;":                   '\U000021AB',
+	"larrpl;":                   '\U00002939',
+	"larrsim;":                  '\U00002973',
+	"larrtl;":                   '\U000021A2',
+	"lat;":                      '\U00002AAB',
+	"latail;":                   '\U00002919',
+	"late;":                     '\U00002AAD',
+	"lbarr;":                    '\U0000290C',
+	"lbbrk;":                    '\U00002772',
+	"lbrace;":                   '\U0000007B',
+	"lbrack;":                   '\U0000005B',
+	"lbrke;":                    '\U0000298B',
+	"lbrksld;":                  '\U0000298F',
+	"lbrkslu;":                  '\U0000298D',
+	"lcaron;":                   '\U0000013E',
+	"lcedil;":                   '\U0000013C',
+	"lceil;":                    '\U00002308',
+	"lcub;":                     '\U0000007B',
+	"lcy;":                      '\U0000043B',
+	"ldca;":                     '\U00002936',
+	"ldquo;":                    '\U0000201C',
+	"ldquor;":                   '\U0000201E',
+	"ldrdhar;":                  '\U00002967',
+	"ldrushar;":                 '\U0000294B',
+	"ldsh;":                     '\U000021B2',
+	"le;":                       '\U00002264',
+	"leftarrow;":                '\U00002190',
+	"leftarrowtail;":            '\U000021A2',
+	"leftharpoondown;":          '\U000021BD',
+	"leftharpoonup;":            '\U000021BC',
+	"leftleftarrows;":           '\U000021C7',
+	"leftrightarrow;":           '\U00002194',
+	"leftrightarrows;":          '\U000021C6',
+	"leftrightharpoons;":        '\U000021CB',
+	"leftrightsquigarrow;":      '\U000021AD',
+	"leftthreetimes;":           '\U000022CB',
+	"leg;":                      '\U000022DA',
+	"leq;":                      '\U00002264',
+	"leqq;":                     '\U00002266',
+	"leqslant;":                 '\U00002A7D',
+	"les;":                      '\U00002A7D',
+	"lescc;":                    '\U00002AA8',
+	"lesdot;":                   '\U00002A7F',
+	"lesdoto;":                  '\U00002A81',
+	"lesdotor;":                 '\U00002A83',
+	"lesges;":                   '\U00002A93',
+	"lessapprox;":               '\U00002A85',
+	"lessdot;":                  '\U000022D6',
+	"lesseqgtr;":                '\U000022DA',
+	"lesseqqgtr;":               '\U00002A8B',
+	"lessgtr;":                  '\U00002276',
+	"lesssim;":                  '\U00002272',
+	"lfisht;":                   '\U0000297C',
+	"lfloor;":                   '\U0000230A',
+	"lfr;":                      '\U0001D529',
+	"lg;":                       '\U00002276',
+	"lgE;":                      '\U00002A91',
+	"lhard;":                    '\U000021BD',
+	"lharu;":                    '\U000021BC',
+	"lharul;":                   '\U0000296A',
+	"lhblk;":                    '\U00002584',
+	"ljcy;":                     '\U00000459',
+	"ll;":                       '\U0000226A',
+	"llarr;":                    '\U000021C7',
+	"llcorner;":                 '\U0000231E',
+	"llhard;":                   '\U0000296B',
+	"lltri;":                    '\U000025FA',
+	"lmidot;":                   '\U00000140',
+	"lmoust;":                   '\U000023B0',
+	"lmoustache;":               '\U000023B0',
+	"lnE;":                      '\U00002268',
+	"lnap;":                     '\U00002A89',
+	"lnapprox;":                 '\U00002A89',
+	"lne;":                      '\U00002A87',
+	"lneq;":                     '\U00002A87',
+	"lneqq;":                    '\U00002268',
+	"lnsim;":                    '\U000022E6',
+	"loang;":                    '\U000027EC',
+	"loarr;":                    '\U000021FD',
+	"lobrk;":                    '\U000027E6',
+	"longleftarrow;":            '\U000027F5',
+	"longleftrightarrow;":       '\U000027F7',
+	"longmapsto;":               '\U000027FC',
+	"longrightarrow;":           '\U000027F6',
+	"looparrowleft;":            '\U000021AB',
+	"looparrowright;":           '\U000021AC',
+	"lopar;":                    '\U00002985',
+	"lopf;":                     '\U0001D55D',
+	"loplus;":                   '\U00002A2D',
+	"lotimes;":                  '\U00002A34',
+	"lowast;":                   '\U00002217',
+	"lowbar;":                   '\U0000005F',
+	"loz;":                      '\U000025CA',
+	"lozenge;":                  '\U000025CA',
+	"lozf;":                     '\U000029EB',
+	"lpar;":                     '\U00000028',
+	"lparlt;":                   '\U00002993',
+	"lrarr;":                    '\U000021C6',
+	"lrcorner;":                 '\U0000231F',
+	"lrhar;":                    '\U000021CB',
+	"lrhard;":                   '\U0000296D',
+	"lrm;":                      '\U0000200E',
+	"lrtri;":                    '\U000022BF',
+	"lsaquo;":                   '\U00002039',
+	"lscr;":                     '\U0001D4C1',
+	"lsh;":                      '\U000021B0',
+	"lsim;":                     '\U00002272',
+	"lsime;":                    '\U00002A8D',
+	"lsimg;":                    '\U00002A8F',
+	"lsqb;":                     '\U0000005B',
+	"lsquo;":                    '\U00002018',
+	"lsquor;":                   '\U0000201A',
+	"lstrok;":                   '\U00000142',
+	"lt;":                       '\U0000003C',
+	"ltcc;":                     '\U00002AA6',
+	"ltcir;":                    '\U00002A79',
+	"ltdot;":                    '\U000022D6',
+	"lthree;":                   '\U000022CB',
+	"ltimes;":                   '\U000022C9',
+	"ltlarr;":                   '\U00002976',
+	"ltquest;":                  '\U00002A7B',
+	"ltrPar;":                   '\U00002996',
+	"ltri;":                     '\U000025C3',
+	"ltrie;":                    '\U000022B4',
+	"ltrif;":                    '\U000025C2',
+	"lurdshar;":                 '\U0000294A',
+	"luruhar;":                  '\U00002966',
+	"mDDot;":                    '\U0000223A',
+	"macr;":                     '\U000000AF',
+	"male;":                     '\U00002642',
+	"malt;":                     '\U00002720',
+	"maltese;":                  '\U00002720',
+	"map;":                      '\U000021A6',
+	"mapsto;":                   '\U000021A6',
+	"mapstodown;":               '\U000021A7',
+	"mapstoleft;":               '\U000021A4',
+	"mapstoup;":                 '\U000021A5',
+	"marker;":                   '\U000025AE',
+	"mcomma;":                   '\U00002A29',
+	"mcy;":                      '\U0000043C',
+	"mdash;":                    '\U00002014',
+	"measuredangle;":            '\U00002221',
+	"mfr;":                      '\U0001D52A',
+	"mho;":                      '\U00002127',
+	"micro;":                    '\U000000B5',
+	"mid;":                      '\U00002223',
+	"midast;":                   '\U0000002A',
+	"midcir;":                   '\U00002AF0',
+	"middot;":                   '\U000000B7',
+	"minus;":                    '\U00002212',
+	"minusb;":                   '\U0000229F',
+	"minusd;":                   '\U00002238',
+	"minusdu;":                  '\U00002A2A',
+	"mlcp;":                     '\U00002ADB',
+	"mldr;":                     '\U00002026',
+	"mnplus;":                   '\U00002213',
+	"models;":                   '\U000022A7',
+	"mopf;":                     '\U0001D55E',
+	"mp;":                       '\U00002213',
+	"mscr;":                     '\U0001D4C2',
+	"mstpos;":                   '\U0000223E',
+	"mu;":                       '\U000003BC',
+	"multimap;":                 '\U000022B8',
+	"mumap;":                    '\U000022B8',
+	"nLeftarrow;":               '\U000021CD',
+	"nLeftrightarrow;":          '\U000021CE',
+	"nRightarrow;":              '\U000021CF',
+	"nVDash;":                   '\U000022AF',
+	"nVdash;":                   '\U000022AE',
+	"nabla;":                    '\U00002207',
+	"nacute;":                   '\U00000144',
+	"nap;":                      '\U00002249',
+	"napos;":                    '\U00000149',
+	"napprox;":                  '\U00002249',
+	"natur;":                    '\U0000266E',
+	"natural;":                  '\U0000266E',
+	"naturals;":                 '\U00002115',
+	"nbsp;":                     '\U000000A0',
+	"ncap;":                     '\U00002A43',
+	"ncaron;":                   '\U00000148',
+	"ncedil;":                   '\U00000146',
+	"ncong;":                    '\U00002247',
+	"ncup;":                     '\U00002A42',
+	"ncy;":                      '\U0000043D',
+	"ndash;":                    '\U00002013',
+	"ne;":                       '\U00002260',
+	"neArr;":                    '\U000021D7',
+	"nearhk;":                   '\U00002924',
+	"nearr;":                    '\U00002197',
+	"nearrow;":                  '\U00002197',
+	"nequiv;":                   '\U00002262',
+	"nesear;":                   '\U00002928',
+	"nexist;":                   '\U00002204',
+	"nexists;":                  '\U00002204',
+	"nfr;":                      '\U0001D52B',
+	"nge;":                      '\U00002271',
+	"ngeq;":                     '\U00002271',
+	"ngsim;":                    '\U00002275',
+	"ngt;":                      '\U0000226F',
+	"ngtr;":                     '\U0000226F',
+	"nhArr;":                    '\U000021CE',
+	"nharr;":                    '\U000021AE',
+	"nhpar;":                    '\U00002AF2',
+	"ni;":                       '\U0000220B',
+	"nis;":                      '\U000022FC',
+	"nisd;":                     '\U000022FA',
+	"niv;":                      '\U0000220B',
+	"njcy;":                     '\U0000045A',
+	"nlArr;":                    '\U000021CD',
+	"nlarr;":                    '\U0000219A',
+	"nldr;":                     '\U00002025',
+	"nle;":                      '\U00002270',
+	"nleftarrow;":               '\U0000219A',
+	"nleftrightarrow;":          '\U000021AE',
+	"nleq;":                     '\U00002270',
+	"nless;":                    '\U0000226E',
+	"nlsim;":                    '\U00002274',
+	"nlt;":                      '\U0000226E',
+	"nltri;":                    '\U000022EA',
+	"nltrie;":                   '\U000022EC',
+	"nmid;":                     '\U00002224',
+	"nopf;":                     '\U0001D55F',
+	"not;":                      '\U000000AC',
+	"notin;":                    '\U00002209',
+	"notinva;":                  '\U00002209',
+	"notinvb;":                  '\U000022F7',
+	"notinvc;":                  '\U000022F6',
+	"notni;":                    '\U0000220C',
+	"notniva;":                  '\U0000220C',
+	"notnivb;":                  '\U000022FE',
+	"notnivc;":                  '\U000022FD',
+	"npar;":                     '\U00002226',
+	"nparallel;":                '\U00002226',
+	"npolint;":                  '\U00002A14',
+	"npr;":                      '\U00002280',
+	"nprcue;":                   '\U000022E0',
+	"nprec;":                    '\U00002280',
+	"nrArr;":                    '\U000021CF',
+	"nrarr;":                    '\U0000219B',
+	"nrightarrow;":              '\U0000219B',
+	"nrtri;":                    '\U000022EB',
+	"nrtrie;":                   '\U000022ED',
+	"nsc;":                      '\U00002281',
+	"nsccue;":                   '\U000022E1',
+	"nscr;":                     '\U0001D4C3',
+	"nshortmid;":                '\U00002224',
+	"nshortparallel;":           '\U00002226',
+	"nsim;":                     '\U00002241',
+	"nsime;":                    '\U00002244',
+	"nsimeq;":                   '\U00002244',
+	"nsmid;":                    '\U00002224',
+	"nspar;":                    '\U00002226',
+	"nsqsube;":                  '\U000022E2',
+	"nsqsupe;":                  '\U000022E3',
+	"nsub;":                     '\U00002284',
+	"nsube;":                    '\U00002288',
+	"nsubseteq;":                '\U00002288',
+	"nsucc;":                    '\U00002281',
+	"nsup;":                     '\U00002285',
+	"nsupe;":                    '\U00002289',
+	"nsupseteq;":                '\U00002289',
+	"ntgl;":                     '\U00002279',
+	"ntilde;":                   '\U000000F1',
+	"ntlg;":                     '\U00002278',
+	"ntriangleleft;":            '\U000022EA',
+	"ntrianglelefteq;":          '\U000022EC',
+	"ntriangleright;":           '\U000022EB',
+	"ntrianglerighteq;":         '\U000022ED',
+	"nu;":                       '\U000003BD',
+	"num;":                      '\U00000023',
+	"numero;":                   '\U00002116',
+	"numsp;":                    '\U00002007',
+	"nvDash;":                   '\U000022AD',
+	"nvHarr;":                   '\U00002904',
+	"nvdash;":                   '\U000022AC',
+	"nvinfin;":                  '\U000029DE',
+	"nvlArr;":                   '\U00002902',
+	"nvrArr;":                   '\U00002903',
+	"nwArr;":                    '\U000021D6',
+	"nwarhk;":                   '\U00002923',
+	"nwarr;":                    '\U00002196',
+	"nwarrow;":                  '\U00002196',
+	"nwnear;":                   '\U00002927',
+	"oS;":                       '\U000024C8',
+	"oacute;":                   '\U000000F3',
+	"oast;":                     '\U0000229B',
+	"ocir;":                     '\U0000229A',
+	"ocirc;":                    '\U000000F4',
+	"ocy;":                      '\U0000043E',
+	"odash;":                    '\U0000229D',
+	"odblac;":                   '\U00000151',
+	"odiv;":                     '\U00002A38',
+	"odot;":                     '\U00002299',
+	"odsold;":                   '\U000029BC',
+	"oelig;":                    '\U00000153',
+	"ofcir;":                    '\U000029BF',
+	"ofr;":                      '\U0001D52C',
+	"ogon;":                     '\U000002DB',
+	"ograve;":                   '\U000000F2',
+	"ogt;":                      '\U000029C1',
+	"ohbar;":                    '\U000029B5',
+	"ohm;":                      '\U000003A9',
+	"oint;":                     '\U0000222E',
+	"olarr;":                    '\U000021BA',
+	"olcir;":                    '\U000029BE',
+	"olcross;":                  '\U000029BB',
+	"oline;":                    '\U0000203E',
+	"olt;":                      '\U000029C0',
+	"omacr;":                    '\U0000014D',
+	"omega;":                    '\U000003C9',
+	"omicron;":                  '\U000003BF',
+	"omid;":                     '\U000029B6',
+	"ominus;":                   '\U00002296',
+	"oopf;":                     '\U0001D560',
+	"opar;":                     '\U000029B7',
+	"operp;":                    '\U000029B9',
+	"oplus;":                    '\U00002295',
+	"or;":                       '\U00002228',
+	"orarr;":                    '\U000021BB',
+	"ord;":                      '\U00002A5D',
+	"order;":                    '\U00002134',
+	"orderof;":                  '\U00002134',
+	"ordf;":                     '\U000000AA',
+	"ordm;":                     '\U000000BA',
+	"origof;":                   '\U000022B6',
+	"oror;":                     '\U00002A56',
+	"orslope;":                  '\U00002A57',
+	"orv;":                      '\U00002A5B',
+	"oscr;":                     '\U00002134',
+	"oslash;":                   '\U000000F8',
+	"osol;":                     '\U00002298',
+	"otilde;":                   '\U000000F5',
+	"otimes;":                   '\U00002297',
+	"otimesas;":                 '\U00002A36',
+	"ouml;":                     '\U000000F6',
+	"ovbar;":                    '\U0000233D',
+	"par;":                      '\U00002225',
+	"para;":                     '\U000000B6',
+	"parallel;":                 '\U00002225',
+	"parsim;":                   '\U00002AF3',
+	"parsl;":                    '\U00002AFD',
+	"part;":                     '\U00002202',
+	"pcy;":                      '\U0000043F',
+	"percnt;":                   '\U00000025',
+	"period;":                   '\U0000002E',
+	"permil;":                   '\U00002030',
+	"perp;":                     '\U000022A5',
+	"pertenk;":                  '\U00002031',
+	"pfr;":                      '\U0001D52D',
+	"phi;":                      '\U000003C6',
+	"phiv;":                     '\U000003D5',
+	"phmmat;":                   '\U00002133',
+	"phone;":                    '\U0000260E',
+	"pi;":                       '\U000003C0',
+	"pitchfork;":                '\U000022D4',
+	"piv;":                      '\U000003D6',
+	"planck;":                   '\U0000210F',
+	"planckh;":                  '\U0000210E',
+	"plankv;":                   '\U0000210F',
+	"plus;":                     '\U0000002B',
+	"plusacir;":                 '\U00002A23',
+	"plusb;":                    '\U0000229E',
+	"pluscir;":                  '\U00002A22',
+	"plusdo;":                   '\U00002214',
+	"plusdu;":                   '\U00002A25',
+	"pluse;":                    '\U00002A72',
+	"plusmn;":                   '\U000000B1',
+	"plussim;":                  '\U00002A26',
+	"plustwo;":                  '\U00002A27',
+	"pm;":                       '\U000000B1',
+	"pointint;":                 '\U00002A15',
+	"popf;":                     '\U0001D561',
+	"pound;":                    '\U000000A3',
+	"pr;":                       '\U0000227A',
+	"prE;":                      '\U00002AB3',
+	"prap;":                     '\U00002AB7',
+	"prcue;":                    '\U0000227C',
+	"pre;":                      '\U00002AAF',
+	"prec;":                     '\U0000227A',
+	"precapprox;":               '\U00002AB7',
+	"preccurlyeq;":              '\U0000227C',
+	"preceq;":                   '\U00002AAF',
+	"precnapprox;":              '\U00002AB9',
+	"precneqq;":                 '\U00002AB5',
+	"precnsim;":                 '\U000022E8',
+	"precsim;":                  '\U0000227E',
+	"prime;":                    '\U00002032',
+	"primes;":                   '\U00002119',
+	"prnE;":                     '\U00002AB5',
+	"prnap;":                    '\U00002AB9',
+	"prnsim;":                   '\U000022E8',
+	"prod;":                     '\U0000220F',
+	"profalar;":                 '\U0000232E',
+	"profline;":                 '\U00002312',
+	"profsurf;":                 '\U00002313',
+	"prop;":                     '\U0000221D',
+	"propto;":                   '\U0000221D',
+	"prsim;":                    '\U0000227E',
+	"prurel;":                   '\U000022B0',
+	"pscr;":                     '\U0001D4C5',
+	"psi;":                      '\U000003C8',
+	"puncsp;":                   '\U00002008',
+	"qfr;":                      '\U0001D52E',
+	"qint;":                     '\U00002A0C',
+	"qopf;":                     '\U0001D562',
+	"qprime;":                   '\U00002057',
+	"qscr;":                     '\U0001D4C6',
+	"quaternions;":              '\U0000210D',
+	"quatint;":                  '\U00002A16',
+	"quest;":                    '\U0000003F',
+	"questeq;":                  '\U0000225F',
+	"quot;":                     '\U00000022',
+	"rAarr;":                    '\U000021DB',
+	"rArr;":                     '\U000021D2',
+	"rAtail;":                   '\U0000291C',
+	"rBarr;":                    '\U0000290F',
+	"rHar;":                     '\U00002964',
+	"racute;":                   '\U00000155',
+	"radic;":                    '\U0000221A',
+	"raemptyv;":                 '\U000029B3',
+	"rang;":                     '\U000027E9',
+	"rangd;":                    '\U00002992',
+	"range;":                    '\U000029A5',
+	"rangle;":                   '\U000027E9',
+	"raquo;":                    '\U000000BB',
+	"rarr;":                     '\U00002192',
+	"rarrap;":                   '\U00002975',
+	"rarrb;":                    '\U000021E5',
+	"rarrbfs;":                  '\U00002920',
+	"rarrc;":                    '\U00002933',
+	"rarrfs;":                   '\U0000291E',
+	"rarrhk;":                   '\U000021AA',
+	"rarrlp;":                   '\U000021AC',
+	"rarrpl;":                   '\U00002945',
+	"rarrsim;":                  '\U00002974',
+	"rarrtl;":                   '\U000021A3',
+	"rarrw;":                    '\U0000219D',
+	"ratail;":                   '\U0000291A',
+	"ratio;":                    '\U00002236',
+	"rationals;":                '\U0000211A',
+	"rbarr;":                    '\U0000290D',
+	"rbbrk;":                    '\U00002773',
+	"rbrace;":                   '\U0000007D',
+	"rbrack;":                   '\U0000005D',
+	"rbrke;":                    '\U0000298C',
+	"rbrksld;":                  '\U0000298E',
+	"rbrkslu;":                  '\U00002990',
+	"rcaron;":                   '\U00000159',
+	"rcedil;":                   '\U00000157',
+	"rceil;":                    '\U00002309',
+	"rcub;":                     '\U0000007D',
+	"rcy;":                      '\U00000440',
+	"rdca;":                     '\U00002937',
+	"rdldhar;":                  '\U00002969',
+	"rdquo;":                    '\U0000201D',
+	"rdquor;":                   '\U0000201D',
+	"rdsh;":                     '\U000021B3',
+	"real;":                     '\U0000211C',
+	"realine;":                  '\U0000211B',
+	"realpart;":                 '\U0000211C',
+	"reals;":                    '\U0000211D',
+	"rect;":                     '\U000025AD',
+	"reg;":                      '\U000000AE',
+	"rfisht;":                   '\U0000297D',
+	"rfloor;":                   '\U0000230B',
+	"rfr;":                      '\U0001D52F',
+	"rhard;":                    '\U000021C1',
+	"rharu;":                    '\U000021C0',
+	"rharul;":                   '\U0000296C',
+	"rho;":                      '\U000003C1',
+	"rhov;":                     '\U000003F1',
+	"rightarrow;":               '\U00002192',
+	"rightarrowtail;":           '\U000021A3',
+	"rightharpoondown;":         '\U000021C1',
+	"rightharpoonup;":           '\U000021C0',
+	"rightleftarrows;":          '\U000021C4',
+	"rightleftharpoons;":        '\U000021CC',
+	"rightrightarrows;":         '\U000021C9',
+	"rightsquigarrow;":          '\U0000219D',
+	"rightthreetimes;":          '\U000022CC',
+	"ring;":                     '\U000002DA',
+	"risingdotseq;":             '\U00002253',
+	"rlarr;":                    '\U000021C4',
+	"rlhar;":                    '\U000021CC',
+	"rlm;":                      '\U0000200F',
+	"rmoust;":                   '\U000023B1',
+	"rmoustache;":               '\U000023B1',
+	"rnmid;":                    '\U00002AEE',
+	"roang;":                    '\U000027ED',
+	"roarr;":                    '\U000021FE',
+	"robrk;":                    '\U000027E7',
+	"ropar;":                    '\U00002986',
+	"ropf;":                     '\U0001D563',
+	"roplus;":                   '\U00002A2E',
+	"rotimes;":                  '\U00002A35',
+	"rpar;":                     '\U00000029',
+	"rpargt;":                   '\U00002994',
+	"rppolint;":                 '\U00002A12',
+	"rrarr;":                    '\U000021C9',
+	"rsaquo;":                   '\U0000203A',
+	"rscr;":                     '\U0001D4C7',
+	"rsh;":                      '\U000021B1',
+	"rsqb;":                     '\U0000005D',
+	"rsquo;":                    '\U00002019',
+	"rsquor;":                   '\U00002019',
+	"rthree;":                   '\U000022CC',
+	"rtimes;":                   '\U000022CA',
+	"rtri;":                     '\U000025B9',
+	"rtrie;":                    '\U000022B5',
+	"rtrif;":                    '\U000025B8',
+	"rtriltri;":                 '\U000029CE',
+	"ruluhar;":                  '\U00002968',
+	"rx;":                       '\U0000211E',
+	"sacute;":                   '\U0000015B',
+	"sbquo;":                    '\U0000201A',
+	"sc;":                       '\U0000227B',
+	"scE;":                      '\U00002AB4',
+	"scap;":                     '\U00002AB8',
+	"scaron;":                   '\U00000161',
+	"sccue;":                    '\U0000227D',
+	"sce;":                      '\U00002AB0',
+	"scedil;":                   '\U0000015F',
+	"scirc;":                    '\U0000015D',
+	"scnE;":                     '\U00002AB6',
+	"scnap;":                    '\U00002ABA',
+	"scnsim;":                   '\U000022E9',
+	"scpolint;":                 '\U00002A13',
+	"scsim;":                    '\U0000227F',
+	"scy;":                      '\U00000441',
+	"sdot;":                     '\U000022C5',
+	"sdotb;":                    '\U000022A1',
+	"sdote;":                    '\U00002A66',
+	"seArr;":                    '\U000021D8',
+	"searhk;":                   '\U00002925',
+	"searr;":                    '\U00002198',
+	"searrow;":                  '\U00002198',
+	"sect;":                     '\U000000A7',
+	"semi;":                     '\U0000003B',
+	"seswar;":                   '\U00002929',
+	"setminus;":                 '\U00002216',
+	"setmn;":                    '\U00002216',
+	"sext;":                     '\U00002736',
+	"sfr;":                      '\U0001D530',
+	"sfrown;":                   '\U00002322',
+	"sharp;":                    '\U0000266F',
+	"shchcy;":                   '\U00000449',
+	"shcy;":                     '\U00000448',
+	"shortmid;":                 '\U00002223',
+	"shortparallel;":            '\U00002225',
+	"shy;":                      '\U000000AD',
+	"sigma;":                    '\U000003C3',
+	"sigmaf;":                   '\U000003C2',
+	"sigmav;":                   '\U000003C2',
+	"sim;":                      '\U0000223C',
+	"simdot;":                   '\U00002A6A',
+	"sime;":                     '\U00002243',
+	"simeq;":                    '\U00002243',
+	"simg;":                     '\U00002A9E',
+	"simgE;":                    '\U00002AA0',
+	"siml;":                     '\U00002A9D',
+	"simlE;":                    '\U00002A9F',
+	"simne;":                    '\U00002246',
+	"simplus;":                  '\U00002A24',
+	"simrarr;":                  '\U00002972',
+	"slarr;":                    '\U00002190',
+	"smallsetminus;":            '\U00002216',
+	"smashp;":                   '\U00002A33',
+	"smeparsl;":                 '\U000029E4',
+	"smid;":                     '\U00002223',
+	"smile;":                    '\U00002323',
+	"smt;":                      '\U00002AAA',
+	"smte;":                     '\U00002AAC',
+	"softcy;":                   '\U0000044C',
+	"sol;":                      '\U0000002F',
+	"solb;":                     '\U000029C4',
+	"solbar;":                   '\U0000233F',
+	"sopf;":                     '\U0001D564',
+	"spades;":                   '\U00002660',
+	"spadesuit;":                '\U00002660',
+	"spar;":                     '\U00002225',
+	"sqcap;":                    '\U00002293',
+	"sqcup;":                    '\U00002294',
+	"sqsub;":                    '\U0000228F',
+	"sqsube;":                   '\U00002291',
+	"sqsubset;":                 '\U0000228F',
+	"sqsubseteq;":               '\U00002291',
+	"sqsup;":                    '\U00002290',
+	"sqsupe;":                   '\U00002292',
+	"sqsupset;":                 '\U00002290',
+	"sqsupseteq;":               '\U00002292',
+	"squ;":                      '\U000025A1',
+	"square;":                   '\U000025A1',
+	"squarf;":                   '\U000025AA',
+	"squf;":                     '\U000025AA',
+	"srarr;":                    '\U00002192',
+	"sscr;":                     '\U0001D4C8',
+	"ssetmn;":                   '\U00002216',
+	"ssmile;":                   '\U00002323',
+	"sstarf;":                   '\U000022C6',
+	"star;":                     '\U00002606',
+	"starf;":                    '\U00002605',
+	"straightepsilon;":          '\U000003F5',
+	"straightphi;":              '\U000003D5',
+	"strns;":                    '\U000000AF',
+	"sub;":                      '\U00002282',
+	"subE;":                     '\U00002AC5',
+	"subdot;":                   '\U00002ABD',
+	"sube;":                     '\U00002286',
+	"subedot;":                  '\U00002AC3',
+	"submult;":                  '\U00002AC1',
+	"subnE;":                    '\U00002ACB',
+	"subne;":                    '\U0000228A',
+	"subplus;":                  '\U00002ABF',
+	"subrarr;":                  '\U00002979',
+	"subset;":                   '\U00002282',
+	"subseteq;":                 '\U00002286',
+	"subseteqq;":                '\U00002AC5',
+	"subsetneq;":                '\U0000228A',
+	"subsetneqq;":               '\U00002ACB',
+	"subsim;":                   '\U00002AC7',
+	"subsub;":                   '\U00002AD5',
+	"subsup;":                   '\U00002AD3',
+	"succ;":                     '\U0000227B',
+	"succapprox;":               '\U00002AB8',
+	"succcurlyeq;":              '\U0000227D',
+	"succeq;":                   '\U00002AB0',
+	"succnapprox;":              '\U00002ABA',
+	"succneqq;":                 '\U00002AB6',
+	"succnsim;":                 '\U000022E9',
+	"succsim;":                  '\U0000227F',
+	"sum;":                      '\U00002211',
+	"sung;":                     '\U0000266A',
+	"sup;":                      '\U00002283',
+	"sup1;":                     '\U000000B9',
+	"sup2;":                     '\U000000B2',
+	"sup3;":                     '\U000000B3',
+	"supE;":                     '\U00002AC6',
+	"supdot;":                   '\U00002ABE',
+	"supdsub;":                  '\U00002AD8',
+	"supe;":                     '\U00002287',
+	"supedot;":                  '\U00002AC4',
+	"suphsol;":                  '\U000027C9',
+	"suphsub;":                  '\U00002AD7',
+	"suplarr;":                  '\U0000297B',
+	"supmult;":                  '\U00002AC2',
+	"supnE;":                    '\U00002ACC',
+	"supne;":                    '\U0000228B',
+	"supplus;":                  '\U00002AC0',
+	"supset;":                   '\U00002283',
+	"supseteq;":                 '\U00002287',
+	"supseteqq;":                '\U00002AC6',
+	"supsetneq;":                '\U0000228B',
+	"supsetneqq;":               '\U00002ACC',
+	"supsim;":                   '\U00002AC8',
+	"supsub;":                   '\U00002AD4',
+	"supsup;":                   '\U00002AD6',
+	"swArr;":                    '\U000021D9',
+	"swarhk;":                   '\U00002926',
+	"swarr;":                    '\U00002199',
+	"swarrow;":                  '\U00002199',
+	"swnwar;":                   '\U0000292A',
+	"szlig;":                    '\U000000DF',
+	"target;":                   '\U00002316',
+	"tau;":                      '\U000003C4',
+	"tbrk;":                     '\U000023B4',
+	"tcaron;":                   '\U00000165',
+	"tcedil;":                   '\U00000163',
+	"tcy;":                      '\U00000442',
+	"tdot;":                     '\U000020DB',
+	"telrec;":                   '\U00002315',
+	"tfr;":                      '\U0001D531',
+	"there4;":                   '\U00002234',
+	"therefore;":                '\U00002234',
+	"theta;":                    '\U000003B8',
+	"thetasym;":                 '\U000003D1',
+	"thetav;":                   '\U000003D1',
+	"thickapprox;":              '\U00002248',
+	"thicksim;":                 '\U0000223C',
+	"thinsp;":                   '\U00002009',
+	"thkap;":                    '\U00002248',
+	"thksim;":                   '\U0000223C',
+	"thorn;":                    '\U000000FE',
+	"tilde;":                    '\U000002DC',
+	"times;":                    '\U000000D7',
+	"timesb;":                   '\U000022A0',
+	"timesbar;":                 '\U00002A31',
+	"timesd;":                   '\U00002A30',
+	"tint;":                     '\U0000222D',
+	"toea;":                     '\U00002928',
+	"top;":                      '\U000022A4',
+	"topbot;":                   '\U00002336',
+	"topcir;":                   '\U00002AF1',
+	"topf;":                     '\U0001D565',
+	"topfork;":                  '\U00002ADA',
+	"tosa;":                     '\U00002929',
+	"tprime;":                   '\U00002034',
+	"trade;":                    '\U00002122',
+	"triangle;":                 '\U000025B5',
+	"triangledown;":             '\U000025BF',
+	"triangleleft;":             '\U000025C3',
+	"trianglelefteq;":           '\U000022B4',
+	"triangleq;":                '\U0000225C',
+	"triangleright;":            '\U000025B9',
+	"trianglerighteq;":          '\U000022B5',
+	"tridot;":                   '\U000025EC',
+	"trie;":                     '\U0000225C',
+	"triminus;":                 '\U00002A3A',
+	"triplus;":                  '\U00002A39',
+	"trisb;":                    '\U000029CD',
+	"tritime;":                  '\U00002A3B',
+	"trpezium;":                 '\U000023E2',
+	"tscr;":                     '\U0001D4C9',
+	"tscy;":                     '\U00000446',
+	"tshcy;":                    '\U0000045B',
+	"tstrok;":                   '\U00000167',
+	"twixt;":                    '\U0000226C',
+	"twoheadleftarrow;":         '\U0000219E',
+	"twoheadrightarrow;":        '\U000021A0',
+	"uArr;":                     '\U000021D1',
+	"uHar;":                     '\U00002963',
+	"uacute;":                   '\U000000FA',
+	"uarr;":                     '\U00002191',
+	"ubrcy;":                    '\U0000045E',
+	"ubreve;":                   '\U0000016D',
+	"ucirc;":                    '\U000000FB',
+	"ucy;":                      '\U00000443',
+	"udarr;":                    '\U000021C5',
+	"udblac;":                   '\U00000171',
+	"udhar;":                    '\U0000296E',
+	"ufisht;":                   '\U0000297E',
+	"ufr;":                      '\U0001D532',
+	"ugrave;":                   '\U000000F9',
+	"uharl;":                    '\U000021BF',
+	"uharr;":                    '\U000021BE',
+	"uhblk;":                    '\U00002580',
+	"ulcorn;":                   '\U0000231C',
+	"ulcorner;":                 '\U0000231C',
+	"ulcrop;":                   '\U0000230F',
+	"ultri;":                    '\U000025F8',
+	"umacr;":                    '\U0000016B',
+	"uml;":                      '\U000000A8',
+	"uogon;":                    '\U00000173',
+	"uopf;":                     '\U0001D566',
+	"uparrow;":                  '\U00002191',
+	"updownarrow;":              '\U00002195',
+	"upharpoonleft;":            '\U000021BF',
+	"upharpoonright;":           '\U000021BE',
+	"uplus;":                    '\U0000228E',
+	"upsi;":                     '\U000003C5',
+	"upsih;":                    '\U000003D2',
+	"upsilon;":                  '\U000003C5',
+	"upuparrows;":               '\U000021C8',
+	"urcorn;":                   '\U0000231D',
+	"urcorner;":                 '\U0000231D',
+	"urcrop;":                   '\U0000230E',
+	"uring;":                    '\U0000016F',
+	"urtri;":                    '\U000025F9',
+	"uscr;":                     '\U0001D4CA',
+	"utdot;":                    '\U000022F0',
+	"utilde;":                   '\U00000169',
+	"utri;":                     '\U000025B5',
+	"utrif;":                    '\U000025B4',
+	"uuarr;":                    '\U000021C8',
+	"uuml;":                     '\U000000FC',
+	"uwangle;":                  '\U000029A7',
+	"vArr;":                     '\U000021D5',
+	"vBar;":                     '\U00002AE8',
+	"vBarv;":                    '\U00002AE9',
+	"vDash;":                    '\U000022A8',
+	"vangrt;":                   '\U0000299C',
+	"varepsilon;":               '\U000003F5',
+	"varkappa;":                 '\U000003F0',
+	"varnothing;":               '\U00002205',
+	"varphi;":                   '\U000003D5',
+	"varpi;":                    '\U000003D6',
+	"varpropto;":                '\U0000221D',
+	"varr;":                     '\U00002195',
+	"varrho;":                   '\U000003F1',
+	"varsigma;":                 '\U000003C2',
+	"vartheta;":                 '\U000003D1',
+	"vartriangleleft;":          '\U000022B2',
+	"vartriangleright;":         '\U000022B3',
+	"vcy;":                      '\U00000432',
+	"vdash;":                    '\U000022A2',
+	"vee;":                      '\U00002228',
+	"veebar;":                   '\U000022BB',
+	"veeeq;":                    '\U0000225A',
+	"vellip;":                   '\U000022EE',
+	"verbar;":                   '\U0000007C',
+	"vert;":                     '\U0000007C',
+	"vfr;":                      '\U0001D533',
+	"vltri;":                    '\U000022B2',
+	"vopf;":                     '\U0001D567',
+	"vprop;":                    '\U0000221D',
+	"vrtri;":                    '\U000022B3',
+	"vscr;":                     '\U0001D4CB',
+	"vzigzag;":                  '\U0000299A',
+	"wcirc;":                    '\U00000175',
+	"wedbar;":                   '\U00002A5F',
+	"wedge;":                    '\U00002227',
+	"wedgeq;":                   '\U00002259',
+	"weierp;":                   '\U00002118',
+	"wfr;":                      '\U0001D534',
+	"wopf;":                     '\U0001D568',
+	"wp;":                       '\U00002118',
+	"wr;":                       '\U00002240',
+	"wreath;":                   '\U00002240',
+	"wscr;":                     '\U0001D4CC',
+	"xcap;":                     '\U000022C2',
+	"xcirc;":                    '\U000025EF',
+	"xcup;":                     '\U000022C3',
+	"xdtri;":                    '\U000025BD',
+	"xfr;":                      '\U0001D535',
+	"xhArr;":                    '\U000027FA',
+	"xharr;":                    '\U000027F7',
+	"xi;":                       '\U000003BE',
+	"xlArr;":                    '\U000027F8',
+	"xlarr;":                    '\U000027F5',
+	"xmap;":                     '\U000027FC',
+	"xnis;":                     '\U000022FB',
+	"xodot;":                    '\U00002A00',
+	"xopf;":                     '\U0001D569',
+	"xoplus;":                   '\U00002A01',
+	"xotime;":                   '\U00002A02',
+	"xrArr;":                    '\U000027F9',
+	"xrarr;":                    '\U000027F6',
+	"xscr;":                     '\U0001D4CD',
+	"xsqcup;":                   '\U00002A06',
+	"xuplus;":                   '\U00002A04',
+	"xutri;":                    '\U000025B3',
+	"xvee;":                     '\U000022C1',
+	"xwedge;":                   '\U000022C0',
+	"yacute;":                   '\U000000FD',
+	"yacy;":                     '\U0000044F',
+	"ycirc;":                    '\U00000177',
+	"ycy;":                      '\U0000044B',
+	"yen;":                      '\U000000A5',
+	"yfr;":                      '\U0001D536',
+	"yicy;":                     '\U00000457',
+	"yopf;":                     '\U0001D56A',
+	"yscr;":                     '\U0001D4CE',
+	"yucy;":                     '\U0000044E',
+	"yuml;":                     '\U000000FF',
+	"zacute;":                   '\U0000017A',
+	"zcaron;":                   '\U0000017E',
+	"zcy;":                      '\U00000437',
+	"zdot;":                     '\U0000017C',
+	"zeetrf;":                   '\U00002128',
+	"zeta;":                     '\U000003B6',
+	"zfr;":                      '\U0001D537',
+	"zhcy;":                     '\U00000436',
+	"zigrarr;":                  '\U000021DD',
+	"zopf;":                     '\U0001D56B',
+	"zscr;":                     '\U0001D4CF',
+	"zwj;":                      '\U0000200D',
+	"zwnj;":                     '\U0000200C',
+	"AElig":                     '\U000000C6',
+	"AMP":                       '\U00000026',
+	"Aacute":                    '\U000000C1',
+	"Acirc":                     '\U000000C2',
+	"Agrave":                    '\U000000C0',
+	"Aring":                     '\U000000C5',
+	"Atilde":                    '\U000000C3',
+	"Auml":                      '\U000000C4',
+	"COPY":                      '\U000000A9',
+	"Ccedil":                    '\U000000C7',
+	"ETH":                       '\U000000D0',
+	"Eacute":                    '\U000000C9',
+	"Ecirc":                     '\U000000CA',
+	"Egrave":                    '\U000000C8',
+	"Euml":                      '\U000000CB',
+	"GT":                        '\U0000003E',
+	"Iacute":                    '\U000000CD',
+	"Icirc":                     '\U000000CE',
+	"Igrave":                    '\U000000CC',
+	"Iuml":                      '\U000000CF',
+	"LT":                        '\U0000003C',
+	"Ntilde":                    '\U000000D1',
+	"Oacute":                    '\U000000D3',
+	"Ocirc":                     '\U000000D4',
+	"Ograve":                    '\U000000D2',
+	"Oslash":                    '\U000000D8',
+	"Otilde":                    '\U000000D5',
+	"Ouml":                      '\U000000D6',
+	"QUOT":                      '\U00000022',
+	"REG":                       '\U000000AE',
+	"THORN":                     '\U000000DE',
+	"Uacute":                    '\U000000DA',
+	"Ucirc":                     '\U000000DB',
+	"Ugrave":                    '\U000000D9',
+	"Uuml":                      '\U000000DC',
+	"Yacute":                    '\U000000DD',
+	"aacute":                    '\U000000E1',
+	"acirc":                     '\U000000E2',
+	"acute":                     '\U000000B4',
+	"aelig":                     '\U000000E6',
+	"agrave":                    '\U000000E0',
+	"amp":                       '\U00000026',
+	"aring":                     '\U000000E5',
+	"atilde":                    '\U000000E3',
+	"auml":                      '\U000000E4',
+	"brvbar":                    '\U000000A6',
+	"ccedil":                    '\U000000E7',
+	"cedil":                     '\U000000B8',
+	"cent":                      '\U000000A2',
+	"copy":                      '\U000000A9',
+	"curren":                    '\U000000A4',
+	"deg":                       '\U000000B0',
+	"divide":                    '\U000000F7',
+	"eacute":                    '\U000000E9',
+	"ecirc":                     '\U000000EA',
+	"egrave":                    '\U000000E8',
+	"eth":                       '\U000000F0',
+	"euml":                      '\U000000EB',
+	"frac12":                    '\U000000BD',
+	"frac14":                    '\U000000BC',
+	"frac34":                    '\U000000BE',
+	"gt":                        '\U0000003E',
+	"iacute":                    '\U000000ED',
+	"icirc":                     '\U000000EE',
+	"iexcl":                     '\U000000A1',
+	"igrave":                    '\U000000EC',
+	"iquest":                    '\U000000BF',
+	"iuml":                      '\U000000EF',
+	"laquo":                     '\U000000AB',
+	"lt":                        '\U0000003C',
+	"macr":                      '\U000000AF',
+	"micro":                     '\U000000B5',
+	"middot":                    '\U000000B7',
+	"nbsp":                      '\U000000A0',
+	"not":                       '\U000000AC',
+	"ntilde":                    '\U000000F1',
+	"oacute":                    '\U000000F3',
+	"ocirc":                     '\U000000F4',
+	"ograve":                    '\U000000F2',
+	"ordf":                      '\U000000AA',
+	"ordm":                      '\U000000BA',
+	"oslash":                    '\U000000F8',
+	"otilde":                    '\U000000F5',
+	"ouml":                      '\U000000F6',
+	"para":                      '\U000000B6',
+	"plusmn":                    '\U000000B1',
+	"pound":                     '\U000000A3',
+	"quot":                      '\U00000022',
+	"raquo":                     '\U000000BB',
+	"reg":                       '\U000000AE',
+	"sect":                      '\U000000A7',
+	"shy":                       '\U000000AD',
+	"sup1":                      '\U000000B9',
+	"sup2":                      '\U000000B2',
+	"sup3":                      '\U000000B3',
+	"szlig":                     '\U000000DF',
+	"thorn":                     '\U000000FE',
+	"times":                     '\U000000D7',
+	"uacute":                    '\U000000FA',
+	"ucirc":                     '\U000000FB',
+	"ugrave":                    '\U000000F9',
+	"uml":                       '\U000000A8',
+	"uuml":                      '\U000000FC',
+	"yacute":                    '\U000000FD',
+	"yen":                       '\U000000A5',
+	"yuml":                      '\U000000FF',
+}
+
+// HTML entities that are two unicode codepoints.
+var entity2 = map[string][2]rune{
+	// TODO(nigeltao): Handle replacements that are wider than their names.
+	// "nLt;":                     {'\u226A', '\u20D2'},
+	// "nGt;":                     {'\u226B', '\u20D2'},
+	"NotEqualTilde;":           {'\u2242', '\u0338'},
+	"NotGreaterFullEqual;":     {'\u2267', '\u0338'},
+	"NotGreaterGreater;":       {'\u226B', '\u0338'},
+	"NotGreaterSlantEqual;":    {'\u2A7E', '\u0338'},
+	"NotHumpDownHump;":         {'\u224E', '\u0338'},
+	"NotHumpEqual;":            {'\u224F', '\u0338'},
+	"NotLeftTriangleBar;":      {'\u29CF', '\u0338'},
+	"NotLessLess;":             {'\u226A', '\u0338'},
+	"NotLessSlantEqual;":       {'\u2A7D', '\u0338'},
+	"NotNestedGreaterGreater;": {'\u2AA2', '\u0338'},
+	"NotNestedLessLess;":       {'\u2AA1', '\u0338'},
+	"NotPrecedesEqual;":        {'\u2AAF', '\u0338'},
+	"NotRightTriangleBar;":     {'\u29D0', '\u0338'},
+	"NotSquareSubset;":         {'\u228F', '\u0338'},
+	"NotSquareSuperset;":       {'\u2290', '\u0338'},
+	"NotSubset;":               {'\u2282', '\u20D2'},
+	"NotSucceedsEqual;":        {'\u2AB0', '\u0338'},
+	"NotSucceedsTilde;":        {'\u227F', '\u0338'},
+	"NotSuperset;":             {'\u2283', '\u20D2'},
+	"ThickSpace;":              {'\u205F', '\u200A'},
+	"acE;":                     {'\u223E', '\u0333'},
+	"bne;":                     {'\u003D', '\u20E5'},
+	"bnequiv;":                 {'\u2261', '\u20E5'},
+	"caps;":                    {'\u2229', '\uFE00'},
+	"cups;":                    {'\u222A', '\uFE00'},
+	"fjlig;":                   {'\u0066', '\u006A'},
+	"gesl;":                    {'\u22DB', '\uFE00'},
+	"gvertneqq;":               {'\u2269', '\uFE00'},
+	"gvnE;":                    {'\u2269', '\uFE00'},
+	"lates;":                   {'\u2AAD', '\uFE00'},
+	"lesg;":                    {'\u22DA', '\uFE00'},
+	"lvertneqq;":               {'\u2268', '\uFE00'},
+	"lvnE;":                    {'\u2268', '\uFE00'},
+	"nGg;":                     {'\u22D9', '\u0338'},
+	"nGtv;":                    {'\u226B', '\u0338'},
+	"nLl;":                     {'\u22D8', '\u0338'},
+	"nLtv;":                    {'\u226A', '\u0338'},
+	"nang;":                    {'\u2220', '\u20D2'},
+	"napE;":                    {'\u2A70', '\u0338'},
+	"napid;":                   {'\u224B', '\u0338'},
+	"nbump;":                   {'\u224E', '\u0338'},
+	"nbumpe;":                  {'\u224F', '\u0338'},
+	"ncongdot;":                {'\u2A6D', '\u0338'},
+	"nedot;":                   {'\u2250', '\u0338'},
+	"nesim;":                   {'\u2242', '\u0338'},
+	"ngE;":                     {'\u2267', '\u0338'},
+	"ngeqq;":                   {'\u2267', '\u0338'},
+	"ngeqslant;":               {'\u2A7E', '\u0338'},
+	"nges;":                    {'\u2A7E', '\u0338'},
+	"nlE;":                     {'\u2266', '\u0338'},
+	"nleqq;":                   {'\u2266', '\u0338'},
+	"nleqslant;":               {'\u2A7D', '\u0338'},
+	"nles;":                    {'\u2A7D', '\u0338'},
+	"notinE;":                  {'\u22F9', '\u0338'},
+	"notindot;":                {'\u22F5', '\u0338'},
+	"nparsl;":                  {'\u2AFD', '\u20E5'},
+	"npart;":                   {'\u2202', '\u0338'},
+	"npre;":                    {'\u2AAF', '\u0338'},
+	"npreceq;":                 {'\u2AAF', '\u0338'},
+	"nrarrc;":                  {'\u2933', '\u0338'},
+	"nrarrw;":                  {'\u219D', '\u0338'},
+	"nsce;":                    {'\u2AB0', '\u0338'},
+	"nsubE;":                   {'\u2AC5', '\u0338'},
+	"nsubset;":                 {'\u2282', '\u20D2'},
+	"nsubseteqq;":              {'\u2AC5', '\u0338'},
+	"nsucceq;":                 {'\u2AB0', '\u0338'},
+	"nsupE;":                   {'\u2AC6', '\u0338'},
+	"nsupset;":                 {'\u2283', '\u20D2'},
+	"nsupseteqq;":              {'\u2AC6', '\u0338'},
+	"nvap;":                    {'\u224D', '\u20D2'},
+	"nvge;":                    {'\u2265', '\u20D2'},
+	"nvgt;":                    {'\u003E', '\u20D2'},
+	"nvle;":                    {'\u2264', '\u20D2'},
+	"nvlt;":                    {'\u003C', '\u20D2'},
+	"nvltrie;":                 {'\u22B4', '\u20D2'},
+	"nvrtrie;":                 {'\u22B5', '\u20D2'},
+	"nvsim;":                   {'\u223C', '\u20D2'},
+	"race;":                    {'\u223D', '\u0331'},
+	"smtes;":                   {'\u2AAC', '\uFE00'},
+	"sqcaps;":                  {'\u2293', '\uFE00'},
+	"sqcups;":                  {'\u2294', '\uFE00'},
+	"varsubsetneq;":            {'\u228A', '\uFE00'},
+	"varsubsetneqq;":           {'\u2ACB', '\uFE00'},
+	"varsupsetneq;":            {'\u228B', '\uFE00'},
+	"varsupsetneqq;":           {'\u2ACC', '\uFE00'},
+	"vnsub;":                   {'\u2282', '\u20D2'},
+	"vnsup;":                   {'\u2283', '\u20D2'},
+	"vsubnE;":                  {'\u2ACB', '\uFE00'},
+	"vsubne;":                  {'\u228A', '\uFE00'},
+	"vsupnE;":                  {'\u2ACC', '\uFE00'},
+	"vsupne;":                  {'\u228B', '\uFE00'},
+}
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/entity_test.go b/Godeps/_workspace/src/golang.org/x/net/html/entity_test.go
new file mode 100644
index 00000000..b53f866f
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/entity_test.go
@@ -0,0 +1,29 @@
+// Copyright 2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package html
+
+import (
+	"testing"
+	"unicode/utf8"
+)
+
+func TestEntityLength(t *testing.T) {
+	// We verify that the length of UTF-8 encoding of each value is <= 1 + len(key).
+	// The +1 comes from the leading "&". This property implies that the length of
+	// unescaped text is <= the length of escaped text.
+	for k, v := range entity {
+		if 1+len(k) < utf8.RuneLen(v) {
+			t.Error("escaped entity &" + k + " is shorter than its UTF-8 encoding " + string(v))
+		}
+		if len(k) > longestEntityWithoutSemicolon && k[len(k)-1] != ';' {
+			t.Errorf("entity name %s is %d characters, but longestEntityWithoutSemicolon=%d", k, len(k), longestEntityWithoutSemicolon)
+		}
+	}
+	for k, v := range entity2 {
+		if 1+len(k) < utf8.RuneLen(v[0])+utf8.RuneLen(v[1]) {
+			t.Error("escaped entity &" + k + " is shorter than its UTF-8 encoding " + string(v[0]) + string(v[1]))
+		}
+	}
+}
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/escape.go b/Godeps/_workspace/src/golang.org/x/net/html/escape.go
new file mode 100644
index 00000000..d8561396
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/escape.go
@@ -0,0 +1,258 @@
+// Copyright 2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package html
+
+import (
+	"bytes"
+	"strings"
+	"unicode/utf8"
+)
+
+// These replacements permit compatibility with old numeric entities that
+// assumed Windows-1252 encoding.
+// https://html.spec.whatwg.org/multipage/syntax.html#consume-a-character-reference
+var replacementTable = [...]rune{
+	'\u20AC', // First entry is what 0x80 should be replaced with.
+	'\u0081',
+	'\u201A',
+	'\u0192',
+	'\u201E',
+	'\u2026',
+	'\u2020',
+	'\u2021',
+	'\u02C6',
+	'\u2030',
+	'\u0160',
+	'\u2039',
+	'\u0152',
+	'\u008D',
+	'\u017D',
+	'\u008F',
+	'\u0090',
+	'\u2018',
+	'\u2019',
+	'\u201C',
+	'\u201D',
+	'\u2022',
+	'\u2013',
+	'\u2014',
+	'\u02DC',
+	'\u2122',
+	'\u0161',
+	'\u203A',
+	'\u0153',
+	'\u009D',
+	'\u017E',
+	'\u0178', // Last entry is 0x9F.
+	// 0x00->'\uFFFD' is handled programmatically.
+	// 0x0D->'\u000D' is a no-op.
+}
+
+// unescapeEntity reads an entity like "&lt;" from b[src:] and writes the
+// corresponding "<" to b[dst:], returning the incremented dst and src cursors.
+// Precondition: b[src] == '&' && dst <= src.
+// attribute should be true if parsing an attribute value.
+func unescapeEntity(b []byte, dst, src int, attribute bool) (dst1, src1 int) {
+	// https://html.spec.whatwg.org/multipage/syntax.html#consume-a-character-reference
+
+	// i starts at 1 because we already know that s[0] == '&'.
+	i, s := 1, b[src:]
+
+	if len(s) <= 1 {
+		b[dst] = b[src]
+		return dst + 1, src + 1
+	}
+
+	if s[i] == '#' {
+		if len(s) <= 3 { // We need to have at least "&#.".
+			b[dst] = b[src]
+			return dst + 1, src + 1
+		}
+		i++
+		c := s[i]
+		hex := false
+		if c == 'x' || c == 'X' {
+			hex = true
+			i++
+		}
+
+		x := '\x00'
+		for i < len(s) {
+			c = s[i]
+			i++
+			if hex {
+				if '0' <= c && c <= '9' {
+					x = 16*x + rune(c) - '0'
+					continue
+				} else if 'a' <= c && c <= 'f' {
+					x = 16*x + rune(c) - 'a' + 10
+					continue
+				} else if 'A' <= c && c <= 'F' {
+					x = 16*x + rune(c) - 'A' + 10
+					continue
+				}
+			} else if '0' <= c && c <= '9' {
+				x = 10*x + rune(c) - '0'
+				continue
+			}
+			if c != ';' {
+				i--
+			}
+			break
+		}
+
+		if i <= 3 { // No characters matched.
+			b[dst] = b[src]
+			return dst + 1, src + 1
+		}
+
+		if 0x80 <= x && x <= 0x9F {
+			// Replace characters from Windows-1252 with UTF-8 equivalents.
+			x = replacementTable[x-0x80]
+		} else if x == 0 || (0xD800 <= x && x <= 0xDFFF) || x > 0x10FFFF {
+			// Replace invalid characters with the replacement character.
+			x = '\uFFFD'
+		}
+
+		return dst + utf8.EncodeRune(b[dst:], x), src + i
+	}
+
+	// Consume the maximum number of characters possible, with the
+	// consumed characters matching one of the named references.
+
+	for i < len(s) {
+		c := s[i]
+		i++
+		// Lower-cased characters are more common in entities, so we check for them first.
+		if 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' || '0' <= c && c <= '9' {
+			continue
+		}
+		if c != ';' {
+			i--
+		}
+		break
+	}
+
+	entityName := string(s[1:i])
+	if entityName == "" {
+		// No-op.
+	} else if attribute && entityName[len(entityName)-1] != ';' && len(s) > i && s[i] == '=' {
+		// No-op.
+	} else if x := entity[entityName]; x != 0 {
+		return dst + utf8.EncodeRune(b[dst:], x), src + i
+	} else if x := entity2[entityName]; x[0] != 0 {
+		dst1 := dst + utf8.EncodeRune(b[dst:], x[0])
+		return dst1 + utf8.EncodeRune(b[dst1:], x[1]), src + i
+	} else if !attribute {
+		maxLen := len(entityName) - 1
+		if maxLen > longestEntityWithoutSemicolon {
+			maxLen = longestEntityWithoutSemicolon
+		}
+		for j := maxLen; j > 1; j-- {
+			if x := entity[entityName[:j]]; x != 0 {
+				return dst + utf8.EncodeRune(b[dst:], x), src + j + 1
+			}
+		}
+	}
+
+	dst1, src1 = dst+i, src+i
+	copy(b[dst:dst1], b[src:src1])
+	return dst1, src1
+}
+
+// unescape unescapes b's entities in-place, so that "a&lt;b" becomes "a<b".
+// attribute should be true if parsing an attribute value.
+func unescape(b []byte, attribute bool) []byte {
+	for i, c := range b {
+		if c == '&' {
+			dst, src := unescapeEntity(b, i, i, attribute)
+			for src < len(b) {
+				c := b[src]
+				if c == '&' {
+					dst, src = unescapeEntity(b, dst, src, attribute)
+				} else {
+					b[dst] = c
+					dst, src = dst+1, src+1
+				}
+			}
+			return b[0:dst]
+		}
+	}
+	return b
+}
+
+// lower lower-cases the A-Z bytes in b in-place, so that "aBc" becomes "abc".
+func lower(b []byte) []byte {
+	for i, c := range b {
+		if 'A' <= c && c <= 'Z' {
+			b[i] = c + 'a' - 'A'
+		}
+	}
+	return b
+}
+
+const escapedChars = "&'<>\"\r"
+
+func escape(w writer, s string) error {
+	i := strings.IndexAny(s, escapedChars)
+	for i != -1 {
+		if _, err := w.WriteString(s[:i]); err != nil {
+			return err
+		}
+		var esc string
+		switch s[i] {
+		case '&':
+			esc = "&amp;"
+		case '\'':
+			// "&#39;" is shorter than "&apos;" and apos was not in HTML until HTML5.
+			esc = "&#39;"
+		case '<':
+			esc = "&lt;"
+		case '>':
+			esc = "&gt;"
+		case '"':
+			// "&#34;" is shorter than "&quot;".
+			esc = "&#34;"
+		case '\r':
+			esc = "&#13;"
+		default:
+			panic("unrecognized escape character")
+		}
+		s = s[i+1:]
+		if _, err := w.WriteString(esc); err != nil {
+			return err
+		}
+		i = strings.IndexAny(s, escapedChars)
+	}
+	_, err := w.WriteString(s)
+	return err
+}
+
+// EscapeString escapes special characters like "<" to become "&lt;". It
+// escapes only five such characters: <, >, &, ' and ".
+// UnescapeString(EscapeString(s)) == s always holds, but the converse isn't
+// always true.
+func EscapeString(s string) string {
+	if strings.IndexAny(s, escapedChars) == -1 {
+		return s
+	}
+	var buf bytes.Buffer
+	escape(&buf, s)
+	return buf.String()
+}
+
+// UnescapeString unescapes entities like "&lt;" to become "<". It unescapes a
+// larger range of entities than EscapeString escapes. For example, "&aacute;"
+// unescapes to "á", as does "&#225;" and "&xE1;".
+// UnescapeString(EscapeString(s)) == s always holds, but the converse isn't
+// always true.
+func UnescapeString(s string) string {
+	for _, c := range s {
+		if c == '&' {
+			return string(unescape([]byte(s), false))
+		}
+	}
+	return s
+}
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/escape_test.go b/Godeps/_workspace/src/golang.org/x/net/html/escape_test.go
new file mode 100644
index 00000000..b405d4b4
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/escape_test.go
@@ -0,0 +1,97 @@
+// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package html
+
+import "testing"
+
+type unescapeTest struct {
+	// A short description of the test case.
+	desc string
+	// The HTML text.
+	html string
+	// The unescaped text.
+	unescaped string
+}
+
+var unescapeTests = []unescapeTest{
+	// Handle no entities.
+	{
+		"copy",
+		"A\ttext\nstring",
+		"A\ttext\nstring",
+	},
+	// Handle simple named entities.
+	{
+		"simple",
+		"&amp; &gt; &lt;",
+		"& > <",
+	},
+	// Handle hitting the end of the string.
+	{
+		"stringEnd",
+		"&amp &amp",
+		"& &",
+	},
+	// Handle entities with two codepoints.
+	{
+		"multiCodepoint",
+		"text &gesl; blah",
+		"text \u22db\ufe00 blah",
+	},
+	// Handle decimal numeric entities.
+	{
+		"decimalEntity",
+		"Delta = &#916; ",
+		"Delta = Δ ",
+	},
+	// Handle hexadecimal numeric entities.
+	{
+		"hexadecimalEntity",
+		"Lambda = &#x3bb; = &#X3Bb ",
+		"Lambda = λ = λ ",
+	},
+	// Handle numeric early termination.
+	{
+		"numericEnds",
+		"&# &#x &#128;43 &copy = &#169f = &#xa9",
+		"&# &#x €43 © = ©f = ©",
+	},
+	// Handle numeric ISO-8859-1 entity replacements.
+	{
+		"numericReplacements",
+		"Footnote&#x87;",
+		"Footnote‡",
+	},
+}
+
+func TestUnescape(t *testing.T) {
+	for _, tt := range unescapeTests {
+		unescaped := UnescapeString(tt.html)
+		if unescaped != tt.unescaped {
+			t.Errorf("TestUnescape %s: want %q, got %q", tt.desc, tt.unescaped, unescaped)
+		}
+	}
+}
+
+func TestUnescapeEscape(t *testing.T) {
+	ss := []string{
+		``,
+		`abc def`,
+		`a & b`,
+		`a&amp;b`,
+		`a &amp b`,
+		`&quot;`,
+		`"`,
+		`"<&>"`,
+		`&quot;&lt;&amp;&gt;&quot;`,
+		`3&5==1 && 0<1, "0&lt;1", a+acute=&aacute;`,
+		`The special characters are: <, >, &, ' and "`,
+	}
+	for _, s := range ss {
+		if got := UnescapeString(EscapeString(s)); got != s {
+			t.Errorf("got %q want %q", got, s)
+		}
+	}
+}
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/example_test.go b/Godeps/_workspace/src/golang.org/x/net/html/example_test.go
new file mode 100644
index 00000000..0b06ed77
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/example_test.go
@@ -0,0 +1,40 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// This example demonstrates parsing HTML data and walking the resulting tree.
+package html_test
+
+import (
+	"fmt"
+	"log"
+	"strings"
+
+	"golang.org/x/net/html"
+)
+
+func ExampleParse() {
+	s := `<p>Links:</p><ul><li><a href="foo">Foo</a><li><a href="/bar/baz">BarBaz</a></ul>`
+	doc, err := html.Parse(strings.NewReader(s))
+	if err != nil {
+		log.Fatal(err)
+	}
+	var f func(*html.Node)
+	f = func(n *html.Node) {
+		if n.Type == html.ElementNode && n.Data == "a" {
+			for _, a := range n.Attr {
+				if a.Key == "href" {
+					fmt.Println(a.Val)
+					break
+				}
+			}
+		}
+		for c := n.FirstChild; c != nil; c = c.NextSibling {
+			f(c)
+		}
+	}
+	f(doc)
+	// Output:
+	// foo
+	// /bar/baz
+}
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/foreign.go b/Godeps/_workspace/src/golang.org/x/net/html/foreign.go
new file mode 100644
index 00000000..d3b38440
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/foreign.go
@@ -0,0 +1,226 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package html
+
+import (
+	"strings"
+)
+
+func adjustAttributeNames(aa []Attribute, nameMap map[string]string) {
+	for i := range aa {
+		if newName, ok := nameMap[aa[i].Key]; ok {
+			aa[i].Key = newName
+		}
+	}
+}
+
+func adjustForeignAttributes(aa []Attribute) {
+	for i, a := range aa {
+		if a.Key == "" || a.Key[0] != 'x' {
+			continue
+		}
+		switch a.Key {
+		case "xlink:actuate", "xlink:arcrole", "xlink:href", "xlink:role", "xlink:show",
+			"xlink:title", "xlink:type", "xml:base", "xml:lang", "xml:space", "xmlns:xlink":
+			j := strings.Index(a.Key, ":")
+			aa[i].Namespace = a.Key[:j]
+			aa[i].Key = a.Key[j+1:]
+		}
+	}
+}
+
+func htmlIntegrationPoint(n *Node) bool {
+	if n.Type != ElementNode {
+		return false
+	}
+	switch n.Namespace {
+	case "math":
+		if n.Data == "annotation-xml" {
+			for _, a := range n.Attr {
+				if a.Key == "encoding" {
+					val := strings.ToLower(a.Val)
+					if val == "text/html" || val == "application/xhtml+xml" {
+						return true
+					}
+				}
+			}
+		}
+	case "svg":
+		switch n.Data {
+		case "desc", "foreignObject", "title":
+			return true
+		}
+	}
+	return false
+}
+
+func mathMLTextIntegrationPoint(n *Node) bool {
+	if n.Namespace != "math" {
+		return false
+	}
+	switch n.Data {
+	case "mi", "mo", "mn", "ms", "mtext":
+		return true
+	}
+	return false
+}
+
+// Section 12.2.5.5.
+var breakout = map[string]bool{
+	"b":          true,
+	"big":        true,
+	"blockquote": true,
+	"body":       true,
+	"br":         true,
+	"center":     true,
+	"code":       true,
+	"dd":         true,
+	"div":        true,
+	"dl":         true,
+	"dt":         true,
+	"em":         true,
+	"embed":      true,
+	"h1":         true,
+	"h2":         true,
+	"h3":         true,
+	"h4":         true,
+	"h5":         true,
+	"h6":         true,
+	"head":       true,
+	"hr":         true,
+	"i":          true,
+	"img":        true,
+	"li":         true,
+	"listing":    true,
+	"menu":       true,
+	"meta":       true,
+	"nobr":       true,
+	"ol":         true,
+	"p":          true,
+	"pre":        true,
+	"ruby":       true,
+	"s":          true,
+	"small":      true,
+	"span":       true,
+	"strong":     true,
+	"strike":     true,
+	"sub":        true,
+	"sup":        true,
+	"table":      true,
+	"tt":         true,
+	"u":          true,
+	"ul":         true,
+	"var":        true,
+}
+
+// Section 12.2.5.5.
+var svgTagNameAdjustments = map[string]string{
+	"altglyph":            "altGlyph",
+	"altglyphdef":         "altGlyphDef",
+	"altglyphitem":        "altGlyphItem",
+	"animatecolor":        "animateColor",
+	"animatemotion":       "animateMotion",
+	"animatetransform":    "animateTransform",
+	"clippath":            "clipPath",
+	"feblend":             "feBlend",
+	"fecolormatrix":       "feColorMatrix",
+	"fecomponenttransfer": "feComponentTransfer",
+	"fecomposite":         "feComposite",
+	"feconvolvematrix":    "feConvolveMatrix",
+	"fediffuselighting":   "feDiffuseLighting",
+	"fedisplacementmap":   "feDisplacementMap",
+	"fedistantlight":      "feDistantLight",
+	"feflood":             "feFlood",
+	"fefunca":             "feFuncA",
+	"fefuncb":             "feFuncB",
+	"fefuncg":             "feFuncG",
+	"fefuncr":             "feFuncR",
+	"fegaussianblur":      "feGaussianBlur",
+	"feimage":             "feImage",
+	"femerge":             "feMerge",
+	"femergenode":         "feMergeNode",
+	"femorphology":        "feMorphology",
+	"feoffset":            "feOffset",
+	"fepointlight":        "fePointLight",
+	"fespecularlighting":  "feSpecularLighting",
+	"fespotlight":         "feSpotLight",
+	"fetile":              "feTile",
+	"feturbulence":        "feTurbulence",
+	"foreignobject":       "foreignObject",
+	"glyphref":            "glyphRef",
+	"lineargradient":      "linearGradient",
+	"radialgradient":      "radialGradient",
+	"textpath":            "textPath",
+}
+
+// Section 12.2.5.1
+var mathMLAttributeAdjustments = map[string]string{
+	"definitionurl": "definitionURL",
+}
+
+var svgAttributeAdjustments = map[string]string{
+	"attributename":             "attributeName",
+	"attributetype":             "attributeType",
+	"basefrequency":             "baseFrequency",
+	"baseprofile":               "baseProfile",
+	"calcmode":                  "calcMode",
+	"clippathunits":             "clipPathUnits",
+	"contentscripttype":         "contentScriptType",
+	"contentstyletype":          "contentStyleType",
+	"diffuseconstant":           "diffuseConstant",
+	"edgemode":                  "edgeMode",
+	"externalresourcesrequired": "externalResourcesRequired",
+	"filterres":                 "filterRes",
+	"filterunits":               "filterUnits",
+	"glyphref":                  "glyphRef",
+	"gradienttransform":         "gradientTransform",
+	"gradientunits":             "gradientUnits",
+	"kernelmatrix":              "kernelMatrix",
+	"kernelunitlength":          "kernelUnitLength",
+	"keypoints":                 "keyPoints",
+	"keysplines":                "keySplines",
+	"keytimes":                  "keyTimes",
+	"lengthadjust":              "lengthAdjust",
+	"limitingconeangle":         "limitingConeAngle",
+	"markerheight":              "markerHeight",
+	"markerunits":               "markerUnits",
+	"markerwidth":               "markerWidth",
+	"maskcontentunits":          "maskContentUnits",
+	"maskunits":                 "maskUnits",
+	"numoctaves":                "numOctaves",
+	"pathlength":                "pathLength",
+	"patterncontentunits":       "patternContentUnits",
+	"patterntransform":          "patternTransform",
+	"patternunits":              "patternUnits",
+	"pointsatx":                 "pointsAtX",
+	"pointsaty":                 "pointsAtY",
+	"pointsatz":                 "pointsAtZ",
+	"preservealpha":             "preserveAlpha",
+	"preserveaspectratio":       "preserveAspectRatio",
+	"primitiveunits":            "primitiveUnits",
+	"refx":                      "refX",
+	"refy":                      "refY",
+	"repeatcount":               "repeatCount",
+	"repeatdur":                 "repeatDur",
+	"requiredextensions":        "requiredExtensions",
+	"requiredfeatures":          "requiredFeatures",
+	"specularconstant":          "specularConstant",
+	"specularexponent":          "specularExponent",
+	"spreadmethod":              "spreadMethod",
+	"startoffset":               "startOffset",
+	"stddeviation":              "stdDeviation",
+	"stitchtiles":               "stitchTiles",
+	"surfacescale":              "surfaceScale",
+	"systemlanguage":            "systemLanguage",
+	"tablevalues":               "tableValues",
+	"targetx":                   "targetX",
+	"targety":                   "targetY",
+	"textlength":                "textLength",
+	"viewbox":                   "viewBox",
+	"viewtarget":                "viewTarget",
+	"xchannelselector":          "xChannelSelector",
+	"ychannelselector":          "yChannelSelector",
+	"zoomandpan":                "zoomAndPan",
+}
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/node.go b/Godeps/_workspace/src/golang.org/x/net/html/node.go
new file mode 100644
index 00000000..26b657ae
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/node.go
@@ -0,0 +1,193 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package html
+
+import (
+	"golang.org/x/net/html/atom"
+)
+
+// A NodeType is the type of a Node.
+type NodeType uint32
+
+const (
+	ErrorNode NodeType = iota
+	TextNode
+	DocumentNode
+	ElementNode
+	CommentNode
+	DoctypeNode
+	scopeMarkerNode
+)
+
+// Section 12.2.3.3 says "scope markers are inserted when entering applet
+// elements, buttons, object elements, marquees, table cells, and table
+// captions, and are used to prevent formatting from 'leaking'".
+var scopeMarker = Node{Type: scopeMarkerNode}
+
+// A Node consists of a NodeType and some Data (tag name for element nodes,
+// content for text) and are part of a tree of Nodes. Element nodes may also
+// have a Namespace and contain a slice of Attributes. Data is unescaped, so
+// that it looks like "a<b" rather than "a&lt;b". For element nodes, DataAtom
+// is the atom for Data, or zero if Data is not a known tag name.
+//
+// An empty Namespace implies a "http://www.w3.org/1999/xhtml" namespace.
+// Similarly, "math" is short for "http://www.w3.org/1998/Math/MathML", and
+// "svg" is short for "http://www.w3.org/2000/svg".
+type Node struct {
+	Parent, FirstChild, LastChild, PrevSibling, NextSibling *Node
+
+	Type      NodeType
+	DataAtom  atom.Atom
+	Data      string
+	Namespace string
+	Attr      []Attribute
+}
+
+// InsertBefore inserts newChild as a child of n, immediately before oldChild
+// in the sequence of n's children. oldChild may be nil, in which case newChild
+// is appended to the end of n's children.
+//
+// It will panic if newChild already has a parent or siblings.
+func (n *Node) InsertBefore(newChild, oldChild *Node) {
+	if newChild.Parent != nil || newChild.PrevSibling != nil || newChild.NextSibling != nil {
+		panic("html: InsertBefore called for an attached child Node")
+	}
+	var prev, next *Node
+	if oldChild != nil {
+		prev, next = oldChild.PrevSibling, oldChild
+	} else {
+		prev = n.LastChild
+	}
+	if prev != nil {
+		prev.NextSibling = newChild
+	} else {
+		n.FirstChild = newChild
+	}
+	if next != nil {
+		next.PrevSibling = newChild
+	} else {
+		n.LastChild = newChild
+	}
+	newChild.Parent = n
+	newChild.PrevSibling = prev
+	newChild.NextSibling = next
+}
+
+// AppendChild adds a node c as a child of n.
+//
+// It will panic if c already has a parent or siblings.
+func (n *Node) AppendChild(c *Node) {
+	if c.Parent != nil || c.PrevSibling != nil || c.NextSibling != nil {
+		panic("html: AppendChild called for an attached child Node")
+	}
+	last := n.LastChild
+	if last != nil {
+		last.NextSibling = c
+	} else {
+		n.FirstChild = c
+	}
+	n.LastChild = c
+	c.Parent = n
+	c.PrevSibling = last
+}
+
+// RemoveChild removes a node c that is a child of n. Afterwards, c will have
+// no parent and no siblings.
+//
+// It will panic if c's parent is not n.
+func (n *Node) RemoveChild(c *Node) {
+	if c.Parent != n {
+		panic("html: RemoveChild called for a non-child Node")
+	}
+	if n.FirstChild == c {
+		n.FirstChild = c.NextSibling
+	}
+	if c.NextSibling != nil {
+		c.NextSibling.PrevSibling = c.PrevSibling
+	}
+	if n.LastChild == c {
+		n.LastChild = c.PrevSibling
+	}
+	if c.PrevSibling != nil {
+		c.PrevSibling.NextSibling = c.NextSibling
+	}
+	c.Parent = nil
+	c.PrevSibling = nil
+	c.NextSibling = nil
+}
+
+// reparentChildren reparents all of src's child nodes to dst.
+func reparentChildren(dst, src *Node) {
+	for {
+		child := src.FirstChild
+		if child == nil {
+			break
+		}
+		src.RemoveChild(child)
+		dst.AppendChild(child)
+	}
+}
+
+// clone returns a new node with the same type, data and attributes.
+// The clone has no parent, no siblings and no children.
+func (n *Node) clone() *Node {
+	m := &Node{
+		Type:     n.Type,
+		DataAtom: n.DataAtom,
+		Data:     n.Data,
+		Attr:     make([]Attribute, len(n.Attr)),
+	}
+	copy(m.Attr, n.Attr)
+	return m
+}
+
+// nodeStack is a stack of nodes.
+type nodeStack []*Node
+
+// pop pops the stack. It will panic if s is empty.
+func (s *nodeStack) pop() *Node {
+	i := len(*s)
+	n := (*s)[i-1]
+	*s = (*s)[:i-1]
+	return n
+}
+
+// top returns the most recently pushed node, or nil if s is empty.
+func (s *nodeStack) top() *Node {
+	if i := len(*s); i > 0 {
+		return (*s)[i-1]
+	}
+	return nil
+}
+
+// index returns the index of the top-most occurrence of n in the stack, or -1
+// if n is not present.
+func (s *nodeStack) index(n *Node) int {
+	for i := len(*s) - 1; i >= 0; i-- {
+		if (*s)[i] == n {
+			return i
+		}
+	}
+	return -1
+}
+
+// insert inserts a node at the given index.
+func (s *nodeStack) insert(i int, n *Node) {
+	(*s) = append(*s, nil)
+	copy((*s)[i+1:], (*s)[i:])
+	(*s)[i] = n
+}
+
+// remove removes a node from the stack. It is a no-op if n is not present.
+func (s *nodeStack) remove(n *Node) {
+	i := s.index(n)
+	if i == -1 {
+		return
+	}
+	copy((*s)[i:], (*s)[i+1:])
+	j := len(*s) - 1
+	(*s)[j] = nil
+	*s = (*s)[:j]
+}
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/node_test.go b/Godeps/_workspace/src/golang.org/x/net/html/node_test.go
new file mode 100644
index 00000000..471102f3
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/node_test.go
@@ -0,0 +1,146 @@
+// Copyright 2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package html
+
+import (
+	"fmt"
+)
+
+// checkTreeConsistency checks that a node and its descendants are all
+// consistent in their parent/child/sibling relationships.
+func checkTreeConsistency(n *Node) error {
+	return checkTreeConsistency1(n, 0)
+}
+
+func checkTreeConsistency1(n *Node, depth int) error {
+	if depth == 1e4 {
+		return fmt.Errorf("html: tree looks like it contains a cycle")
+	}
+	if err := checkNodeConsistency(n); err != nil {
+		return err
+	}
+	for c := n.FirstChild; c != nil; c = c.NextSibling {
+		if err := checkTreeConsistency1(c, depth+1); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// checkNodeConsistency checks that a node's parent/child/sibling relationships
+// are consistent.
+func checkNodeConsistency(n *Node) error {
+	if n == nil {
+		return nil
+	}
+
+	nParent := 0
+	for p := n.Parent; p != nil; p = p.Parent {
+		nParent++
+		if nParent == 1e4 {
+			return fmt.Errorf("html: parent list looks like an infinite loop")
+		}
+	}
+
+	nForward := 0
+	for c := n.FirstChild; c != nil; c = c.NextSibling {
+		nForward++
+		if nForward == 1e6 {
+			return fmt.Errorf("html: forward list of children looks like an infinite loop")
+		}
+		if c.Parent != n {
+			return fmt.Errorf("html: inconsistent child/parent relationship")
+		}
+	}
+
+	nBackward := 0
+	for c := n.LastChild; c != nil; c = c.PrevSibling {
+		nBackward++
+		if nBackward == 1e6 {
+			return fmt.Errorf("html: backward list of children looks like an infinite loop")
+		}
+		if c.Parent != n {
+			return fmt.Errorf("html: inconsistent child/parent relationship")
+		}
+	}
+
+	if n.Parent != nil {
+		if n.Parent == n {
+			return fmt.Errorf("html: inconsistent parent relationship")
+		}
+		if n.Parent == n.FirstChild {
+			return fmt.Errorf("html: inconsistent parent/first relationship")
+		}
+		if n.Parent == n.LastChild {
+			return fmt.Errorf("html: inconsistent parent/last relationship")
+		}
+		if n.Parent == n.PrevSibling {
+			return fmt.Errorf("html: inconsistent parent/prev relationship")
+		}
+		if n.Parent == n.NextSibling {
+			return fmt.Errorf("html: inconsistent parent/next relationship")
+		}
+
+		parentHasNAsAChild := false
+		for c := n.Parent.FirstChild; c != nil; c = c.NextSibling {
+			if c == n {
+				parentHasNAsAChild = true
+				break
+			}
+		}
+		if !parentHasNAsAChild {
+			return fmt.Errorf("html: inconsistent parent/child relationship")
+		}
+	}
+
+	if n.PrevSibling != nil && n.PrevSibling.NextSibling != n {
+		return fmt.Errorf("html: inconsistent prev/next relationship")
+	}
+	if n.NextSibling != nil && n.NextSibling.PrevSibling != n {
+		return fmt.Errorf("html: inconsistent next/prev relationship")
+	}
+
+	if (n.FirstChild == nil) != (n.LastChild == nil) {
+		return fmt.Errorf("html: inconsistent first/last relationship")
+	}
+	if n.FirstChild != nil && n.FirstChild == n.LastChild {
+		// We have a sole child.
+		if n.FirstChild.PrevSibling != nil || n.FirstChild.NextSibling != nil {
+			return fmt.Errorf("html: inconsistent sole child's sibling relationship")
+		}
+	}
+
+	seen := map[*Node]bool{}
+
+	var last *Node
+	for c := n.FirstChild; c != nil; c = c.NextSibling {
+		if seen[c] {
+			return fmt.Errorf("html: inconsistent repeated child")
+		}
+		seen[c] = true
+		last = c
+	}
+	if last != n.LastChild {
+		return fmt.Errorf("html: inconsistent last relationship")
+	}
+
+	var first *Node
+	for c := n.LastChild; c != nil; c = c.PrevSibling {
+		if !seen[c] {
+			return fmt.Errorf("html: inconsistent missing child")
+		}
+		delete(seen, c)
+		first = c
+	}
+	if first != n.FirstChild {
+		return fmt.Errorf("html: inconsistent first relationship")
+	}
+
+	if len(seen) != 0 {
+		return fmt.Errorf("html: inconsistent forwards/backwards child list")
+	}
+
+	return nil
+}
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/parse.go b/Godeps/_workspace/src/golang.org/x/net/html/parse.go
new file mode 100644
index 00000000..be4b2bf5
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/parse.go
@@ -0,0 +1,2094 @@
+// Copyright 2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package html
+
+import (
+	"errors"
+	"fmt"
+	"io"
+	"strings"
+
+	a "golang.org/x/net/html/atom"
+)
+
+// A parser implements the HTML5 parsing algorithm:
+// https://html.spec.whatwg.org/multipage/syntax.html#tree-construction
+type parser struct {
+	// tokenizer provides the tokens for the parser.
+	tokenizer *Tokenizer
+	// tok is the most recently read token.
+	tok Token
+	// Self-closing tags like <hr/> are treated as start tags, except that
+	// hasSelfClosingToken is set while they are being processed.
+	hasSelfClosingToken bool
+	// doc is the document root element.
+	doc *Node
+	// The stack of open elements (section 12.2.3.2) and active formatting
+	// elements (section 12.2.3.3).
+	oe, afe nodeStack
+	// Element pointers (section 12.2.3.4).
+	head, form *Node
+	// Other parsing state flags (section 12.2.3.5).
+	scripting, framesetOK bool
+	// im is the current insertion mode.
+	im insertionMode
+	// originalIM is the insertion mode to go back to after completing a text
+	// or inTableText insertion mode.
+	originalIM insertionMode
+	// fosterParenting is whether new elements should be inserted according to
+	// the foster parenting rules (section 12.2.5.3).
+	fosterParenting bool
+	// quirks is whether the parser is operating in "quirks mode."
+	quirks bool
+	// fragment is whether the parser is parsing an HTML fragment.
+	fragment bool
+	// context is the context element when parsing an HTML fragment
+	// (section 12.4).
+	context *Node
+}
+
+func (p *parser) top() *Node {
+	if n := p.oe.top(); n != nil {
+		return n
+	}
+	return p.doc
+}
+
+// Stop tags for use in popUntil. These come from section 12.2.3.2.
+var (
+	defaultScopeStopTags = map[string][]a.Atom{
+		"":     {a.Applet, a.Caption, a.Html, a.Table, a.Td, a.Th, a.Marquee, a.Object, a.Template},
+		"math": {a.AnnotationXml, a.Mi, a.Mn, a.Mo, a.Ms, a.Mtext},
+		"svg":  {a.Desc, a.ForeignObject, a.Title},
+	}
+)
+
+type scope int
+
+const (
+	defaultScope scope = iota
+	listItemScope
+	buttonScope
+	tableScope
+	tableRowScope
+	tableBodyScope
+	selectScope
+)
+
+// popUntil pops the stack of open elements at the highest element whose tag
+// is in matchTags, provided there is no higher element in the scope's stop
+// tags (as defined in section 12.2.3.2). It returns whether or not there was
+// such an element. If there was not, popUntil leaves the stack unchanged.
+//
+// For example, the set of stop tags for table scope is: "html", "table". If
+// the stack was:
+// ["html", "body", "font", "table", "b", "i", "u"]
+// then popUntil(tableScope, "font") would return false, but
+// popUntil(tableScope, "i") would return true and the stack would become:
+// ["html", "body", "font", "table", "b"]
+//
+// If an element's tag is in both the stop tags and matchTags, then the stack
+// will be popped and the function returns true (provided, of course, there was
+// no higher element in the stack that was also in the stop tags). For example,
+// popUntil(tableScope, "table") returns true and leaves:
+// ["html", "body", "font"]
+func (p *parser) popUntil(s scope, matchTags ...a.Atom) bool {
+	if i := p.indexOfElementInScope(s, matchTags...); i != -1 {
+		p.oe = p.oe[:i]
+		return true
+	}
+	return false
+}
+
+// indexOfElementInScope returns the index in p.oe of the highest element whose
+// tag is in matchTags that is in scope. If no matching element is in scope, it
+// returns -1.
+func (p *parser) indexOfElementInScope(s scope, matchTags ...a.Atom) int {
+	for i := len(p.oe) - 1; i >= 0; i-- {
+		tagAtom := p.oe[i].DataAtom
+		if p.oe[i].Namespace == "" {
+			for _, t := range matchTags {
+				if t == tagAtom {
+					return i
+				}
+			}
+			switch s {
+			case defaultScope:
+				// No-op.
+			case listItemScope:
+				if tagAtom == a.Ol || tagAtom == a.Ul {
+					return -1
+				}
+			case buttonScope:
+				if tagAtom == a.Button {
+					return -1
+				}
+			case tableScope:
+				if tagAtom == a.Html || tagAtom == a.Table {
+					return -1
+				}
+			case selectScope:
+				if tagAtom != a.Optgroup && tagAtom != a.Option {
+					return -1
+				}
+			default:
+				panic("unreachable")
+			}
+		}
+		switch s {
+		case defaultScope, listItemScope, buttonScope:
+			for _, t := range defaultScopeStopTags[p.oe[i].Namespace] {
+				if t == tagAtom {
+					return -1
+				}
+			}
+		}
+	}
+	return -1
+}
+
+// elementInScope is like popUntil, except that it doesn't modify the stack of
+// open elements.
+func (p *parser) elementInScope(s scope, matchTags ...a.Atom) bool {
+	return p.indexOfElementInScope(s, matchTags...) != -1
+}
+
+// clearStackToContext pops elements off the stack of open elements until a
+// scope-defined element is found.
+func (p *parser) clearStackToContext(s scope) {
+	for i := len(p.oe) - 1; i >= 0; i-- {
+		tagAtom := p.oe[i].DataAtom
+		switch s {
+		case tableScope:
+			if tagAtom == a.Html || tagAtom == a.Table {
+				p.oe = p.oe[:i+1]
+				return
+			}
+		case tableRowScope:
+			if tagAtom == a.Html || tagAtom == a.Tr {
+				p.oe = p.oe[:i+1]
+				return
+			}
+		case tableBodyScope:
+			if tagAtom == a.Html || tagAtom == a.Tbody || tagAtom == a.Tfoot || tagAtom == a.Thead {
+				p.oe = p.oe[:i+1]
+				return
+			}
+		default:
+			panic("unreachable")
+		}
+	}
+}
+
+// generateImpliedEndTags pops nodes off the stack of open elements as long as
+// the top node has a tag name of dd, dt, li, option, optgroup, p, rp, or rt.
+// If exceptions are specified, nodes with that name will not be popped off.
+func (p *parser) generateImpliedEndTags(exceptions ...string) {
+	var i int
+loop:
+	for i = len(p.oe) - 1; i >= 0; i-- {
+		n := p.oe[i]
+		if n.Type == ElementNode {
+			switch n.DataAtom {
+			case a.Dd, a.Dt, a.Li, a.Option, a.Optgroup, a.P, a.Rp, a.Rt:
+				for _, except := range exceptions {
+					if n.Data == except {
+						break loop
+					}
+				}
+				continue
+			}
+		}
+		break
+	}
+
+	p.oe = p.oe[:i+1]
+}
+
+// addChild adds a child node n to the top element, and pushes n onto the stack
+// of open elements if it is an element node.
+func (p *parser) addChild(n *Node) {
+	if p.shouldFosterParent() {
+		p.fosterParent(n)
+	} else {
+		p.top().AppendChild(n)
+	}
+
+	if n.Type == ElementNode {
+		p.oe = append(p.oe, n)
+	}
+}
+
+// shouldFosterParent returns whether the next node to be added should be
+// foster parented.
+func (p *parser) shouldFosterParent() bool {
+	if p.fosterParenting {
+		switch p.top().DataAtom {
+		case a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr:
+			return true
+		}
+	}
+	return false
+}
+
+// fosterParent adds a child node according to the foster parenting rules.
+// Section 12.2.5.3, "foster parenting".
+func (p *parser) fosterParent(n *Node) {
+	var table, parent, prev *Node
+	var i int
+	for i = len(p.oe) - 1; i >= 0; i-- {
+		if p.oe[i].DataAtom == a.Table {
+			table = p.oe[i]
+			break
+		}
+	}
+
+	if table == nil {
+		// The foster parent is the html element.
+		parent = p.oe[0]
+	} else {
+		parent = table.Parent
+	}
+	if parent == nil {
+		parent = p.oe[i-1]
+	}
+
+	if table != nil {
+		prev = table.PrevSibling
+	} else {
+		prev = parent.LastChild
+	}
+	if prev != nil && prev.Type == TextNode && n.Type == TextNode {
+		prev.Data += n.Data
+		return
+	}
+
+	parent.InsertBefore(n, table)
+}
+
+// addText adds text to the preceding node if it is a text node, or else it
+// calls addChild with a new text node.
+func (p *parser) addText(text string) {
+	if text == "" {
+		return
+	}
+
+	if p.shouldFosterParent() {
+		p.fosterParent(&Node{
+			Type: TextNode,
+			Data: text,
+		})
+		return
+	}
+
+	t := p.top()
+	if n := t.LastChild; n != nil && n.Type == TextNode {
+		n.Data += text
+		return
+	}
+	p.addChild(&Node{
+		Type: TextNode,
+		Data: text,
+	})
+}
+
+// addElement adds a child element based on the current token.
+func (p *parser) addElement() {
+	p.addChild(&Node{
+		Type:     ElementNode,
+		DataAtom: p.tok.DataAtom,
+		Data:     p.tok.Data,
+		Attr:     p.tok.Attr,
+	})
+}
+
+// Section 12.2.3.3.
+func (p *parser) addFormattingElement() {
+	tagAtom, attr := p.tok.DataAtom, p.tok.Attr
+	p.addElement()
+
+	// Implement the Noah's Ark clause, but with three per family instead of two.
+	identicalElements := 0
+findIdenticalElements:
+	for i := len(p.afe) - 1; i >= 0; i-- {
+		n := p.afe[i]
+		if n.Type == scopeMarkerNode {
+			break
+		}
+		if n.Type != ElementNode {
+			continue
+		}
+		if n.Namespace != "" {
+			continue
+		}
+		if n.DataAtom != tagAtom {
+			continue
+		}
+		if len(n.Attr) != len(attr) {
+			continue
+		}
+	compareAttributes:
+		for _, t0 := range n.Attr {
+			for _, t1 := range attr {
+				if t0.Key == t1.Key && t0.Namespace == t1.Namespace && t0.Val == t1.Val {
+					// Found a match for this attribute, continue with the next attribute.
+					continue compareAttributes
+				}
+			}
+			// If we get here, there is no attribute that matches a.
+			// Therefore the element is not identical to the new one.
+			continue findIdenticalElements
+		}
+
+		identicalElements++
+		if identicalElements >= 3 {
+			p.afe.remove(n)
+		}
+	}
+
+	p.afe = append(p.afe, p.top())
+}
+
+// Section 12.2.3.3.
+func (p *parser) clearActiveFormattingElements() {
+	for {
+		n := p.afe.pop()
+		if len(p.afe) == 0 || n.Type == scopeMarkerNode {
+			return
+		}
+	}
+}
+
+// Section 12.2.3.3.
+func (p *parser) reconstructActiveFormattingElements() {
+	n := p.afe.top()
+	if n == nil {
+		return
+	}
+	if n.Type == scopeMarkerNode || p.oe.index(n) != -1 {
+		return
+	}
+	i := len(p.afe) - 1
+	for n.Type != scopeMarkerNode && p.oe.index(n) == -1 {
+		if i == 0 {
+			i = -1
+			break
+		}
+		i--
+		n = p.afe[i]
+	}
+	for {
+		i++
+		clone := p.afe[i].clone()
+		p.addChild(clone)
+		p.afe[i] = clone
+		if i == len(p.afe)-1 {
+			break
+		}
+	}
+}
+
+// Section 12.2.4.
+func (p *parser) acknowledgeSelfClosingTag() {
+	p.hasSelfClosingToken = false
+}
+
+// An insertion mode (section 12.2.3.1) is the state transition function from
+// a particular state in the HTML5 parser's state machine. It updates the
+// parser's fields depending on parser.tok (where ErrorToken means EOF).
+// It returns whether the token was consumed.
+type insertionMode func(*parser) bool
+
+// setOriginalIM sets the insertion mode to return to after completing a text or
+// inTableText insertion mode.
+// Section 12.2.3.1, "using the rules for".
+func (p *parser) setOriginalIM() {
+	if p.originalIM != nil {
+		panic("html: bad parser state: originalIM was set twice")
+	}
+	p.originalIM = p.im
+}
+
+// Section 12.2.3.1, "reset the insertion mode".
+func (p *parser) resetInsertionMode() {
+	for i := len(p.oe) - 1; i >= 0; i-- {
+		n := p.oe[i]
+		if i == 0 && p.context != nil {
+			n = p.context
+		}
+
+		switch n.DataAtom {
+		case a.Select:
+			p.im = inSelectIM
+		case a.Td, a.Th:
+			p.im = inCellIM
+		case a.Tr:
+			p.im = inRowIM
+		case a.Tbody, a.Thead, a.Tfoot:
+			p.im = inTableBodyIM
+		case a.Caption:
+			p.im = inCaptionIM
+		case a.Colgroup:
+			p.im = inColumnGroupIM
+		case a.Table:
+			p.im = inTableIM
+		case a.Head:
+			p.im = inBodyIM
+		case a.Body:
+			p.im = inBodyIM
+		case a.Frameset:
+			p.im = inFramesetIM
+		case a.Html:
+			p.im = beforeHeadIM
+		default:
+			continue
+		}
+		return
+	}
+	p.im = inBodyIM
+}
+
+const whitespace = " \t\r\n\f"
+
+// Section 12.2.5.4.1.
+func initialIM(p *parser) bool {
+	switch p.tok.Type {
+	case TextToken:
+		p.tok.Data = strings.TrimLeft(p.tok.Data, whitespace)
+		if len(p.tok.Data) == 0 {
+			// It was all whitespace, so ignore it.
+			return true
+		}
+	case CommentToken:
+		p.doc.AppendChild(&Node{
+			Type: CommentNode,
+			Data: p.tok.Data,
+		})
+		return true
+	case DoctypeToken:
+		n, quirks := parseDoctype(p.tok.Data)
+		p.doc.AppendChild(n)
+		p.quirks = quirks
+		p.im = beforeHTMLIM
+		return true
+	}
+	p.quirks = true
+	p.im = beforeHTMLIM
+	return false
+}
+
+// Section 12.2.5.4.2.
+func beforeHTMLIM(p *parser) bool {
+	switch p.tok.Type {
+	case DoctypeToken:
+		// Ignore the token.
+		return true
+	case TextToken:
+		p.tok.Data = strings.TrimLeft(p.tok.Data, whitespace)
+		if len(p.tok.Data) == 0 {
+			// It was all whitespace, so ignore it.
+			return true
+		}
+	case StartTagToken:
+		if p.tok.DataAtom == a.Html {
+			p.addElement()
+			p.im = beforeHeadIM
+			return true
+		}
+	case EndTagToken:
+		switch p.tok.DataAtom {
+		case a.Head, a.Body, a.Html, a.Br:
+			p.parseImpliedToken(StartTagToken, a.Html, a.Html.String())
+			return false
+		default:
+			// Ignore the token.
+			return true
+		}
+	case CommentToken:
+		p.doc.AppendChild(&Node{
+			Type: CommentNode,
+			Data: p.tok.Data,
+		})
+		return true
+	}
+	p.parseImpliedToken(StartTagToken, a.Html, a.Html.String())
+	return false
+}
+
+// Section 12.2.5.4.3.
+func beforeHeadIM(p *parser) bool {
+	switch p.tok.Type {
+	case TextToken:
+		p.tok.Data = strings.TrimLeft(p.tok.Data, whitespace)
+		if len(p.tok.Data) == 0 {
+			// It was all whitespace, so ignore it.
+			return true
+		}
+	case StartTagToken:
+		switch p.tok.DataAtom {
+		case a.Head:
+			p.addElement()
+			p.head = p.top()
+			p.im = inHeadIM
+			return true
+		case a.Html:
+			return inBodyIM(p)
+		}
+	case EndTagToken:
+		switch p.tok.DataAtom {
+		case a.Head, a.Body, a.Html, a.Br:
+			p.parseImpliedToken(StartTagToken, a.Head, a.Head.String())
+			return false
+		default:
+			// Ignore the token.
+			return true
+		}
+	case CommentToken:
+		p.addChild(&Node{
+			Type: CommentNode,
+			Data: p.tok.Data,
+		})
+		return true
+	case DoctypeToken:
+		// Ignore the token.
+		return true
+	}
+
+	p.parseImpliedToken(StartTagToken, a.Head, a.Head.String())
+	return false
+}
+
+// Section 12.2.5.4.4.
+func inHeadIM(p *parser) bool {
+	switch p.tok.Type {
+	case TextToken:
+		s := strings.TrimLeft(p.tok.Data, whitespace)
+		if len(s) < len(p.tok.Data) {
+			// Add the initial whitespace to the current node.
+			p.addText(p.tok.Data[:len(p.tok.Data)-len(s)])
+			if s == "" {
+				return true
+			}
+			p.tok.Data = s
+		}
+	case StartTagToken:
+		switch p.tok.DataAtom {
+		case a.Html:
+			return inBodyIM(p)
+		case a.Base, a.Basefont, a.Bgsound, a.Command, a.Link, a.Meta:
+			p.addElement()
+			p.oe.pop()
+			p.acknowledgeSelfClosingTag()
+			return true
+		case a.Script, a.Title, a.Noscript, a.Noframes, a.Style:
+			p.addElement()
+			p.setOriginalIM()
+			p.im = textIM
+			return true
+		case a.Head:
+			// Ignore the token.
+			return true
+		}
+	case EndTagToken:
+		switch p.tok.DataAtom {
+		case a.Head:
+			n := p.oe.pop()
+			if n.DataAtom != a.Head {
+				panic("html: bad parser state: <head> element not found, in the in-head insertion mode")
+			}
+			p.im = afterHeadIM
+			return true
+		case a.Body, a.Html, a.Br:
+			p.parseImpliedToken(EndTagToken, a.Head, a.Head.String())
+			return false
+		default:
+			// Ignore the token.
+			return true
+		}
+	case CommentToken:
+		p.addChild(&Node{
+			Type: CommentNode,
+			Data: p.tok.Data,
+		})
+		return true
+	case DoctypeToken:
+		// Ignore the token.
+		return true
+	}
+
+	p.parseImpliedToken(EndTagToken, a.Head, a.Head.String())
+	return false
+}
+
+// Section 12.2.5.4.6.
+func afterHeadIM(p *parser) bool {
+	switch p.tok.Type {
+	case TextToken:
+		s := strings.TrimLeft(p.tok.Data, whitespace)
+		if len(s) < len(p.tok.Data) {
+			// Add the initial whitespace to the current node.
+			p.addText(p.tok.Data[:len(p.tok.Data)-len(s)])
+			if s == "" {
+				return true
+			}
+			p.tok.Data = s
+		}
+	case StartTagToken:
+		switch p.tok.DataAtom {
+		case a.Html:
+			return inBodyIM(p)
+		case a.Body:
+			p.addElement()
+			p.framesetOK = false
+			p.im = inBodyIM
+			return true
+		case a.Frameset:
+			p.addElement()
+			p.im = inFramesetIM
+			return true
+		case a.Base, a.Basefont, a.Bgsound, a.Link, a.Meta, a.Noframes, a.Script, a.Style, a.Title:
+			p.oe = append(p.oe, p.head)
+			defer p.oe.remove(p.head)
+			return inHeadIM(p)
+		case a.Head:
+			// Ignore the token.
+			return true
+		}
+	case EndTagToken:
+		switch p.tok.DataAtom {
+		case a.Body, a.Html, a.Br:
+			// Drop down to creating an implied <body> tag.
+		default:
+			// Ignore the token.
+			return true
+		}
+	case CommentToken:
+		p.addChild(&Node{
+			Type: CommentNode,
+			Data: p.tok.Data,
+		})
+		return true
+	case DoctypeToken:
+		// Ignore the token.
+		return true
+	}
+
+	p.parseImpliedToken(StartTagToken, a.Body, a.Body.String())
+	p.framesetOK = true
+	return false
+}
+
+// copyAttributes copies attributes of src not found on dst to dst.
+func copyAttributes(dst *Node, src Token) {
+	if len(src.Attr) == 0 {
+		return
+	}
+	attr := map[string]string{}
+	for _, t := range dst.Attr {
+		attr[t.Key] = t.Val
+	}
+	for _, t := range src.Attr {
+		if _, ok := attr[t.Key]; !ok {
+			dst.Attr = append(dst.Attr, t)
+			attr[t.Key] = t.Val
+		}
+	}
+}
+
+// Section 12.2.5.4.7.
+func inBodyIM(p *parser) bool {
+	switch p.tok.Type {
+	case TextToken:
+		d := p.tok.Data
+		switch n := p.oe.top(); n.DataAtom {
+		case a.Pre, a.Listing:
+			if n.FirstChild == nil {
+				// Ignore a newline at the start of a <pre> block.
+				if d != "" && d[0] == '\r' {
+					d = d[1:]
+				}
+				if d != "" && d[0] == '\n' {
+					d = d[1:]
+				}
+			}
+		}
+		d = strings.Replace(d, "\x00", "", -1)
+		if d == "" {
+			return true
+		}
+		p.reconstructActiveFormattingElements()
+		p.addText(d)
+		if p.framesetOK && strings.TrimLeft(d, whitespace) != "" {
+			// There were non-whitespace characters inserted.
+			p.framesetOK = false
+		}
+	case StartTagToken:
+		switch p.tok.DataAtom {
+		case a.Html:
+			copyAttributes(p.oe[0], p.tok)
+		case a.Base, a.Basefont, a.Bgsound, a.Command, a.Link, a.Meta, a.Noframes, a.Script, a.Style, a.Title:
+			return inHeadIM(p)
+		case a.Body:
+			if len(p.oe) >= 2 {
+				body := p.oe[1]
+				if body.Type == ElementNode && body.DataAtom == a.Body {
+					p.framesetOK = false
+					copyAttributes(body, p.tok)
+				}
+			}
+		case a.Frameset:
+			if !p.framesetOK || len(p.oe) < 2 || p.oe[1].DataAtom != a.Body {
+				// Ignore the token.
+				return true
+			}
+			body := p.oe[1]
+			if body.Parent != nil {
+				body.Parent.RemoveChild(body)
+			}
+			p.oe = p.oe[:1]
+			p.addElement()
+			p.im = inFramesetIM
+			return true
+		case a.Address, a.Article, a.Aside, a.Blockquote, a.Center, a.Details, a.Dir, a.Div, a.Dl, a.Fieldset, a.Figcaption, a.Figure, a.Footer, a.Header, a.Hgroup, a.Menu, a.Nav, a.Ol, a.P, a.Section, a.Summary, a.Ul:
+			p.popUntil(buttonScope, a.P)
+			p.addElement()
+		case a.H1, a.H2, a.H3, a.H4, a.H5, a.H6:
+			p.popUntil(buttonScope, a.P)
+			switch n := p.top(); n.DataAtom {
+			case a.H1, a.H2, a.H3, a.H4, a.H5, a.H6:
+				p.oe.pop()
+			}
+			p.addElement()
+		case a.Pre, a.Listing:
+			p.popUntil(buttonScope, a.P)
+			p.addElement()
+			// The newline, if any, will be dealt with by the TextToken case.
+			p.framesetOK = false
+		case a.Form:
+			if p.form == nil {
+				p.popUntil(buttonScope, a.P)
+				p.addElement()
+				p.form = p.top()
+			}
+		case a.Li:
+			p.framesetOK = false
+			for i := len(p.oe) - 1; i >= 0; i-- {
+				node := p.oe[i]
+				switch node.DataAtom {
+				case a.Li:
+					p.oe = p.oe[:i]
+				case a.Address, a.Div, a.P:
+					continue
+				default:
+					if !isSpecialElement(node) {
+						continue
+					}
+				}
+				break
+			}
+			p.popUntil(buttonScope, a.P)
+			p.addElement()
+		case a.Dd, a.Dt:
+			p.framesetOK = false
+			for i := len(p.oe) - 1; i >= 0; i-- {
+				node := p.oe[i]
+				switch node.DataAtom {
+				case a.Dd, a.Dt:
+					p.oe = p.oe[:i]
+				case a.Address, a.Div, a.P:
+					continue
+				default:
+					if !isSpecialElement(node) {
+						continue
+					}
+				}
+				break
+			}
+			p.popUntil(buttonScope, a.P)
+			p.addElement()
+		case a.Plaintext:
+			p.popUntil(buttonScope, a.P)
+			p.addElement()
+		case a.Button:
+			p.popUntil(defaultScope, a.Button)
+			p.reconstructActiveFormattingElements()
+			p.addElement()
+			p.framesetOK = false
+		case a.A:
+			for i := len(p.afe) - 1; i >= 0 && p.afe[i].Type != scopeMarkerNode; i-- {
+				if n := p.afe[i]; n.Type == ElementNode && n.DataAtom == a.A {
+					p.inBodyEndTagFormatting(a.A)
+					p.oe.remove(n)
+					p.afe.remove(n)
+					break
+				}
+			}
+			p.reconstructActiveFormattingElements()
+			p.addFormattingElement()
+		case a.B, a.Big, a.Code, a.Em, a.Font, a.I, a.S, a.Small, a.Strike, a.Strong, a.Tt, a.U:
+			p.reconstructActiveFormattingElements()
+			p.addFormattingElement()
+		case a.Nobr:
+			p.reconstructActiveFormattingElements()
+			if p.elementInScope(defaultScope, a.Nobr) {
+				p.inBodyEndTagFormatting(a.Nobr)
+				p.reconstructActiveFormattingElements()
+			}
+			p.addFormattingElement()
+		case a.Applet, a.Marquee, a.Object:
+			p.reconstructActiveFormattingElements()
+			p.addElement()
+			p.afe = append(p.afe, &scopeMarker)
+			p.framesetOK = false
+		case a.Table:
+			if !p.quirks {
+				p.popUntil(buttonScope, a.P)
+			}
+			p.addElement()
+			p.framesetOK = false
+			p.im = inTableIM
+			return true
+		case a.Area, a.Br, a.Embed, a.Img, a.Input, a.Keygen, a.Wbr:
+			p.reconstructActiveFormattingElements()
+			p.addElement()
+			p.oe.pop()
+			p.acknowledgeSelfClosingTag()
+			if p.tok.DataAtom == a.Input {
+				for _, t := range p.tok.Attr {
+					if t.Key == "type" {
+						if strings.ToLower(t.Val) == "hidden" {
+							// Skip setting framesetOK = false
+							return true
+						}
+					}
+				}
+			}
+			p.framesetOK = false
+		case a.Param, a.Source, a.Track:
+			p.addElement()
+			p.oe.pop()
+			p.acknowledgeSelfClosingTag()
+		case a.Hr:
+			p.popUntil(buttonScope, a.P)
+			p.addElement()
+			p.oe.pop()
+			p.acknowledgeSelfClosingTag()
+			p.framesetOK = false
+		case a.Image:
+			p.tok.DataAtom = a.Img
+			p.tok.Data = a.Img.String()
+			return false
+		case a.Isindex:
+			if p.form != nil {
+				// Ignore the token.
+				return true
+			}
+			action := ""
+			prompt := "This is a searchable index. Enter search keywords: "
+			attr := []Attribute{{Key: "name", Val: "isindex"}}
+			for _, t := range p.tok.Attr {
+				switch t.Key {
+				case "action":
+					action = t.Val
+				case "name":
+					// Ignore the attribute.
+				case "prompt":
+					prompt = t.Val
+				default:
+					attr = append(attr, t)
+				}
+			}
+			p.acknowledgeSelfClosingTag()
+			p.popUntil(buttonScope, a.P)
+			p.parseImpliedToken(StartTagToken, a.Form, a.Form.String())
+			if action != "" {
+				p.form.Attr = []Attribute{{Key: "action", Val: action}}
+			}
+			p.parseImpliedToken(StartTagToken, a.Hr, a.Hr.String())
+			p.parseImpliedToken(StartTagToken, a.Label, a.Label.String())
+			p.addText(prompt)
+			p.addChild(&Node{
+				Type:     ElementNode,
+				DataAtom: a.Input,
+				Data:     a.Input.String(),
+				Attr:     attr,
+			})
+			p.oe.pop()
+			p.parseImpliedToken(EndTagToken, a.Label, a.Label.String())
+			p.parseImpliedToken(StartTagToken, a.Hr, a.Hr.String())
+			p.parseImpliedToken(EndTagToken, a.Form, a.Form.String())
+		case a.Textarea:
+			p.addElement()
+			p.setOriginalIM()
+			p.framesetOK = false
+			p.im = textIM
+		case a.Xmp:
+			p.popUntil(buttonScope, a.P)
+			p.reconstructActiveFormattingElements()
+			p.framesetOK = false
+			p.addElement()
+			p.setOriginalIM()
+			p.im = textIM
+		case a.Iframe:
+			p.framesetOK = false
+			p.addElement()
+			p.setOriginalIM()
+			p.im = textIM
+		case a.Noembed, a.Noscript:
+			p.addElement()
+			p.setOriginalIM()
+			p.im = textIM
+		case a.Select:
+			p.reconstructActiveFormattingElements()
+			p.addElement()
+			p.framesetOK = false
+			p.im = inSelectIM
+			return true
+		case a.Optgroup, a.Option:
+			if p.top().DataAtom == a.Option {
+				p.oe.pop()
+			}
+			p.reconstructActiveFormattingElements()
+			p.addElement()
+		case a.Rp, a.Rt:
+			if p.elementInScope(defaultScope, a.Ruby) {
+				p.generateImpliedEndTags()
+			}
+			p.addElement()
+		case a.Math, a.Svg:
+			p.reconstructActiveFormattingElements()
+			if p.tok.DataAtom == a.Math {
+				adjustAttributeNames(p.tok.Attr, mathMLAttributeAdjustments)
+			} else {
+				adjustAttributeNames(p.tok.Attr, svgAttributeAdjustments)
+			}
+			adjustForeignAttributes(p.tok.Attr)
+			p.addElement()
+			p.top().Namespace = p.tok.Data
+			if p.hasSelfClosingToken {
+				p.oe.pop()
+				p.acknowledgeSelfClosingTag()
+			}
+			return true
+		case a.Caption, a.Col, a.Colgroup, a.Frame, a.Head, a.Tbody, a.Td, a.Tfoot, a.Th, a.Thead, a.Tr:
+			// Ignore the token.
+		default:
+			p.reconstructActiveFormattingElements()
+			p.addElement()
+		}
+	case EndTagToken:
+		switch p.tok.DataAtom {
+		case a.Body:
+			if p.elementInScope(defaultScope, a.Body) {
+				p.im = afterBodyIM
+			}
+		case a.Html:
+			if p.elementInScope(defaultScope, a.Body) {
+				p.parseImpliedToken(EndTagToken, a.Body, a.Body.String())
+				return false
+			}
+			return true
+		case a.Address, a.Article, a.Aside, a.Blockquote, a.Button, a.Center, a.Details, a.Dir, a.Div, a.Dl, a.Fieldset, a.Figcaption, a.Figure, a.Footer, a.Header, a.Hgroup, a.Listing, a.Menu, a.Nav, a.Ol, a.Pre, a.Section, a.Summary, a.Ul:
+			p.popUntil(defaultScope, p.tok.DataAtom)
+		case a.Form:
+			node := p.form
+			p.form = nil
+			i := p.indexOfElementInScope(defaultScope, a.Form)
+			if node == nil || i == -1 || p.oe[i] != node {
+				// Ignore the token.
+				return true
+			}
+			p.generateImpliedEndTags()
+			p.oe.remove(node)
+		case a.P:
+			if !p.elementInScope(buttonScope, a.P) {
+				p.parseImpliedToken(StartTagToken, a.P, a.P.String())
+			}
+			p.popUntil(buttonScope, a.P)
+		case a.Li:
+			p.popUntil(listItemScope, a.Li)
+		case a.Dd, a.Dt:
+			p.popUntil(defaultScope, p.tok.DataAtom)
+		case a.H1, a.H2, a.H3, a.H4, a.H5, a.H6:
+			p.popUntil(defaultScope, a.H1, a.H2, a.H3, a.H4, a.H5, a.H6)
+		case a.A, a.B, a.Big, a.Code, a.Em, a.Font, a.I, a.Nobr, a.S, a.Small, a.Strike, a.Strong, a.Tt, a.U:
+			p.inBodyEndTagFormatting(p.tok.DataAtom)
+		case a.Applet, a.Marquee, a.Object:
+			if p.popUntil(defaultScope, p.tok.DataAtom) {
+				p.clearActiveFormattingElements()
+			}
+		case a.Br:
+			p.tok.Type = StartTagToken
+			return false
+		default:
+			p.inBodyEndTagOther(p.tok.DataAtom)
+		}
+	case CommentToken:
+		p.addChild(&Node{
+			Type: CommentNode,
+			Data: p.tok.Data,
+		})
+	}
+
+	return true
+}
+
+func (p *parser) inBodyEndTagFormatting(tagAtom a.Atom) {
+	// This is the "adoption agency" algorithm, described at
+	// https://html.spec.whatwg.org/multipage/syntax.html#adoptionAgency
+
+	// TODO: this is a fairly literal line-by-line translation of that algorithm.
+	// Once the code successfully parses the comprehensive test suite, we should
+	// refactor this code to be more idiomatic.
+
+	// Steps 1-4. The outer loop.
+	for i := 0; i < 8; i++ {
+		// Step 5. Find the formatting element.
+		var formattingElement *Node
+		for j := len(p.afe) - 1; j >= 0; j-- {
+			if p.afe[j].Type == scopeMarkerNode {
+				break
+			}
+			if p.afe[j].DataAtom == tagAtom {
+				formattingElement = p.afe[j]
+				break
+			}
+		}
+		if formattingElement == nil {
+			p.inBodyEndTagOther(tagAtom)
+			return
+		}
+		feIndex := p.oe.index(formattingElement)
+		if feIndex == -1 {
+			p.afe.remove(formattingElement)
+			return
+		}
+		if !p.elementInScope(defaultScope, tagAtom) {
+			// Ignore the tag.
+			return
+		}
+
+		// Steps 9-10. Find the furthest block.
+		var furthestBlock *Node
+		for _, e := range p.oe[feIndex:] {
+			if isSpecialElement(e) {
+				furthestBlock = e
+				break
+			}
+		}
+		if furthestBlock == nil {
+			e := p.oe.pop()
+			for e != formattingElement {
+				e = p.oe.pop()
+			}
+			p.afe.remove(e)
+			return
+		}
+
+		// Steps 11-12. Find the common ancestor and bookmark node.
+		commonAncestor := p.oe[feIndex-1]
+		bookmark := p.afe.index(formattingElement)
+
+		// Step 13. The inner loop. Find the lastNode to reparent.
+		lastNode := furthestBlock
+		node := furthestBlock
+		x := p.oe.index(node)
+		// Steps 13.1-13.2
+		for j := 0; j < 3; j++ {
+			// Step 13.3.
+			x--
+			node = p.oe[x]
+			// Step 13.4 - 13.5.
+			if p.afe.index(node) == -1 {
+				p.oe.remove(node)
+				continue
+			}
+			// Step 13.6.
+			if node == formattingElement {
+				break
+			}
+			// Step 13.7.
+			clone := node.clone()
+			p.afe[p.afe.index(node)] = clone
+			p.oe[p.oe.index(node)] = clone
+			node = clone
+			// Step 13.8.
+			if lastNode == furthestBlock {
+				bookmark = p.afe.index(node) + 1
+			}
+			// Step 13.9.
+			if lastNode.Parent != nil {
+				lastNode.Parent.RemoveChild(lastNode)
+			}
+			node.AppendChild(lastNode)
+			// Step 13.10.
+			lastNode = node
+		}
+
+		// Step 14. Reparent lastNode to the common ancestor,
+		// or for misnested table nodes, to the foster parent.
+		if lastNode.Parent != nil {
+			lastNode.Parent.RemoveChild(lastNode)
+		}
+		switch commonAncestor.DataAtom {
+		case a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr:
+			p.fosterParent(lastNode)
+		default:
+			commonAncestor.AppendChild(lastNode)
+		}
+
+		// Steps 15-17. Reparent nodes from the furthest block's children
+		// to a clone of the formatting element.
+		clone := formattingElement.clone()
+		reparentChildren(clone, furthestBlock)
+		furthestBlock.AppendChild(clone)
+
+		// Step 18. Fix up the list of active formatting elements.
+		if oldLoc := p.afe.index(formattingElement); oldLoc != -1 && oldLoc < bookmark {
+			// Move the bookmark with the rest of the list.
+			bookmark--
+		}
+		p.afe.remove(formattingElement)
+		p.afe.insert(bookmark, clone)
+
+		// Step 19. Fix up the stack of open elements.
+		p.oe.remove(formattingElement)
+		p.oe.insert(p.oe.index(furthestBlock)+1, clone)
+	}
+}
+
+// inBodyEndTagOther performs the "any other end tag" algorithm for inBodyIM.
+// "Any other end tag" handling from 12.2.5.5 The rules for parsing tokens in foreign content
+// https://html.spec.whatwg.org/multipage/syntax.html#parsing-main-inforeign
+func (p *parser) inBodyEndTagOther(tagAtom a.Atom) {
+	for i := len(p.oe) - 1; i >= 0; i-- {
+		if p.oe[i].DataAtom == tagAtom {
+			p.oe = p.oe[:i]
+			break
+		}
+		if isSpecialElement(p.oe[i]) {
+			break
+		}
+	}
+}
+
+// Section 12.2.5.4.8.
+func textIM(p *parser) bool {
+	switch p.tok.Type {
+	case ErrorToken:
+		p.oe.pop()
+	case TextToken:
+		d := p.tok.Data
+		if n := p.oe.top(); n.DataAtom == a.Textarea && n.FirstChild == nil {
+			// Ignore a newline at the start of a <textarea> block.
+			if d != "" && d[0] == '\r' {
+				d = d[1:]
+			}
+			if d != "" && d[0] == '\n' {
+				d = d[1:]
+			}
+		}
+		if d == "" {
+			return true
+		}
+		p.addText(d)
+		return true
+	case EndTagToken:
+		p.oe.pop()
+	}
+	p.im = p.originalIM
+	p.originalIM = nil
+	return p.tok.Type == EndTagToken
+}
+
+// Section 12.2.5.4.9.
+func inTableIM(p *parser) bool {
+	switch p.tok.Type {
+	case ErrorToken:
+		// Stop parsing.
+		return true
+	case TextToken:
+		p.tok.Data = strings.Replace(p.tok.Data, "\x00", "", -1)
+		switch p.oe.top().DataAtom {
+		case a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr:
+			if strings.Trim(p.tok.Data, whitespace) == "" {
+				p.addText(p.tok.Data)
+				return true
+			}
+		}
+	case StartTagToken:
+		switch p.tok.DataAtom {
+		case a.Caption:
+			p.clearStackToContext(tableScope)
+			p.afe = append(p.afe, &scopeMarker)
+			p.addElement()
+			p.im = inCaptionIM
+			return true
+		case a.Colgroup:
+			p.clearStackToContext(tableScope)
+			p.addElement()
+			p.im = inColumnGroupIM
+			return true
+		case a.Col:
+			p.parseImpliedToken(StartTagToken, a.Colgroup, a.Colgroup.String())
+			return false
+		case a.Tbody, a.Tfoot, a.Thead:
+			p.clearStackToContext(tableScope)
+			p.addElement()
+			p.im = inTableBodyIM
+			return true
+		case a.Td, a.Th, a.Tr:
+			p.parseImpliedToken(StartTagToken, a.Tbody, a.Tbody.String())
+			return false
+		case a.Table:
+			if p.popUntil(tableScope, a.Table) {
+				p.resetInsertionMode()
+				return false
+			}
+			// Ignore the token.
+			return true
+		case a.Style, a.Script:
+			return inHeadIM(p)
+		case a.Input:
+			for _, t := range p.tok.Attr {
+				if t.Key == "type" && strings.ToLower(t.Val) == "hidden" {
+					p.addElement()
+					p.oe.pop()
+					return true
+				}
+			}
+			// Otherwise drop down to the default action.
+		case a.Form:
+			if p.form != nil {
+				// Ignore the token.
+				return true
+			}
+			p.addElement()
+			p.form = p.oe.pop()
+		case a.Select:
+			p.reconstructActiveFormattingElements()
+			switch p.top().DataAtom {
+			case a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr:
+				p.fosterParenting = true
+			}
+			p.addElement()
+			p.fosterParenting = false
+			p.framesetOK = false
+			p.im = inSelectInTableIM
+			return true
+		}
+	case EndTagToken:
+		switch p.tok.DataAtom {
+		case a.Table:
+			if p.popUntil(tableScope, a.Table) {
+				p.resetInsertionMode()
+				return true
+			}
+			// Ignore the token.
+			return true
+		case a.Body, a.Caption, a.Col, a.Colgroup, a.Html, a.Tbody, a.Td, a.Tfoot, a.Th, a.Thead, a.Tr:
+			// Ignore the token.
+			return true
+		}
+	case CommentToken:
+		p.addChild(&Node{
+			Type: CommentNode,
+			Data: p.tok.Data,
+		})
+		return true
+	case DoctypeToken:
+		// Ignore the token.
+		return true
+	}
+
+	p.fosterParenting = true
+	defer func() { p.fosterParenting = false }()
+
+	return inBodyIM(p)
+}
+
+// Section 12.2.5.4.11.
+func inCaptionIM(p *parser) bool {
+	switch p.tok.Type {
+	case StartTagToken:
+		switch p.tok.DataAtom {
+		case a.Caption, a.Col, a.Colgroup, a.Tbody, a.Td, a.Tfoot, a.Thead, a.Tr:
+			if p.popUntil(tableScope, a.Caption) {
+				p.clearActiveFormattingElements()
+				p.im = inTableIM
+				return false
+			} else {
+				// Ignore the token.
+				return true
+			}
+		case a.Select:
+			p.reconstructActiveFormattingElements()
+			p.addElement()
+			p.framesetOK = false
+			p.im = inSelectInTableIM
+			return true
+		}
+	case EndTagToken:
+		switch p.tok.DataAtom {
+		case a.Caption:
+			if p.popUntil(tableScope, a.Caption) {
+				p.clearActiveFormattingElements()
+				p.im = inTableIM
+			}
+			return true
+		case a.Table:
+			if p.popUntil(tableScope, a.Caption) {
+				p.clearActiveFormattingElements()
+				p.im = inTableIM
+				return false
+			} else {
+				// Ignore the token.
+				return true
+			}
+		case a.Body, a.Col, a.Colgroup, a.Html, a.Tbody, a.Td, a.Tfoot, a.Th, a.Thead, a.Tr:
+			// Ignore the token.
+			return true
+		}
+	}
+	return inBodyIM(p)
+}
+
+// Section 12.2.5.4.12.
+func inColumnGroupIM(p *parser) bool {
+	switch p.tok.Type {
+	case TextToken:
+		s := strings.TrimLeft(p.tok.Data, whitespace)
+		if len(s) < len(p.tok.Data) {
+			// Add the initial whitespace to the current node.
+			p.addText(p.tok.Data[:len(p.tok.Data)-len(s)])
+			if s == "" {
+				return true
+			}
+			p.tok.Data = s
+		}
+	case CommentToken:
+		p.addChild(&Node{
+			Type: CommentNode,
+			Data: p.tok.Data,
+		})
+		return true
+	case DoctypeToken:
+		// Ignore the token.
+		return true
+	case StartTagToken:
+		switch p.tok.DataAtom {
+		case a.Html:
+			return inBodyIM(p)
+		case a.Col:
+			p.addElement()
+			p.oe.pop()
+			p.acknowledgeSelfClosingTag()
+			return true
+		}
+	case EndTagToken:
+		switch p.tok.DataAtom {
+		case a.Colgroup:
+			if p.oe.top().DataAtom != a.Html {
+				p.oe.pop()
+				p.im = inTableIM
+			}
+			return true
+		case a.Col:
+			// Ignore the token.
+			return true
+		}
+	}
+	if p.oe.top().DataAtom != a.Html {
+		p.oe.pop()
+		p.im = inTableIM
+		return false
+	}
+	return true
+}
+
+// Section 12.2.5.4.13.
+func inTableBodyIM(p *parser) bool {
+	switch p.tok.Type {
+	case StartTagToken:
+		switch p.tok.DataAtom {
+		case a.Tr:
+			p.clearStackToContext(tableBodyScope)
+			p.addElement()
+			p.im = inRowIM
+			return true
+		case a.Td, a.Th:
+			p.parseImpliedToken(StartTagToken, a.Tr, a.Tr.String())
+			return false
+		case a.Caption, a.Col, a.Colgroup, a.Tbody, a.Tfoot, a.Thead:
+			if p.popUntil(tableScope, a.Tbody, a.Thead, a.Tfoot) {
+				p.im = inTableIM
+				return false
+			}
+			// Ignore the token.
+			return true
+		}
+	case EndTagToken:
+		switch p.tok.DataAtom {
+		case a.Tbody, a.Tfoot, a.Thead:
+			if p.elementInScope(tableScope, p.tok.DataAtom) {
+				p.clearStackToContext(tableBodyScope)
+				p.oe.pop()
+				p.im = inTableIM
+			}
+			return true
+		case a.Table:
+			if p.popUntil(tableScope, a.Tbody, a.Thead, a.Tfoot) {
+				p.im = inTableIM
+				return false
+			}
+			// Ignore the token.
+			return true
+		case a.Body, a.Caption, a.Col, a.Colgroup, a.Html, a.Td, a.Th, a.Tr:
+			// Ignore the token.
+			return true
+		}
+	case CommentToken:
+		p.addChild(&Node{
+			Type: CommentNode,
+			Data: p.tok.Data,
+		})
+		return true
+	}
+
+	return inTableIM(p)
+}
+
+// Section 12.2.5.4.14.
+func inRowIM(p *parser) bool {
+	switch p.tok.Type {
+	case StartTagToken:
+		switch p.tok.DataAtom {
+		case a.Td, a.Th:
+			p.clearStackToContext(tableRowScope)
+			p.addElement()
+			p.afe = append(p.afe, &scopeMarker)
+			p.im = inCellIM
+			return true
+		case a.Caption, a.Col, a.Colgroup, a.Tbody, a.Tfoot, a.Thead, a.Tr:
+			if p.popUntil(tableScope, a.Tr) {
+				p.im = inTableBodyIM
+				return false
+			}
+			// Ignore the token.
+			return true
+		}
+	case EndTagToken:
+		switch p.tok.DataAtom {
+		case a.Tr:
+			if p.popUntil(tableScope, a.Tr) {
+				p.im = inTableBodyIM
+				return true
+			}
+			// Ignore the token.
+			return true
+		case a.Table:
+			if p.popUntil(tableScope, a.Tr) {
+				p.im = inTableBodyIM
+				return false
+			}
+			// Ignore the token.
+			return true
+		case a.Tbody, a.Tfoot, a.Thead:
+			if p.elementInScope(tableScope, p.tok.DataAtom) {
+				p.parseImpliedToken(EndTagToken, a.Tr, a.Tr.String())
+				return false
+			}
+			// Ignore the token.
+			return true
+		case a.Body, a.Caption, a.Col, a.Colgroup, a.Html, a.Td, a.Th:
+			// Ignore the token.
+			return true
+		}
+	}
+
+	return inTableIM(p)
+}
+
+// Section 12.2.5.4.15.
+func inCellIM(p *parser) bool {
+	switch p.tok.Type {
+	case StartTagToken:
+		switch p.tok.DataAtom {
+		case a.Caption, a.Col, a.Colgroup, a.Tbody, a.Td, a.Tfoot, a.Th, a.Thead, a.Tr:
+			if p.popUntil(tableScope, a.Td, a.Th) {
+				// Close the cell and reprocess.
+				p.clearActiveFormattingElements()
+				p.im = inRowIM
+				return false
+			}
+			// Ignore the token.
+			return true
+		case a.Select:
+			p.reconstructActiveFormattingElements()
+			p.addElement()
+			p.framesetOK = false
+			p.im = inSelectInTableIM
+			return true
+		}
+	case EndTagToken:
+		switch p.tok.DataAtom {
+		case a.Td, a.Th:
+			if !p.popUntil(tableScope, p.tok.DataAtom) {
+				// Ignore the token.
+				return true
+			}
+			p.clearActiveFormattingElements()
+			p.im = inRowIM
+			return true
+		case a.Body, a.Caption, a.Col, a.Colgroup, a.Html:
+			// Ignore the token.
+			return true
+		case a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr:
+			if !p.elementInScope(tableScope, p.tok.DataAtom) {
+				// Ignore the token.
+				return true
+			}
+			// Close the cell and reprocess.
+			p.popUntil(tableScope, a.Td, a.Th)
+			p.clearActiveFormattingElements()
+			p.im = inRowIM
+			return false
+		}
+	}
+	return inBodyIM(p)
+}
+
+// Section 12.2.5.4.16.
+func inSelectIM(p *parser) bool {
+	switch p.tok.Type {
+	case ErrorToken:
+		// Stop parsing.
+		return true
+	case TextToken:
+		p.addText(strings.Replace(p.tok.Data, "\x00", "", -1))
+	case StartTagToken:
+		switch p.tok.DataAtom {
+		case a.Html:
+			return inBodyIM(p)
+		case a.Option:
+			if p.top().DataAtom == a.Option {
+				p.oe.pop()
+			}
+			p.addElement()
+		case a.Optgroup:
+			if p.top().DataAtom == a.Option {
+				p.oe.pop()
+			}
+			if p.top().DataAtom == a.Optgroup {
+				p.oe.pop()
+			}
+			p.addElement()
+		case a.Select:
+			p.tok.Type = EndTagToken
+			return false
+		case a.Input, a.Keygen, a.Textarea:
+			if p.elementInScope(selectScope, a.Select) {
+				p.parseImpliedToken(EndTagToken, a.Select, a.Select.String())
+				return false
+			}
+			// In order to properly ignore <textarea>, we need to change the tokenizer mode.
+			p.tokenizer.NextIsNotRawText()
+			// Ignore the token.
+			return true
+		case a.Script:
+			return inHeadIM(p)
+		}
+	case EndTagToken:
+		switch p.tok.DataAtom {
+		case a.Option:
+			if p.top().DataAtom == a.Option {
+				p.oe.pop()
+			}
+		case a.Optgroup:
+			i := len(p.oe) - 1
+			if p.oe[i].DataAtom == a.Option {
+				i--
+			}
+			if p.oe[i].DataAtom == a.Optgroup {
+				p.oe = p.oe[:i]
+			}
+		case a.Select:
+			if p.popUntil(selectScope, a.Select) {
+				p.resetInsertionMode()
+			}
+		}
+	case CommentToken:
+		p.addChild(&Node{
+			Type: CommentNode,
+			Data: p.tok.Data,
+		})
+	case DoctypeToken:
+		// Ignore the token.
+		return true
+	}
+
+	return true
+}
+
+// Section 12.2.5.4.17.
+func inSelectInTableIM(p *parser) bool {
+	switch p.tok.Type {
+	case StartTagToken, EndTagToken:
+		switch p.tok.DataAtom {
+		case a.Caption, a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr, a.Td, a.Th:
+			if p.tok.Type == StartTagToken || p.elementInScope(tableScope, p.tok.DataAtom) {
+				p.parseImpliedToken(EndTagToken, a.Select, a.Select.String())
+				return false
+			} else {
+				// Ignore the token.
+				return true
+			}
+		}
+	}
+	return inSelectIM(p)
+}
+
+// Section 12.2.5.4.18.
+func afterBodyIM(p *parser) bool {
+	switch p.tok.Type {
+	case ErrorToken:
+		// Stop parsing.
+		return true
+	case TextToken:
+		s := strings.TrimLeft(p.tok.Data, whitespace)
+		if len(s) == 0 {
+			// It was all whitespace.
+			return inBodyIM(p)
+		}
+	case StartTagToken:
+		if p.tok.DataAtom == a.Html {
+			return inBodyIM(p)
+		}
+	case EndTagToken:
+		if p.tok.DataAtom == a.Html {
+			if !p.fragment {
+				p.im = afterAfterBodyIM
+			}
+			return true
+		}
+	case CommentToken:
+		// The comment is attached to the <html> element.
+		if len(p.oe) < 1 || p.oe[0].DataAtom != a.Html {
+			panic("html: bad parser state: <html> element not found, in the after-body insertion mode")
+		}
+		p.oe[0].AppendChild(&Node{
+			Type: CommentNode,
+			Data: p.tok.Data,
+		})
+		return true
+	}
+	p.im = inBodyIM
+	return false
+}
+
+// Section 12.2.5.4.19.
+func inFramesetIM(p *parser) bool {
+	switch p.tok.Type {
+	case CommentToken:
+		p.addChild(&Node{
+			Type: CommentNode,
+			Data: p.tok.Data,
+		})
+	case TextToken:
+		// Ignore all text but whitespace.
+		s := strings.Map(func(c rune) rune {
+			switch c {
+			case ' ', '\t', '\n', '\f', '\r':
+				return c
+			}
+			return -1
+		}, p.tok.Data)
+		if s != "" {
+			p.addText(s)
+		}
+	case StartTagToken:
+		switch p.tok.DataAtom {
+		case a.Html:
+			return inBodyIM(p)
+		case a.Frameset:
+			p.addElement()
+		case a.Frame:
+			p.addElement()
+			p.oe.pop()
+			p.acknowledgeSelfClosingTag()
+		case a.Noframes:
+			return inHeadIM(p)
+		}
+	case EndTagToken:
+		switch p.tok.DataAtom {
+		case a.Frameset:
+			if p.oe.top().DataAtom != a.Html {
+				p.oe.pop()
+				if p.oe.top().DataAtom != a.Frameset {
+					p.im = afterFramesetIM
+					return true
+				}
+			}
+		}
+	default:
+		// Ignore the token.
+	}
+	return true
+}
+
+// Section 12.2.5.4.20.
+func afterFramesetIM(p *parser) bool {
+	switch p.tok.Type {
+	case CommentToken:
+		p.addChild(&Node{
+			Type: CommentNode,
+			Data: p.tok.Data,
+		})
+	case TextToken:
+		// Ignore all text but whitespace.
+		s := strings.Map(func(c rune) rune {
+			switch c {
+			case ' ', '\t', '\n', '\f', '\r':
+				return c
+			}
+			return -1
+		}, p.tok.Data)
+		if s != "" {
+			p.addText(s)
+		}
+	case StartTagToken:
+		switch p.tok.DataAtom {
+		case a.Html:
+			return inBodyIM(p)
+		case a.Noframes:
+			return inHeadIM(p)
+		}
+	case EndTagToken:
+		switch p.tok.DataAtom {
+		case a.Html:
+			p.im = afterAfterFramesetIM
+			return true
+		}
+	default:
+		// Ignore the token.
+	}
+	return true
+}
+
+// Section 12.2.5.4.21.
+func afterAfterBodyIM(p *parser) bool {
+	switch p.tok.Type {
+	case ErrorToken:
+		// Stop parsing.
+		return true
+	case TextToken:
+		s := strings.TrimLeft(p.tok.Data, whitespace)
+		if len(s) == 0 {
+			// It was all whitespace.
+			return inBodyIM(p)
+		}
+	case StartTagToken:
+		if p.tok.DataAtom == a.Html {
+			return inBodyIM(p)
+		}
+	case CommentToken:
+		p.doc.AppendChild(&Node{
+			Type: CommentNode,
+			Data: p.tok.Data,
+		})
+		return true
+	case DoctypeToken:
+		return inBodyIM(p)
+	}
+	p.im = inBodyIM
+	return false
+}
+
+// Section 12.2.5.4.22.
+func afterAfterFramesetIM(p *parser) bool {
+	switch p.tok.Type {
+	case CommentToken:
+		p.doc.AppendChild(&Node{
+			Type: CommentNode,
+			Data: p.tok.Data,
+		})
+	case TextToken:
+		// Ignore all text but whitespace.
+		s := strings.Map(func(c rune) rune {
+			switch c {
+			case ' ', '\t', '\n', '\f', '\r':
+				return c
+			}
+			return -1
+		}, p.tok.Data)
+		if s != "" {
+			p.tok.Data = s
+			return inBodyIM(p)
+		}
+	case StartTagToken:
+		switch p.tok.DataAtom {
+		case a.Html:
+			return inBodyIM(p)
+		case a.Noframes:
+			return inHeadIM(p)
+		}
+	case DoctypeToken:
+		return inBodyIM(p)
+	default:
+		// Ignore the token.
+	}
+	return true
+}
+
+const whitespaceOrNUL = whitespace + "\x00"
+
+// Section 12.2.5.5.
+func parseForeignContent(p *parser) bool {
+	switch p.tok.Type {
+	case TextToken:
+		if p.framesetOK {
+			p.framesetOK = strings.TrimLeft(p.tok.Data, whitespaceOrNUL) == ""
+		}
+		p.tok.Data = strings.Replace(p.tok.Data, "\x00", "\ufffd", -1)
+		p.addText(p.tok.Data)
+	case CommentToken:
+		p.addChild(&Node{
+			Type: CommentNode,
+			Data: p.tok.Data,
+		})
+	case StartTagToken:
+		b := breakout[p.tok.Data]
+		if p.tok.DataAtom == a.Font {
+		loop:
+			for _, attr := range p.tok.Attr {
+				switch attr.Key {
+				case "color", "face", "size":
+					b = true
+					break loop
+				}
+			}
+		}
+		if b {
+			for i := len(p.oe) - 1; i >= 0; i-- {
+				n := p.oe[i]
+				if n.Namespace == "" || htmlIntegrationPoint(n) || mathMLTextIntegrationPoint(n) {
+					p.oe = p.oe[:i+1]
+					break
+				}
+			}
+			return false
+		}
+		switch p.top().Namespace {
+		case "math":
+			adjustAttributeNames(p.tok.Attr, mathMLAttributeAdjustments)
+		case "svg":
+			// Adjust SVG tag names. The tokenizer lower-cases tag names, but
+			// SVG wants e.g. "foreignObject" with a capital second "O".
+			if x := svgTagNameAdjustments[p.tok.Data]; x != "" {
+				p.tok.DataAtom = a.Lookup([]byte(x))
+				p.tok.Data = x
+			}
+			adjustAttributeNames(p.tok.Attr, svgAttributeAdjustments)
+		default:
+			panic("html: bad parser state: unexpected namespace")
+		}
+		adjustForeignAttributes(p.tok.Attr)
+		namespace := p.top().Namespace
+		p.addElement()
+		p.top().Namespace = namespace
+		if namespace != "" {
+			// Don't let the tokenizer go into raw text mode in foreign content
+			// (e.g. in an SVG <title> tag).
+			p.tokenizer.NextIsNotRawText()
+		}
+		if p.hasSelfClosingToken {
+			p.oe.pop()
+			p.acknowledgeSelfClosingTag()
+		}
+	case EndTagToken:
+		for i := len(p.oe) - 1; i >= 0; i-- {
+			if p.oe[i].Namespace == "" {
+				return p.im(p)
+			}
+			if strings.EqualFold(p.oe[i].Data, p.tok.Data) {
+				p.oe = p.oe[:i]
+				break
+			}
+		}
+		return true
+	default:
+		// Ignore the token.
+	}
+	return true
+}
+
+// Section 12.2.5.
+func (p *parser) inForeignContent() bool {
+	if len(p.oe) == 0 {
+		return false
+	}
+	n := p.oe[len(p.oe)-1]
+	if n.Namespace == "" {
+		return false
+	}
+	if mathMLTextIntegrationPoint(n) {
+		if p.tok.Type == StartTagToken && p.tok.DataAtom != a.Mglyph && p.tok.DataAtom != a.Malignmark {
+			return false
+		}
+		if p.tok.Type == TextToken {
+			return false
+		}
+	}
+	if n.Namespace == "math" && n.DataAtom == a.AnnotationXml && p.tok.Type == StartTagToken && p.tok.DataAtom == a.Svg {
+		return false
+	}
+	if htmlIntegrationPoint(n) && (p.tok.Type == StartTagToken || p.tok.Type == TextToken) {
+		return false
+	}
+	if p.tok.Type == ErrorToken {
+		return false
+	}
+	return true
+}
+
+// parseImpliedToken parses a token as though it had appeared in the parser's
+// input.
+func (p *parser) parseImpliedToken(t TokenType, dataAtom a.Atom, data string) {
+	realToken, selfClosing := p.tok, p.hasSelfClosingToken
+	p.tok = Token{
+		Type:     t,
+		DataAtom: dataAtom,
+		Data:     data,
+	}
+	p.hasSelfClosingToken = false
+	p.parseCurrentToken()
+	p.tok, p.hasSelfClosingToken = realToken, selfClosing
+}
+
+// parseCurrentToken runs the current token through the parsing routines
+// until it is consumed.
+func (p *parser) parseCurrentToken() {
+	if p.tok.Type == SelfClosingTagToken {
+		p.hasSelfClosingToken = true
+		p.tok.Type = StartTagToken
+	}
+
+	consumed := false
+	for !consumed {
+		if p.inForeignContent() {
+			consumed = parseForeignContent(p)
+		} else {
+			consumed = p.im(p)
+		}
+	}
+
+	if p.hasSelfClosingToken {
+		// This is a parse error, but ignore it.
+		p.hasSelfClosingToken = false
+	}
+}
+
+func (p *parser) parse() error {
+	// Iterate until EOF. Any other error will cause an early return.
+	var err error
+	for err != io.EOF {
+		// CDATA sections are allowed only in foreign content.
+		n := p.oe.top()
+		p.tokenizer.AllowCDATA(n != nil && n.Namespace != "")
+		// Read and parse the next token.
+		p.tokenizer.Next()
+		p.tok = p.tokenizer.Token()
+		if p.tok.Type == ErrorToken {
+			err = p.tokenizer.Err()
+			if err != nil && err != io.EOF {
+				return err
+			}
+		}
+		p.parseCurrentToken()
+	}
+	return nil
+}
+
+// Parse returns the parse tree for the HTML from the given Reader.
+// The input is assumed to be UTF-8 encoded.
+func Parse(r io.Reader) (*Node, error) {
+	p := &parser{
+		tokenizer: NewTokenizer(r),
+		doc: &Node{
+			Type: DocumentNode,
+		},
+		scripting:  true,
+		framesetOK: true,
+		im:         initialIM,
+	}
+	err := p.parse()
+	if err != nil {
+		return nil, err
+	}
+	return p.doc, nil
+}
+
+// ParseFragment parses a fragment of HTML and returns the nodes that were
+// found. If the fragment is the InnerHTML for an existing element, pass that
+// element in context.
+func ParseFragment(r io.Reader, context *Node) ([]*Node, error) {
+	contextTag := ""
+	if context != nil {
+		if context.Type != ElementNode {
+			return nil, errors.New("html: ParseFragment of non-element Node")
+		}
+		// The next check isn't just context.DataAtom.String() == context.Data because
+		// it is valid to pass an element whose tag isn't a known atom. For example,
+		// DataAtom == 0 and Data = "tagfromthefuture" is perfectly consistent.
+		if context.DataAtom != a.Lookup([]byte(context.Data)) {
+			return nil, fmt.Errorf("html: inconsistent Node: DataAtom=%q, Data=%q", context.DataAtom, context.Data)
+		}
+		contextTag = context.DataAtom.String()
+	}
+	p := &parser{
+		tokenizer: NewTokenizerFragment(r, contextTag),
+		doc: &Node{
+			Type: DocumentNode,
+		},
+		scripting: true,
+		fragment:  true,
+		context:   context,
+	}
+
+	root := &Node{
+		Type:     ElementNode,
+		DataAtom: a.Html,
+		Data:     a.Html.String(),
+	}
+	p.doc.AppendChild(root)
+	p.oe = nodeStack{root}
+	p.resetInsertionMode()
+
+	for n := context; n != nil; n = n.Parent {
+		if n.Type == ElementNode && n.DataAtom == a.Form {
+			p.form = n
+			break
+		}
+	}
+
+	err := p.parse()
+	if err != nil {
+		return nil, err
+	}
+
+	parent := p.doc
+	if context != nil {
+		parent = root
+	}
+
+	var result []*Node
+	for c := parent.FirstChild; c != nil; {
+		next := c.NextSibling
+		parent.RemoveChild(c)
+		result = append(result, c)
+		c = next
+	}
+	return result, nil
+}
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/parse_test.go b/Godeps/_workspace/src/golang.org/x/net/html/parse_test.go
new file mode 100644
index 00000000..7e47d11b
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/parse_test.go
@@ -0,0 +1,388 @@
+// Copyright 2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package html
+
+import (
+	"bufio"
+	"bytes"
+	"errors"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"runtime"
+	"sort"
+	"strings"
+	"testing"
+
+	"golang.org/x/net/html/atom"
+)
+
+// readParseTest reads a single test case from r.
+func readParseTest(r *bufio.Reader) (text, want, context string, err error) {
+	line, err := r.ReadSlice('\n')
+	if err != nil {
+		return "", "", "", err
+	}
+	var b []byte
+
+	// Read the HTML.
+	if string(line) != "#data\n" {
+		return "", "", "", fmt.Errorf(`got %q want "#data\n"`, line)
+	}
+	for {
+		line, err = r.ReadSlice('\n')
+		if err != nil {
+			return "", "", "", err
+		}
+		if line[0] == '#' {
+			break
+		}
+		b = append(b, line...)
+	}
+	text = strings.TrimSuffix(string(b), "\n")
+	b = b[:0]
+
+	// Skip the error list.
+	if string(line) != "#errors\n" {
+		return "", "", "", fmt.Errorf(`got %q want "#errors\n"`, line)
+	}
+	for {
+		line, err = r.ReadSlice('\n')
+		if err != nil {
+			return "", "", "", err
+		}
+		if line[0] == '#' {
+			break
+		}
+	}
+
+	if string(line) == "#document-fragment\n" {
+		line, err = r.ReadSlice('\n')
+		if err != nil {
+			return "", "", "", err
+		}
+		context = strings.TrimSpace(string(line))
+		line, err = r.ReadSlice('\n')
+		if err != nil {
+			return "", "", "", err
+		}
+	}
+
+	// Read the dump of what the parse tree should be.
+	if string(line) != "#document\n" {
+		return "", "", "", fmt.Errorf(`got %q want "#document\n"`, line)
+	}
+	inQuote := false
+	for {
+		line, err = r.ReadSlice('\n')
+		if err != nil && err != io.EOF {
+			return "", "", "", err
+		}
+		trimmed := bytes.Trim(line, "| \n")
+		if len(trimmed) > 0 {
+			if line[0] == '|' && trimmed[0] == '"' {
+				inQuote = true
+			}
+			if trimmed[len(trimmed)-1] == '"' && !(line[0] == '|' && len(trimmed) == 1) {
+				inQuote = false
+			}
+		}
+		if len(line) == 0 || len(line) == 1 && line[0] == '\n' && !inQuote {
+			break
+		}
+		b = append(b, line...)
+	}
+	return text, string(b), context, nil
+}
+
+func dumpIndent(w io.Writer, level int) {
+	io.WriteString(w, "| ")
+	for i := 0; i < level; i++ {
+		io.WriteString(w, "  ")
+	}
+}
+
+type sortedAttributes []Attribute
+
+func (a sortedAttributes) Len() int {
+	return len(a)
+}
+
+func (a sortedAttributes) Less(i, j int) bool {
+	if a[i].Namespace != a[j].Namespace {
+		return a[i].Namespace < a[j].Namespace
+	}
+	return a[i].Key < a[j].Key
+}
+
+func (a sortedAttributes) Swap(i, j int) {
+	a[i], a[j] = a[j], a[i]
+}
+
+func dumpLevel(w io.Writer, n *Node, level int) error {
+	dumpIndent(w, level)
+	switch n.Type {
+	case ErrorNode:
+		return errors.New("unexpected ErrorNode")
+	case DocumentNode:
+		return errors.New("unexpected DocumentNode")
+	case ElementNode:
+		if n.Namespace != "" {
+			fmt.Fprintf(w, "<%s %s>", n.Namespace, n.Data)
+		} else {
+			fmt.Fprintf(w, "<%s>", n.Data)
+		}
+		attr := sortedAttributes(n.Attr)
+		sort.Sort(attr)
+		for _, a := range attr {
+			io.WriteString(w, "\n")
+			dumpIndent(w, level+1)
+			if a.Namespace != "" {
+				fmt.Fprintf(w, `%s %s="%s"`, a.Namespace, a.Key, a.Val)
+			} else {
+				fmt.Fprintf(w, `%s="%s"`, a.Key, a.Val)
+			}
+		}
+	case TextNode:
+		fmt.Fprintf(w, `"%s"`, n.Data)
+	case CommentNode:
+		fmt.Fprintf(w, "<!-- %s -->", n.Data)
+	case DoctypeNode:
+		fmt.Fprintf(w, "<!DOCTYPE %s", n.Data)
+		if n.Attr != nil {
+			var p, s string
+			for _, a := range n.Attr {
+				switch a.Key {
+				case "public":
+					p = a.Val
+				case "system":
+					s = a.Val
+				}
+			}
+			if p != "" || s != "" {
+				fmt.Fprintf(w, ` "%s"`, p)
+				fmt.Fprintf(w, ` "%s"`, s)
+			}
+		}
+		io.WriteString(w, ">")
+	case scopeMarkerNode:
+		return errors.New("unexpected scopeMarkerNode")
+	default:
+		return errors.New("unknown node type")
+	}
+	io.WriteString(w, "\n")
+	for c := n.FirstChild; c != nil; c = c.NextSibling {
+		if err := dumpLevel(w, c, level+1); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func dump(n *Node) (string, error) {
+	if n == nil || n.FirstChild == nil {
+		return "", nil
+	}
+	var b bytes.Buffer
+	for c := n.FirstChild; c != nil; c = c.NextSibling {
+		if err := dumpLevel(&b, c, 0); err != nil {
+			return "", err
+		}
+	}
+	return b.String(), nil
+}
+
+const testDataDir = "testdata/webkit/"
+
+func TestParser(t *testing.T) {
+	testFiles, err := filepath.Glob(testDataDir + "*.dat")
+	if err != nil {
+		t.Fatal(err)
+	}
+	for _, tf := range testFiles {
+		f, err := os.Open(tf)
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer f.Close()
+		r := bufio.NewReader(f)
+
+		for i := 0; ; i++ {
+			text, want, context, err := readParseTest(r)
+			if err == io.EOF {
+				break
+			}
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			err = testParseCase(text, want, context)
+
+			if err != nil {
+				t.Errorf("%s test #%d %q, %s", tf, i, text, err)
+			}
+		}
+	}
+}
+
+// testParseCase tests one test case from the test files. If the test does not
+// pass, it returns an error that explains the failure.
+// text is the HTML to be parsed, want is a dump of the correct parse tree,
+// and context is the name of the context node, if any.
+func testParseCase(text, want, context string) (err error) {
+	defer func() {
+		if x := recover(); x != nil {
+			switch e := x.(type) {
+			case error:
+				err = e
+			default:
+				err = fmt.Errorf("%v", e)
+			}
+		}
+	}()
+
+	var doc *Node
+	if context == "" {
+		doc, err = Parse(strings.NewReader(text))
+		if err != nil {
+			return err
+		}
+	} else {
+		contextNode := &Node{
+			Type:     ElementNode,
+			DataAtom: atom.Lookup([]byte(context)),
+			Data:     context,
+		}
+		nodes, err := ParseFragment(strings.NewReader(text), contextNode)
+		if err != nil {
+			return err
+		}
+		doc = &Node{
+			Type: DocumentNode,
+		}
+		for _, n := range nodes {
+			doc.AppendChild(n)
+		}
+	}
+
+	if err := checkTreeConsistency(doc); err != nil {
+		return err
+	}
+
+	got, err := dump(doc)
+	if err != nil {
+		return err
+	}
+	// Compare the parsed tree to the #document section.
+	if got != want {
+		return fmt.Errorf("got vs want:\n----\n%s----\n%s----", got, want)
+	}
+
+	if renderTestBlacklist[text] || context != "" {
+		return nil
+	}
+
+	// Check that rendering and re-parsing results in an identical tree.
+	pr, pw := io.Pipe()
+	go func() {
+		pw.CloseWithError(Render(pw, doc))
+	}()
+	doc1, err := Parse(pr)
+	if err != nil {
+		return err
+	}
+	got1, err := dump(doc1)
+	if err != nil {
+		return err
+	}
+	if got != got1 {
+		return fmt.Errorf("got vs got1:\n----\n%s----\n%s----", got, got1)
+	}
+
+	return nil
+}
+
+// Some test input result in parse trees are not 'well-formed' despite
+// following the HTML5 recovery algorithms. Rendering and re-parsing such a
+// tree will not result in an exact clone of that tree. We blacklist such
+// inputs from the render test.
+var renderTestBlacklist = map[string]bool{
+	// The second <a> will be reparented to the first <table>'s parent. This
+	// results in an <a> whose parent is an <a>, which is not 'well-formed'.
+	`<a><table><td><a><table></table><a></tr><a></table><b>X</b>C<a>Y`: true,
+	// The same thing with a <p>:
+	`<p><table></p>`: true,
+	// More cases of <a> being reparented:
+	`<a href="blah">aba<table><a href="foo">br<tr><td></td></tr>x</table>aoe`: true,
+	`<a><table><a></table><p><a><div><a>`:                                     true,
+	`<a><table><td><a><table></table><a></tr><a></table><a>`:                  true,
+	// A similar reparenting situation involving <nobr>:
+	`<!DOCTYPE html><body><b><nobr>1<table><nobr></b><i><nobr>2<nobr></i>3`: true,
+	// A <plaintext> element is reparented, putting it before a table.
+	// A <plaintext> element can't have anything after it in HTML.
+	`<table><plaintext><td>`:                                   true,
+	`<!doctype html><table><plaintext></plaintext>`:            true,
+	`<!doctype html><table><tbody><plaintext></plaintext>`:     true,
+	`<!doctype html><table><tbody><tr><plaintext></plaintext>`: true,
+	// A form inside a table inside a form doesn't work either.
+	`<!doctype html><form><table></form><form></table></form>`: true,
+	// A script that ends at EOF may escape its own closing tag when rendered.
+	`<!doctype html><script><!--<script `:          true,
+	`<!doctype html><script><!--<script <`:         true,
+	`<!doctype html><script><!--<script <a`:        true,
+	`<!doctype html><script><!--<script </`:        true,
+	`<!doctype html><script><!--<script </s`:       true,
+	`<!doctype html><script><!--<script </script`:  true,
+	`<!doctype html><script><!--<script </scripta`: true,
+	`<!doctype html><script><!--<script -`:         true,
+	`<!doctype html><script><!--<script -a`:        true,
+	`<!doctype html><script><!--<script -<`:        true,
+	`<!doctype html><script><!--<script --`:        true,
+	`<!doctype html><script><!--<script --a`:       true,
+	`<!doctype html><script><!--<script --<`:       true,
+	`<script><!--<script `:                         true,
+	`<script><!--<script <a`:                       true,
+	`<script><!--<script </script`:                 true,
+	`<script><!--<script </scripta`:                true,
+	`<script><!--<script -`:                        true,
+	`<script><!--<script -a`:                       true,
+	`<script><!--<script --`:                       true,
+	`<script><!--<script --a`:                      true,
+	`<script><!--<script <`:                        true,
+	`<script><!--<script </`:                       true,
+	`<script><!--<script </s`:                      true,
+	// Reconstructing the active formatting elements results in a <plaintext>
+	// element that contains an <a> element.
+	`<!doctype html><p><a><plaintext>b`: true,
+}
+
+func TestNodeConsistency(t *testing.T) {
+	// inconsistentNode is a Node whose DataAtom and Data do not agree.
+	inconsistentNode := &Node{
+		Type:     ElementNode,
+		DataAtom: atom.Frameset,
+		Data:     "table",
+	}
+	_, err := ParseFragment(strings.NewReader("<p>hello</p>"), inconsistentNode)
+	if err == nil {
+		t.Errorf("got nil error, want non-nil")
+	}
+}
+
+func BenchmarkParser(b *testing.B) {
+	buf, err := ioutil.ReadFile("testdata/go1.html")
+	if err != nil {
+		b.Fatalf("could not read testdata/go1.html: %v", err)
+	}
+	b.SetBytes(int64(len(buf)))
+	runtime.GC()
+	b.ReportAllocs()
+	b.ResetTimer()
+	for i := 0; i < b.N; i++ {
+		Parse(bytes.NewBuffer(buf))
+	}
+}
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/render.go b/Godeps/_workspace/src/golang.org/x/net/html/render.go
new file mode 100644
index 00000000..4a833b44
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/render.go
@@ -0,0 +1,271 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package html
+
+import (
+	"bufio"
+	"errors"
+	"fmt"
+	"io"
+	"strings"
+)
+
+type writer interface {
+	io.Writer
+	WriteByte(c byte) error // in Go 1.1, use io.ByteWriter
+	WriteString(string) (int, error)
+}
+
+// Render renders the parse tree n to the given writer.
+//
+// Rendering is done on a 'best effort' basis: calling Parse on the output of
+// Render will always result in something similar to the original tree, but it
+// is not necessarily an exact clone unless the original tree was 'well-formed'.
+// 'Well-formed' is not easily specified; the HTML5 specification is
+// complicated.
+//
+// Calling Parse on arbitrary input typically results in a 'well-formed' parse
+// tree. However, it is possible for Parse to yield a 'badly-formed' parse tree.
+// For example, in a 'well-formed' parse tree, no <a> element is a child of
+// another <a> element: parsing "<a><a>" results in two sibling elements.
+// Similarly, in a 'well-formed' parse tree, no <a> element is a child of a
+// <table> element: parsing "<p><table><a>" results in a <p> with two sibling
+// children; the <a> is reparented to the <table>'s parent. However, calling
+// Parse on "<a><table><a>" does not return an error, but the result has an <a>
+// element with an <a> child, and is therefore not 'well-formed'.
+//
+// Programmatically constructed trees are typically also 'well-formed', but it
+// is possible to construct a tree that looks innocuous but, when rendered and
+// re-parsed, results in a different tree. A simple example is that a solitary
+// text node would become a tree containing <html>, <head> and <body> elements.
+// Another example is that the programmatic equivalent of "a<head>b</head>c"
+// becomes "<html><head><head/><body>abc</body></html>".
+func Render(w io.Writer, n *Node) error {
+	if x, ok := w.(writer); ok {
+		return render(x, n)
+	}
+	buf := bufio.NewWriter(w)
+	if err := render(buf, n); err != nil {
+		return err
+	}
+	return buf.Flush()
+}
+
+// plaintextAbort is returned from render1 when a <plaintext> element
+// has been rendered. No more end tags should be rendered after that.
+var plaintextAbort = errors.New("html: internal error (plaintext abort)")
+
+func render(w writer, n *Node) error {
+	err := render1(w, n)
+	if err == plaintextAbort {
+		err = nil
+	}
+	return err
+}
+
+func render1(w writer, n *Node) error {
+	// Render non-element nodes; these are the easy cases.
+	switch n.Type {
+	case ErrorNode:
+		return errors.New("html: cannot render an ErrorNode node")
+	case TextNode:
+		return escape(w, n.Data)
+	case DocumentNode:
+		for c := n.FirstChild; c != nil; c = c.NextSibling {
+			if err := render1(w, c); err != nil {
+				return err
+			}
+		}
+		return nil
+	case ElementNode:
+		// No-op.
+	case CommentNode:
+		if _, err := w.WriteString("<!--"); err != nil {
+			return err
+		}
+		if _, err := w.WriteString(n.Data); err != nil {
+			return err
+		}
+		if _, err := w.WriteString("-->"); err != nil {
+			return err
+		}
+		return nil
+	case DoctypeNode:
+		if _, err := w.WriteString("<!DOCTYPE "); err != nil {
+			return err
+		}
+		if _, err := w.WriteString(n.Data); err != nil {
+			return err
+		}
+		if n.Attr != nil {
+			var p, s string
+			for _, a := range n.Attr {
+				switch a.Key {
+				case "public":
+					p = a.Val
+				case "system":
+					s = a.Val
+				}
+			}
+			if p != "" {
+				if _, err := w.WriteString(" PUBLIC "); err != nil {
+					return err
+				}
+				if err := writeQuoted(w, p); err != nil {
+					return err
+				}
+				if s != "" {
+					if err := w.WriteByte(' '); err != nil {
+						return err
+					}
+					if err := writeQuoted(w, s); err != nil {
+						return err
+					}
+				}
+			} else if s != "" {
+				if _, err := w.WriteString(" SYSTEM "); err != nil {
+					return err
+				}
+				if err := writeQuoted(w, s); err != nil {
+					return err
+				}
+			}
+		}
+		return w.WriteByte('>')
+	default:
+		return errors.New("html: unknown node type")
+	}
+
+	// Render the <xxx> opening tag.
+	if err := w.WriteByte('<'); err != nil {
+		return err
+	}
+	if _, err := w.WriteString(n.Data); err != nil {
+		return err
+	}
+	for _, a := range n.Attr {
+		if err := w.WriteByte(' '); err != nil {
+			return err
+		}
+		if a.Namespace != "" {
+			if _, err := w.WriteString(a.Namespace); err != nil {
+				return err
+			}
+			if err := w.WriteByte(':'); err != nil {
+				return err
+			}
+		}
+		if _, err := w.WriteString(a.Key); err != nil {
+			return err
+		}
+		if _, err := w.WriteString(`="`); err != nil {
+			return err
+		}
+		if err := escape(w, a.Val); err != nil {
+			return err
+		}
+		if err := w.WriteByte('"'); err != nil {
+			return err
+		}
+	}
+	if voidElements[n.Data] {
+		if n.FirstChild != nil {
+			return fmt.Errorf("html: void element <%s> has child nodes", n.Data)
+		}
+		_, err := w.WriteString("/>")
+		return err
+	}
+	if err := w.WriteByte('>'); err != nil {
+		return err
+	}
+
+	// Add initial newline where there is danger of a newline beging ignored.
+	if c := n.FirstChild; c != nil && c.Type == TextNode && strings.HasPrefix(c.Data, "\n") {
+		switch n.Data {
+		case "pre", "listing", "textarea":
+			if err := w.WriteByte('\n'); err != nil {
+				return err
+			}
+		}
+	}
+
+	// Render any child nodes.
+	switch n.Data {
+	case "iframe", "noembed", "noframes", "noscript", "plaintext", "script", "style", "xmp":
+		for c := n.FirstChild; c != nil; c = c.NextSibling {
+			if c.Type == TextNode {
+				if _, err := w.WriteString(c.Data); err != nil {
+					return err
+				}
+			} else {
+				if err := render1(w, c); err != nil {
+					return err
+				}
+			}
+		}
+		if n.Data == "plaintext" {
+			// Don't render anything else. <plaintext> must be the
+			// last element in the file, with no closing tag.
+			return plaintextAbort
+		}
+	default:
+		for c := n.FirstChild; c != nil; c = c.NextSibling {
+			if err := render1(w, c); err != nil {
+				return err
+			}
+		}
+	}
+
+	// Render the </xxx> closing tag.
+	if _, err := w.WriteString("</"); err != nil {
+		return err
+	}
+	if _, err := w.WriteString(n.Data); err != nil {
+		return err
+	}
+	return w.WriteByte('>')
+}
+
+// writeQuoted writes s to w surrounded by quotes. Normally it will use double
+// quotes, but if s contains a double quote, it will use single quotes.
+// It is used for writing the identifiers in a doctype declaration.
+// In valid HTML, they can't contain both types of quotes.
+func writeQuoted(w writer, s string) error {
+	var q byte = '"'
+	if strings.Contains(s, `"`) {
+		q = '\''
+	}
+	if err := w.WriteByte(q); err != nil {
+		return err
+	}
+	if _, err := w.WriteString(s); err != nil {
+		return err
+	}
+	if err := w.WriteByte(q); err != nil {
+		return err
+	}
+	return nil
+}
+
+// Section 12.1.2, "Elements", gives this list of void elements. Void elements
+// are those that can't have any contents.
+var voidElements = map[string]bool{
+	"area":    true,
+	"base":    true,
+	"br":      true,
+	"col":     true,
+	"command": true,
+	"embed":   true,
+	"hr":      true,
+	"img":     true,
+	"input":   true,
+	"keygen":  true,
+	"link":    true,
+	"meta":    true,
+	"param":   true,
+	"source":  true,
+	"track":   true,
+	"wbr":     true,
+}
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/render_test.go b/Godeps/_workspace/src/golang.org/x/net/html/render_test.go
new file mode 100644
index 00000000..11da54b3
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/render_test.go
@@ -0,0 +1,156 @@
+// Copyright 2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package html
+
+import (
+	"bytes"
+	"testing"
+)
+
+func TestRenderer(t *testing.T) {
+	nodes := [...]*Node{
+		0: {
+			Type: ElementNode,
+			Data: "html",
+		},
+		1: {
+			Type: ElementNode,
+			Data: "head",
+		},
+		2: {
+			Type: ElementNode,
+			Data: "body",
+		},
+		3: {
+			Type: TextNode,
+			Data: "0<1",
+		},
+		4: {
+			Type: ElementNode,
+			Data: "p",
+			Attr: []Attribute{
+				{
+					Key: "id",
+					Val: "A",
+				},
+				{
+					Key: "foo",
+					Val: `abc"def`,
+				},
+			},
+		},
+		5: {
+			Type: TextNode,
+			Data: "2",
+		},
+		6: {
+			Type: ElementNode,
+			Data: "b",
+			Attr: []Attribute{
+				{
+					Key: "empty",
+					Val: "",
+				},
+			},
+		},
+		7: {
+			Type: TextNode,
+			Data: "3",
+		},
+		8: {
+			Type: ElementNode,
+			Data: "i",
+			Attr: []Attribute{
+				{
+					Key: "backslash",
+					Val: `\`,
+				},
+			},
+		},
+		9: {
+			Type: TextNode,
+			Data: "&4",
+		},
+		10: {
+			Type: TextNode,
+			Data: "5",
+		},
+		11: {
+			Type: ElementNode,
+			Data: "blockquote",
+		},
+		12: {
+			Type: ElementNode,
+			Data: "br",
+		},
+		13: {
+			Type: TextNode,
+			Data: "6",
+		},
+	}
+
+	// Build a tree out of those nodes, based on a textual representation.
+	// Only the ".\t"s are significant. The trailing HTML-like text is
+	// just commentary. The "0:" prefixes are for easy cross-reference with
+	// the nodes array.
+	treeAsText := [...]string{
+		0: `<html>`,
+		1: `.	<head>`,
+		2: `.	<body>`,
+		3: `.	.	"0&lt;1"`,
+		4: `.	.	<p id="A" foo="abc&#34;def">`,
+		5: `.	.	.	"2"`,
+		6: `.	.	.	<b empty="">`,
+		7: `.	.	.	.	"3"`,
+		8: `.	.	.	<i backslash="\">`,
+		9: `.	.	.	.	"&amp;4"`,
+		10: `.	.	"5"`,
+		11: `.	.	<blockquote>`,
+		12: `.	.	<br>`,
+		13: `.	.	"6"`,
+	}
+	if len(nodes) != len(treeAsText) {
+		t.Fatal("len(nodes) != len(treeAsText)")
+	}
+	var stack [8]*Node
+	for i, line := range treeAsText {
+		level := 0
+		for line[0] == '.' {
+			// Strip a leading ".\t".
+			line = line[2:]
+			level++
+		}
+		n := nodes[i]
+		if level == 0 {
+			if stack[0] != nil {
+				t.Fatal("multiple root nodes")
+			}
+			stack[0] = n
+		} else {
+			stack[level-1].AppendChild(n)
+			stack[level] = n
+			for i := level + 1; i < len(stack); i++ {
+				stack[i] = nil
+			}
+		}
+		// At each stage of tree construction, we check all nodes for consistency.
+		for j, m := range nodes {
+			if err := checkNodeConsistency(m); err != nil {
+				t.Fatalf("i=%d, j=%d: %v", i, j, err)
+			}
+		}
+	}
+
+	want := `<html><head></head><body>0&lt;1<p id="A" foo="abc&#34;def">` +
+		`2<b empty="">3</b><i backslash="\">&amp;4</i></p>` +
+		`5<blockquote></blockquote><br/>6</body></html>`
+	b := new(bytes.Buffer)
+	if err := Render(b, nodes[0]); err != nil {
+		t.Fatal(err)
+	}
+	if got := b.String(); got != want {
+		t.Errorf("got vs want:\n%s\n%s\n", got, want)
+	}
+}
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/go1.html b/Godeps/_workspace/src/golang.org/x/net/html/testdata/go1.html
new file mode 100644
index 00000000..a782cc71
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/go1.html
@@ -0,0 +1,2237 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+
+  <title>Go 1 Release Notes - The Go Programming Language</title>
+
+<link type="text/css" rel="stylesheet" href="/doc/style.css">
+<script type="text/javascript" src="/doc/godocs.js"></script>
+
+<link rel="search" type="application/opensearchdescription+xml" title="godoc" href="/opensearch.xml" />
+
+<script type="text/javascript">
+var _gaq = _gaq || [];
+_gaq.push(["_setAccount", "UA-11222381-2"]);
+_gaq.push(["_trackPageview"]);
+</script>
+</head>
+<body>
+
+<div id="topbar"><div class="container wide">
+
+<form method="GET" action="/search">
+<div id="menu">
+<a href="/doc/">Documents</a>
+<a href="/ref/">References</a>
+<a href="/pkg/">Packages</a>
+<a href="/project/">The Project</a>
+<a href="/help/">Help</a>
+<input type="text" id="search" name="q" class="inactive" value="Search">
+</div>
+<div id="heading"><a href="/">The Go Programming Language</a></div>
+</form>
+
+</div></div>
+
+<div id="page" class="wide">
+
+
+  <div id="plusone"><g:plusone size="small" annotation="none"></g:plusone></div>
+  <h1>Go 1 Release Notes</h1>
+
+
+
+
+<div id="nav"></div>
+
+
+
+
+<h2 id="introduction">Introduction to Go 1</h2>
+
+<p>
+Go version 1, Go 1 for short, defines a language and a set of core libraries
+that provide a stable foundation for creating reliable products, projects, and
+publications.
+</p>
+
+<p>
+The driving motivation for Go 1 is stability for its users. People should be able to
+write Go programs and expect that they will continue to compile and run without
+change, on a time scale of years, including in production environments such as
+Google App Engine. Similarly, people should be able to write books about Go, be
+able to say which version of Go the book is describing, and have that version
+number still be meaningful much later.
+</p>
+
+<p>
+Code that compiles in Go 1 should, with few exceptions, continue to compile and
+run throughout the lifetime of that version, even as we issue updates and bug
+fixes such as Go version 1.1, 1.2, and so on. Other than critical fixes, changes
+made to the language and library for subsequent releases of Go 1 may
+add functionality but will not break existing Go 1 programs.
+<a href="go1compat.html">The Go 1 compatibility document</a>
+explains the compatibility guidelines in more detail.
+</p>
+
+<p>
+Go 1 is a representation of Go as it used today, not a wholesale rethinking of
+the language. We avoided designing new features and instead focused on cleaning
+up problems and inconsistencies and improving portability. There are a number
+changes to the Go language and packages that we had considered for some time and
+prototyped but not released primarily because they are significant and
+backwards-incompatible. Go 1 was an opportunity to get them out, which is
+helpful for the long term, but also means that Go 1 introduces incompatibilities
+for old programs. Fortunately, the <code>go</code> <code>fix</code> tool can
+automate much of the work needed to bring programs up to the Go 1 standard.
+</p>
+
+<p>
+This document outlines the major changes in Go 1 that will affect programmers
+updating existing code; its reference point is the prior release, r60 (tagged as
+r60.3). It also explains how to update code from r60 to run under Go 1.
+</p>
+
+<h2 id="language">Changes to the language</h2>
+
+<h3 id="append">Append</h3>
+
+<p>
+The <code>append</code> predeclared variadic function makes it easy to grow a slice
+by adding elements to the end.
+A common use is to add bytes to the end of a byte slice when generating output.
+However, <code>append</code> did not provide a way to append a string to a <code>[]byte</code>,
+which is another common case.
+</p>
+
+<pre><!--{{code "/doc/progs/go1.go" `/greeting := ..byte/` `/append.*hello/`}}
+-->    greeting := []byte{}
+    greeting = append(greeting, []byte(&#34;hello &#34;)...)</pre>
+
+<p>
+By analogy with the similar property of <code>copy</code>, Go 1
+permits a string to be appended (byte-wise) directly to a byte
+slice, reducing the friction between strings and byte slices.
+The conversion is no longer necessary:
+</p>
+
+<pre><!--{{code "/doc/progs/go1.go" `/append.*world/`}}
+-->    greeting = append(greeting, &#34;world&#34;...)</pre>
+
+<p>
+<em>Updating</em>:
+This is a new feature, so existing code needs no changes.
+</p>
+
+<h3 id="close">Close</h3>
+
+<p>
+The <code>close</code> predeclared function provides a mechanism
+for a sender to signal that no more values will be sent.
+It is important to the implementation of <code>for</code> <code>range</code>
+loops over channels and is helpful in other situations.
+Partly by design and partly because of race conditions that can occur otherwise,
+it is intended for use only by the goroutine sending on the channel,
+not by the goroutine receiving data.
+However, before Go 1 there was no compile-time checking that <code>close</code>
+was being used correctly.
+</p>
+
+<p>
+To close this gap, at least in part, Go 1 disallows <code>close</code> on receive-only channels.
+Attempting to close such a channel is a compile-time error.
+</p>
+
+<pre>
+    var c chan int
+    var csend chan&lt;- int = c
+    var crecv &lt;-chan int = c
+    close(c)     // legal
+    close(csend) // legal
+    close(crecv) // illegal
+</pre>
+
+<p>
+<em>Updating</em>:
+Existing code that attempts to close a receive-only channel was
+erroneous even before Go 1 and should be fixed.  The compiler will
+now reject such code.
+</p>
+
+<h3 id="literals">Composite literals</h3>
+
+<p>
+In Go 1, a composite literal of array, slice, or map type can elide the
+type specification for the elements' initializers if they are of pointer type.
+All four of the initializations in this example are legal; the last one was illegal before Go 1.
+</p>
+
+<pre><!--{{code "/doc/progs/go1.go" `/type Date struct/` `/STOP/`}}
+-->    type Date struct {
+        month string
+        day   int
+    }
+    <span class="comment">// Struct values, fully qualified; always legal.</span>
+    holiday1 := []Date{
+        Date{&#34;Feb&#34;, 14},
+        Date{&#34;Nov&#34;, 11},
+        Date{&#34;Dec&#34;, 25},
+    }
+    <span class="comment">// Struct values, type name elided; always legal.</span>
+    holiday2 := []Date{
+        {&#34;Feb&#34;, 14},
+        {&#34;Nov&#34;, 11},
+        {&#34;Dec&#34;, 25},
+    }
+    <span class="comment">// Pointers, fully qualified, always legal.</span>
+    holiday3 := []*Date{
+        &amp;Date{&#34;Feb&#34;, 14},
+        &amp;Date{&#34;Nov&#34;, 11},
+        &amp;Date{&#34;Dec&#34;, 25},
+    }
+    <span class="comment">// Pointers, type name elided; legal in Go 1.</span>
+    holiday4 := []*Date{
+        {&#34;Feb&#34;, 14},
+        {&#34;Nov&#34;, 11},
+        {&#34;Dec&#34;, 25},
+    }</pre>
+
+<p>
+<em>Updating</em>:
+This change has no effect on existing code, but the command
+<code>gofmt</code> <code>-s</code> applied to existing source
+will, among other things, elide explicit element types wherever permitted.
+</p>
+
+
+<h3 id="init">Goroutines during init</h3>
+
+<p>
+The old language defined that <code>go</code> statements executed during initialization created goroutines but that they did not begin to run until initialization of the entire program was complete.
+This introduced clumsiness in many places and, in effect, limited the utility
+of the <code>init</code> construct:
+if it was possible for another package to use the library during initialization, the library
+was forced to avoid goroutines.
+This design was done for reasons of simplicity and safety but,
+as our confidence in the language grew, it seemed unnecessary.
+Running goroutines during initialization is no more complex or unsafe than running them during normal execution.
+</p>
+
+<p>
+In Go 1, code that uses goroutines can be called from
+<code>init</code> routines and global initialization expressions
+without introducing a deadlock.
+</p>
+
+<pre><!--{{code "/doc/progs/go1.go" `/PackageGlobal/` `/^}/`}}
+-->var PackageGlobal int
+
+func init() {
+    c := make(chan int)
+    go initializationFunction(c)
+    PackageGlobal = &lt;-c
+}</pre>
+
+<p>
+<em>Updating</em>:
+This is a new feature, so existing code needs no changes,
+although it's possible that code that depends on goroutines not starting before <code>main</code> will break.
+There was no such code in the standard repository.
+</p>
+
+<h3 id="rune">The rune type</h3>
+
+<p>
+The language spec allows the <code>int</code> type to be 32 or 64 bits wide, but current implementations set <code>int</code> to 32 bits even on 64-bit platforms.
+It would be preferable to have <code>int</code> be 64 bits on 64-bit platforms.
+(There are important consequences for indexing large slices.)
+However, this change would waste space when processing Unicode characters with
+the old language because the <code>int</code> type was also used to hold Unicode code points: each code point would waste an extra 32 bits of storage if <code>int</code> grew from 32 bits to 64.
+</p>
+
+<p>
+To make changing to 64-bit <code>int</code> feasible,
+Go 1 introduces a new basic type, <code>rune</code>, to represent
+individual Unicode code points.
+It is an alias for <code>int32</code>, analogous to <code>byte</code>
+as an alias for <code>uint8</code>.
+</p>
+
+<p>
+Character literals such as <code>'a'</code>, <code>'語'</code>, and <code>'\u0345'</code>
+now have default type <code>rune</code>,
+analogous to <code>1.0</code> having default type <code>float64</code>.
+A variable initialized to a character constant will therefore
+have type <code>rune</code> unless otherwise specified.
+</p>
+
+<p>
+Libraries have been updated to use <code>rune</code> rather than <code>int</code>
+when appropriate. For instance, the functions <code>unicode.ToLower</code> and
+relatives now take and return a <code>rune</code>.
+</p>
+
+<pre><!--{{code "/doc/progs/go1.go" `/STARTRUNE/` `/ENDRUNE/`}}
+-->    delta := &#39;δ&#39; <span class="comment">// delta has type rune.</span>
+    var DELTA rune
+    DELTA = unicode.ToUpper(delta)
+    epsilon := unicode.ToLower(DELTA + 1)
+    if epsilon != &#39;δ&#39;+1 {
+        log.Fatal(&#34;inconsistent casing for Greek&#34;)
+    }</pre>
+
+<p>
+<em>Updating</em>:
+Most source code will be unaffected by this because the type inference from
+<code>:=</code> initializers introduces the new type silently, and it propagates
+from there.
+Some code may get type errors that a trivial conversion will resolve.
+</p>
+
+<h3 id="error">The error type</h3>
+
+<p>
+Go 1 introduces a new built-in type, <code>error</code>, which has the following definition:
+</p>
+
+<pre>
+    type error interface {
+        Error() string
+    }
+</pre>
+
+<p>
+Since the consequences of this type are all in the package library,
+it is discussed <a href="#errors">below</a>.
+</p>
+
+<h3 id="delete">Deleting from maps</h3>
+
+<p>
+In the old language, to delete the entry with key <code>k</code> from map <code>m</code>, one wrote the statement,
+</p>
+
+<pre>
+    m[k] = value, false
+</pre>
+
+<p>
+This syntax was a peculiar special case, the only two-to-one assignment.
+It required passing a value (usually ignored) that is evaluated but discarded,
+plus a boolean that was nearly always the constant <code>false</code>.
+It did the job but was odd and a point of contention.
+</p>
+
+<p>
+In Go 1, that syntax has gone; instead there is a new built-in
+function, <code>delete</code>.  The call
+</p>
+
+<pre><!--{{code "/doc/progs/go1.go" `/delete\(m, k\)/`}}
+-->    delete(m, k)</pre>
+
+<p>
+will delete the map entry retrieved by the expression <code>m[k]</code>.
+There is no return value. Deleting a non-existent entry is a no-op.
+</p>
+
+<p>
+<em>Updating</em>:
+Running <code>go</code> <code>fix</code> will convert expressions of the form <code>m[k] = value,
+false</code> into <code>delete(m, k)</code> when it is clear that
+the ignored value can be safely discarded from the program and
+<code>false</code> refers to the predefined boolean constant.
+The fix tool
+will flag other uses of the syntax for inspection by the programmer.
+</p>
+
+<h3 id="iteration">Iterating in maps</h3>
+
+<p>
+The old language specification did not define the order of iteration for maps,
+and in practice it differed across hardware platforms.
+This caused tests that iterated over maps to be fragile and non-portable, with the
+unpleasant property that a test might always pass on one machine but break on another.
+</p>
+
+<p>
+In Go 1, the order in which elements are visited when iterating
+over a map using a <code>for</code> <code>range</code> statement
+is defined to be unpredictable, even if the same loop is run multiple
+times with the same map.
+Code should not assume that the elements are visited in any particular order.
+</p>
+
+<p>
+This change means that code that depends on iteration order is very likely to break early and be fixed long before it becomes a problem.
+Just as important, it allows the map implementation to ensure better map balancing even when programs are using range loops to select an element from a map.
+</p>
+
+<pre><!--{{code "/doc/progs/go1.go" `/Sunday/` `/^	}/`}}
+-->    m := map[string]int{&#34;Sunday&#34;: 0, &#34;Monday&#34;: 1}
+    for name, value := range m {
+        <span class="comment">// This loop should not assume Sunday will be visited first.</span>
+        f(name, value)
+    }</pre>
+
+<p>
+<em>Updating</em>:
+This is one change where tools cannot help.  Most existing code
+will be unaffected, but some programs may break or misbehave; we
+recommend manual checking of all range statements over maps to
+verify they do not depend on iteration order. There were a few such
+examples in the standard repository; they have been fixed.
+Note that it was already incorrect to depend on the iteration order, which
+was unspecified. This change codifies the unpredictability.
+</p>
+
+<h3 id="multiple_assignment">Multiple assignment</h3>
+
+<p>
+The language specification has long guaranteed that in assignments
+the right-hand-side expressions are all evaluated before any left-hand-side expressions are assigned.
+To guarantee predictable behavior,
+Go 1 refines the specification further.
+</p>
+
+<p>
+If the left-hand side of the assignment
+statement contains expressions that require evaluation, such as
+function calls or array indexing operations, these will all be done
+using the usual left-to-right rule before any variables are assigned
+their value.  Once everything is evaluated, the actual assignments
+proceed in left-to-right order.
+</p>
+
+<p>
+These examples illustrate the behavior.
+</p>
+
+<pre><!--{{code "/doc/progs/go1.go" `/sa :=/` `/then sc.0. = 2/`}}
+-->    sa := []int{1, 2, 3}
+    i := 0
+    i, sa[i] = 1, 2 <span class="comment">// sets i = 1, sa[0] = 2</span>
+
+    sb := []int{1, 2, 3}
+    j := 0
+    sb[j], j = 2, 1 <span class="comment">// sets sb[0] = 2, j = 1</span>
+
+    sc := []int{1, 2, 3}
+    sc[0], sc[0] = 1, 2 <span class="comment">// sets sc[0] = 1, then sc[0] = 2 (so sc[0] = 2 at end)</span></pre>
+
+<p>
+<em>Updating</em>:
+This is one change where tools cannot help, but breakage is unlikely.
+No code in the standard repository was broken by this change, and code
+that depended on the previous unspecified behavior was already incorrect.
+</p>
+
+<h3 id="shadowing">Returns and shadowed variables</h3>
+
+<p>
+A common mistake is to use <code>return</code> (without arguments) after an assignment to a variable that has the same name as a result variable but is not the same variable.
+This situation is called <em>shadowing</em>: the result variable has been shadowed by another variable with the same name declared in an inner scope.
+</p>
+
+<p>
+In functions with named return values,
+the Go 1 compilers disallow return statements without arguments if any of the named return values is shadowed at the point of the return statement.
+(It isn't part of the specification, because this is one area we are still exploring;
+the situation is analogous to the compilers rejecting functions that do not end with an explicit return statement.)
+</p>
+
+<p>
+This function implicitly returns a shadowed return value and will be rejected by the compiler:
+</p>
+
+<pre>
+    func Bug() (i, j, k int) {
+        for i = 0; i &lt; 5; i++ {
+            for j := 0; j &lt; 5; j++ { // Redeclares j.
+                k += i*j
+                if k > 100 {
+                    return // Rejected: j is shadowed here.
+                }
+            }
+        }
+        return // OK: j is not shadowed here.
+    }
+</pre>
+
+<p>
+<em>Updating</em>:
+Code that shadows return values in this way will be rejected by the compiler and will need to be fixed by hand.
+The few cases that arose in the standard repository were mostly bugs.
+</p>
+
+<h3 id="unexported">Copying structs with unexported fields</h3>
+
+<p>
+The old language did not allow a package to make a copy of a struct value containing unexported fields belonging to a different package.
+There was, however, a required exception for a method receiver;
+also, the implementations of <code>copy</code> and <code>append</code> have never honored the restriction.
+</p>
+
+<p>
+Go 1 will allow packages to copy struct values containing unexported fields from other packages.
+Besides resolving the inconsistency,
+this change admits a new kind of API: a package can return an opaque value without resorting to a pointer or interface.
+The new implementations of <code>time.Time</code> and
+<code>reflect.Value</code> are examples of types taking advantage of this new property.
+</p>
+
+<p>
+As an example, if package <code>p</code> includes the definitions,
+</p>
+
+<pre>
+    type Struct struct {
+        Public int
+        secret int
+    }
+    func NewStruct(a int) Struct {  // Note: not a pointer.
+        return Struct{a, f(a)}
+    }
+    func (s Struct) String() string {
+        return fmt.Sprintf("{%d (secret %d)}", s.Public, s.secret)
+    }
+</pre>
+
+<p>
+a package that imports <code>p</code> can assign and copy values of type
+<code>p.Struct</code> at will.
+Behind the scenes the unexported fields will be assigned and copied just
+as if they were exported,
+but the client code will never be aware of them. The code
+</p>
+
+<pre>
+    import "p"
+
+    myStruct := p.NewStruct(23)
+    copyOfMyStruct := myStruct
+    fmt.Println(myStruct, copyOfMyStruct)
+</pre>
+
+<p>
+will show that the secret field of the struct has been copied to the new value.
+</p>
+
+<p>
+<em>Updating</em>:
+This is a new feature, so existing code needs no changes.
+</p>
+
+<h3 id="equality">Equality</h3>
+
+<p>
+Before Go 1, the language did not define equality on struct and array values.
+This meant,
+among other things, that structs and arrays could not be used as map keys.
+On the other hand, Go did define equality on function and map values.
+Function equality was problematic in the presence of closures
+(when are two closures equal?)
+while map equality compared pointers, not the maps' content, which was usually
+not what the user would want.
+</p>
+
+<p>
+Go 1 addressed these issues.
+First, structs and arrays can be compared for equality and inequality
+(<code>==</code> and <code>!=</code>),
+and therefore be used as map keys,
+provided they are composed from elements for which equality is also defined,
+using element-wise comparison.
+</p>
+
+<pre><!--{{code "/doc/progs/go1.go" `/type Day struct/` `/Printf/`}}
+-->    type Day struct {
+        long  string
+        short string
+    }
+    Christmas := Day{&#34;Christmas&#34;, &#34;XMas&#34;}
+    Thanksgiving := Day{&#34;Thanksgiving&#34;, &#34;Turkey&#34;}
+    holiday := map[Day]bool{
+        Christmas:    true,
+        Thanksgiving: true,
+    }
+    fmt.Printf(&#34;Christmas is a holiday: %t\n&#34;, holiday[Christmas])</pre>
+
+<p>
+Second, Go 1 removes the definition of equality for function values,
+except for comparison with <code>nil</code>.
+Finally, map equality is gone too, also except for comparison with <code>nil</code>.
+</p>
+
+<p>
+Note that equality is still undefined for slices, for which the
+calculation is in general infeasible.  Also note that the ordered
+comparison operators (<code>&lt;</code> <code>&lt;=</code>
+<code>&gt;</code> <code>&gt;=</code>) are still undefined for
+structs and arrays.
+
+<p>
+<em>Updating</em>:
+Struct and array equality is a new feature, so existing code needs no changes.
+Existing code that depends on function or map equality will be
+rejected by the compiler and will need to be fixed by hand.
+Few programs will be affected, but the fix may require some
+redesign.
+</p>
+
+<h2 id="packages">The package hierarchy</h2>
+
+<p>
+Go 1 addresses many deficiencies in the old standard library and
+cleans up a number of packages, making them more internally consistent
+and portable.
+</p>
+
+<p>
+This section describes how the packages have been rearranged in Go 1.
+Some have moved, some have been renamed, some have been deleted.
+New packages are described in later sections.
+</p>
+
+<h3 id="hierarchy">The package hierarchy</h3>
+
+<p>
+Go 1 has a rearranged package hierarchy that groups related items
+into subdirectories. For instance, <code>utf8</code> and
+<code>utf16</code> now occupy subdirectories of <code>unicode</code>.
+Also, <a href="#subrepo">some packages</a> have moved into
+subrepositories of
+<a href="http://code.google.com/p/go"><code>code.google.com/p/go</code></a>
+while <a href="#deleted">others</a> have been deleted outright.
+</p>
+
+<table class="codetable" frame="border" summary="Moved packages">
+<colgroup align="left" width="60%"></colgroup>
+<colgroup align="left" width="40%"></colgroup>
+<tr>
+<th align="left">Old path</th>
+<th align="left">New path</th>
+</tr>
+<tr>
+<td colspan="2"><hr></td>
+</tr>
+<tr><td>asn1</td> <td>encoding/asn1</td></tr>
+<tr><td>csv</td> <td>encoding/csv</td></tr>
+<tr><td>gob</td> <td>encoding/gob</td></tr>
+<tr><td>json</td> <td>encoding/json</td></tr>
+<tr><td>xml</td> <td>encoding/xml</td></tr>
+<tr>
+<td colspan="2"><hr></td>
+</tr>
+<tr><td>exp/template/html</td> <td>html/template</td></tr>
+<tr>
+<td colspan="2"><hr></td>
+</tr>
+<tr><td>big</td> <td>math/big</td></tr>
+<tr><td>cmath</td> <td>math/cmplx</td></tr>
+<tr><td>rand</td> <td>math/rand</td></tr>
+<tr>
+<td colspan="2"><hr></td>
+</tr>
+<tr><td>http</td> <td>net/http</td></tr>
+<tr><td>http/cgi</td> <td>net/http/cgi</td></tr>
+<tr><td>http/fcgi</td> <td>net/http/fcgi</td></tr>
+<tr><td>http/httptest</td> <td>net/http/httptest</td></tr>
+<tr><td>http/pprof</td> <td>net/http/pprof</td></tr>
+<tr><td>mail</td> <td>net/mail</td></tr>
+<tr><td>rpc</td> <td>net/rpc</td></tr>
+<tr><td>rpc/jsonrpc</td> <td>net/rpc/jsonrpc</td></tr>
+<tr><td>smtp</td> <td>net/smtp</td></tr>
+<tr><td>url</td> <td>net/url</td></tr>
+<tr>
+<td colspan="2"><hr></td>
+</tr>
+<tr><td>exec</td> <td>os/exec</td></tr>
+<tr>
+<td colspan="2"><hr></td>
+</tr>
+<tr><td>scanner</td> <td>text/scanner</td></tr>
+<tr><td>tabwriter</td> <td>text/tabwriter</td></tr>
+<tr><td>template</td> <td>text/template</td></tr>
+<tr><td>template/parse</td> <td>text/template/parse</td></tr>
+<tr>
+<td colspan="2"><hr></td>
+</tr>
+<tr><td>utf8</td> <td>unicode/utf8</td></tr>
+<tr><td>utf16</td> <td>unicode/utf16</td></tr>
+</table>
+
+<p>
+Note that the package names for the old <code>cmath</code> and
+<code>exp/template/html</code> packages have changed to <code>cmplx</code>
+and <code>template</code>.
+</p>
+
+<p>
+<em>Updating</em>:
+Running <code>go</code> <code>fix</code> will update all imports and package renames for packages that
+remain inside the standard repository.  Programs that import packages
+that are no longer in the standard repository will need to be edited
+by hand.
+</p>
+
+<h3 id="exp">The package tree exp</h3>
+
+<p>
+Because they are not standardized, the packages under the <code>exp</code> directory will not be available in the
+standard Go 1 release distributions, although they will be available in source code form
+in <a href="http://code.google.com/p/go/">the repository</a> for
+developers who wish to use them.
+</p>
+
+<p>
+Several packages have moved under <code>exp</code> at the time of Go 1's release:
+</p>
+
+<ul>
+<li><code>ebnf</code></li>
+<li><code>html</code><sup>&#8224;</sup></li>
+<li><code>go/types</code></li>
+</ul>
+
+<p>
+(<sup>&#8224;</sup>The <code>EscapeString</code> and <code>UnescapeString</code> types remain
+in package <code>html</code>.)
+</p>
+
+<p>
+All these packages are available under the same names, with the prefix <code>exp/</code>: <code>exp/ebnf</code> etc.
+</p>
+
+<p>
+Also, the <code>utf8.String</code> type has been moved to its own package, <code>exp/utf8string</code>.
+</p>
+
+<p>
+Finally, the <code>gotype</code> command now resides in <code>exp/gotype</code>, while
+<code>ebnflint</code> is now in <code>exp/ebnflint</code>.
+If they are installed, they now reside in <code>$GOROOT/bin/tool</code>.
+</p>
+
+<p>
+<em>Updating</em>:
+Code that uses packages in <code>exp</code> will need to be updated by hand,
+or else compiled from an installation that has <code>exp</code> available.
+The <code>go</code> <code>fix</code> tool or the compiler will complain about such uses.
+</p>
+
+<h3 id="old">The package tree old</h3>
+
+<p>
+Because they are deprecated, the packages under the <code>old</code> directory will not be available in the
+standard Go 1 release distributions, although they will be available in source code form for
+developers who wish to use them.
+</p>
+
+<p>
+The packages in their new locations are:
+</p>
+
+<ul>
+<li><code>old/netchan</code></li>
+<li><code>old/regexp</code></li>
+<li><code>old/template</code></li>
+</ul>
+
+<p>
+<em>Updating</em>:
+Code that uses packages now in <code>old</code> will need to be updated by hand,
+or else compiled from an installation that has <code>old</code> available.
+The <code>go</code> <code>fix</code> tool will warn about such uses.
+</p>
+
+<h3 id="deleted">Deleted packages</h3>
+
+<p>
+Go 1 deletes several packages outright:
+</p>
+
+<ul>
+<li><code>container/vector</code></li>
+<li><code>exp/datafmt</code></li>
+<li><code>go/typechecker</code></li>
+<li><code>try</code></li>
+</ul>
+
+<p>
+and also the command <code>gotry</code>.
+</p>
+
+<p>
+<em>Updating</em>:
+Code that uses <code>container/vector</code> should be updated to use
+slices directly.  See
+<a href="http://code.google.com/p/go-wiki/wiki/SliceTricks">the Go
+Language Community Wiki</a> for some suggestions.
+Code that uses the other packages (there should be almost zero) will need to be rethought.
+</p>
+
+<h3 id="subrepo">Packages moving to subrepositories</h3>
+
+<p>
+Go 1 has moved a number of packages into other repositories, usually sub-repositories of
+<a href="http://code.google.com/p/go/">the main Go repository</a>.
+This table lists the old and new import paths:
+
+<table class="codetable" frame="border" summary="Sub-repositories">
+<colgroup align="left" width="40%"></colgroup>
+<colgroup align="left" width="60%"></colgroup>
+<tr>
+<th align="left">Old</th>
+<th align="left">New</th>
+</tr>
+<tr>
+<td colspan="2"><hr></td>
+</tr>
+<tr><td>crypto/bcrypt</td> <td>code.google.com/p/go.crypto/bcrypt</tr>
+<tr><td>crypto/blowfish</td> <td>code.google.com/p/go.crypto/blowfish</tr>
+<tr><td>crypto/cast5</td> <td>code.google.com/p/go.crypto/cast5</tr>
+<tr><td>crypto/md4</td> <td>code.google.com/p/go.crypto/md4</tr>
+<tr><td>crypto/ocsp</td> <td>code.google.com/p/go.crypto/ocsp</tr>
+<tr><td>crypto/openpgp</td> <td>code.google.com/p/go.crypto/openpgp</tr>
+<tr><td>crypto/openpgp/armor</td> <td>code.google.com/p/go.crypto/openpgp/armor</tr>
+<tr><td>crypto/openpgp/elgamal</td> <td>code.google.com/p/go.crypto/openpgp/elgamal</tr>
+<tr><td>crypto/openpgp/errors</td> <td>code.google.com/p/go.crypto/openpgp/errors</tr>
+<tr><td>crypto/openpgp/packet</td> <td>code.google.com/p/go.crypto/openpgp/packet</tr>
+<tr><td>crypto/openpgp/s2k</td> <td>code.google.com/p/go.crypto/openpgp/s2k</tr>
+<tr><td>crypto/ripemd160</td> <td>code.google.com/p/go.crypto/ripemd160</tr>
+<tr><td>crypto/twofish</td> <td>code.google.com/p/go.crypto/twofish</tr>
+<tr><td>crypto/xtea</td> <td>code.google.com/p/go.crypto/xtea</tr>
+<tr><td>exp/ssh</td> <td>code.google.com/p/go.crypto/ssh</tr>
+<tr>
+<td colspan="2"><hr></td>
+</tr>
+<tr><td>image/bmp</td> <td>code.google.com/p/go.image/bmp</tr>
+<tr><td>image/tiff</td> <td>code.google.com/p/go.image/tiff</tr>
+<tr>
+<td colspan="2"><hr></td>
+</tr>
+<tr><td>net/dict</td> <td>code.google.com/p/go.net/dict</tr>
+<tr><td>net/websocket</td> <td>code.google.com/p/go.net/websocket</tr>
+<tr><td>exp/spdy</td> <td>code.google.com/p/go.net/spdy</tr>
+<tr>
+<td colspan="2"><hr></td>
+</tr>
+<tr><td>encoding/git85</td> <td>code.google.com/p/go.codereview/git85</tr>
+<tr><td>patch</td> <td>code.google.com/p/go.codereview/patch</tr>
+<tr>
+<td colspan="2"><hr></td>
+</tr>
+<tr><td>exp/wingui</td> <td>code.google.com/p/gowingui</tr>
+</table>
+
+<p>
+<em>Updating</em>:
+Running <code>go</code> <code>fix</code> will update imports of these packages to use the new import paths.
+Installations that depend on these packages will need to install them using
+a <code>go get</code> command.
+</p>
+
+<h2 id="major">Major changes to the library</h2>
+
+<p>
+This section describes significant changes to the core libraries, the ones that
+affect the most programs.
+</p>
+
+<h3 id="errors">The error type and errors package</h3>
+
+<p>
+The placement of <code>os.Error</code> in package <code>os</code> is mostly historical: errors first came up when implementing package <code>os</code>, and they seemed system-related at the time.
+Since then it has become clear that errors are more fundamental than the operating system.  For example, it would be nice to use <code>Errors</code> in packages that <code>os</code> depends on, like <code>syscall</code>.
+Also, having <code>Error</code> in <code>os</code> introduces many dependencies on <code>os</code> that would otherwise not exist.
+</p>
+
+<p>
+Go 1 solves these problems by introducing a built-in <code>error</code> interface type and a separate <code>errors</code> package (analogous to <code>bytes</code> and <code>strings</code>) that contains utility functions.
+It replaces <code>os.NewError</code> with
+<a href="/pkg/errors/#New"><code>errors.New</code></a>,
+giving errors a more central place in the environment.
+</p>
+
+<p>
+So the widely-used <code>String</code> method does not cause accidental satisfaction
+of the <code>error</code> interface, the <code>error</code> interface uses instead
+the name <code>Error</code> for that method:
+</p>
+
+<pre>
+    type error interface {
+        Error() string
+    }
+</pre>
+
+<p>
+The <code>fmt</code> library automatically invokes <code>Error</code>, as it already
+does for <code>String</code>, for easy printing of error values.
+</p>
+
+<pre><!--{{code "/doc/progs/go1.go" `/START ERROR EXAMPLE/` `/END ERROR EXAMPLE/`}}
+-->type SyntaxError struct {
+    File    string
+    Line    int
+    Message string
+}
+
+func (se *SyntaxError) Error() string {
+    return fmt.Sprintf(&#34;%s:%d: %s&#34;, se.File, se.Line, se.Message)
+}</pre>
+
+<p>
+All standard packages have been updated to use the new interface; the old <code>os.Error</code> is gone.
+</p>
+
+<p>
+A new package, <a href="/pkg/errors/"><code>errors</code></a>, contains the function
+</p>
+
+<pre>
+func New(text string) error
+</pre>
+
+<p>
+to turn a string into an error. It replaces the old <code>os.NewError</code>.
+</p>
+
+<pre><!--{{code "/doc/progs/go1.go" `/ErrSyntax/`}}
+-->    var ErrSyntax = errors.New(&#34;syntax error&#34;)</pre>
+		
+<p>
+<em>Updating</em>:
+Running <code>go</code> <code>fix</code> will update almost all code affected by the change.
+Code that defines error types with a <code>String</code> method will need to be updated
+by hand to rename the methods to <code>Error</code>.
+</p>
+
+<h3 id="errno">System call errors</h3>
+
+<p>
+The old <code>syscall</code> package, which predated <code>os.Error</code>
+(and just about everything else),
+returned errors as <code>int</code> values.
+In turn, the <code>os</code> package forwarded many of these errors, such
+as <code>EINVAL</code>, but using a different set of errors on each platform.
+This behavior was unpleasant and unportable.
+</p>
+
+<p>
+In Go 1, the
+<a href="/pkg/syscall/"><code>syscall</code></a>
+package instead returns an <code>error</code> for system call errors.
+On Unix, the implementation is done by a
+<a href="/pkg/syscall/#Errno"><code>syscall.Errno</code></a> type
+that satisfies <code>error</code> and replaces the old <code>os.Errno</code>.
+</p>
+
+<p>
+The changes affecting <code>os.EINVAL</code> and relatives are
+described <a href="#os">elsewhere</a>.
+
+<p>
+<em>Updating</em>:
+Running <code>go</code> <code>fix</code> will update almost all code affected by the change.
+Regardless, most code should use the <code>os</code> package
+rather than <code>syscall</code> and so will be unaffected.
+</p>
+
+<h3 id="time">Time</h3>
+
+<p>
+Time is always a challenge to support well in a programming language.
+The old Go <code>time</code> package had <code>int64</code> units, no
+real type safety,
+and no distinction between absolute times and durations.
+</p>
+
+<p>
+One of the most sweeping changes in the Go 1 library is therefore a
+complete redesign of the
+<a href="/pkg/time/"><code>time</code></a> package.
+Instead of an integer number of nanoseconds as an <code>int64</code>,
+and a separate <code>*time.Time</code> type to deal with human
+units such as hours and years,
+there are now two fundamental types:
+<a href="/pkg/time/#Time"><code>time.Time</code></a>
+(a value, so the <code>*</code> is gone), which represents a moment in time;
+and <a href="/pkg/time/#Duration"><code>time.Duration</code></a>,
+which represents an interval.
+Both have nanosecond resolution.
+A <code>Time</code> can represent any time into the ancient
+past and remote future, while a <code>Duration</code> can
+span plus or minus only about 290 years.
+There are methods on these types, plus a number of helpful
+predefined constant durations such as <code>time.Second</code>.
+</p>
+
+<p>
+Among the new methods are things like
+<a href="/pkg/time/#Time.Add"><code>Time.Add</code></a>,
+which adds a <code>Duration</code> to a <code>Time</code>, and
+<a href="/pkg/time/#Time.Sub"><code>Time.Sub</code></a>,
+which subtracts two <code>Times</code> to yield a <code>Duration</code>.
+</p>
+
+<p>
+The most important semantic change is that the Unix epoch (Jan 1, 1970) is now
+relevant only for those functions and methods that mention Unix:
+<a href="/pkg/time/#Unix"><code>time.Unix</code></a>
+and the <a href="/pkg/time/#Time.Unix"><code>Unix</code></a>
+and <a href="/pkg/time/#Time.UnixNano"><code>UnixNano</code></a> methods
+of the <code>Time</code> type.
+In particular,
+<a href="/pkg/time/#Now"><code>time.Now</code></a>
+returns a <code>time.Time</code> value rather than, in the old
+API, an integer nanosecond count since the Unix epoch.
+</p>
+
+<pre><!--{{code "/doc/progs/go1.go" `/sleepUntil/` `/^}/`}}
+--><span class="comment">// sleepUntil sleeps until the specified time. It returns immediately if it&#39;s too late.</span>
+func sleepUntil(wakeup time.Time) {
+    now := time.Now() <span class="comment">// A Time.</span>
+    if !wakeup.After(now) {
+        return
+    }
+    delta := wakeup.Sub(now) <span class="comment">// A Duration.</span>
+    fmt.Printf(&#34;Sleeping for %.3fs\n&#34;, delta.Seconds())
+    time.Sleep(delta)
+}</pre>
+
+<p>
+The new types, methods, and constants have been propagated through
+all the standard packages that use time, such as <code>os</code> and
+its representation of file time stamps.
+</p>
+
+<p>
+<em>Updating</em>:
+The <code>go</code> <code>fix</code> tool will update many uses of the old <code>time</code> package to use the new
+types and methods, although it does not replace values such as <code>1e9</code>
+representing nanoseconds per second.
+Also, because of type changes in some of the values that arise,
+some of the expressions rewritten by the fix tool may require
+further hand editing; in such cases the rewrite will include
+the correct function or method for the old functionality, but
+may have the wrong type or require further analysis.
+</p>
+
+<h2 id="minor">Minor changes to the library</h2>
+
+<p>
+This section describes smaller changes, such as those to less commonly
+used packages or that affect
+few programs beyond the need to run <code>go</code> <code>fix</code>.
+This category includes packages that are new in Go 1.
+Collectively they improve portability, regularize behavior, and
+make the interfaces more modern and Go-like.
+</p>
+
+<h3 id="archive_zip">The archive/zip package</h3>
+
+<p>
+In Go 1, <a href="/pkg/archive/zip/#Writer"><code>*zip.Writer</code></a> no
+longer has a <code>Write</code> method. Its presence was a mistake.
+</p>
+
+<p>
+<em>Updating</em>:
+What little code is affected will be caught by the compiler and must be updated by hand.
+</p>
+
+<h3 id="bufio">The bufio package</h3>
+
+<p>
+In Go 1, <a href="/pkg/bufio/#NewReaderSize"><code>bufio.NewReaderSize</code></a>
+and
+<a href="/pkg/bufio/#NewWriterSize"><code>bufio.NewWriterSize</code></a>
+functions no longer return an error for invalid sizes.
+If the argument size is too small or invalid, it is adjusted.
+</p>
+
+<p>
+<em>Updating</em>:
+Running <code>go</code> <code>fix</code> will update calls that assign the error to _.
+Calls that aren't fixed will be caught by the compiler and must be updated by hand.
+</p>
+
+<h3 id="compress">The compress/flate, compress/gzip and compress/zlib packages</h3>
+
+<p>
+In Go 1, the <code>NewWriterXxx</code> functions in
+<a href="/pkg/compress/flate"><code>compress/flate</code></a>,
+<a href="/pkg/compress/gzip"><code>compress/gzip</code></a> and
+<a href="/pkg/compress/zlib"><code>compress/zlib</code></a>
+all return <code>(*Writer, error)</code> if they take a compression level,
+and <code>*Writer</code> otherwise. Package <code>gzip</code>'s
+<code>Compressor</code> and <code>Decompressor</code> types have been renamed
+to <code>Writer</code> and <code>Reader</code>. Package <code>flate</code>'s
+<code>WrongValueError</code> type has been removed.
+</p>
+
+<p>
+<em>Updating</em>
+Running <code>go</code> <code>fix</code> will update old names and calls that assign the error to _.
+Calls that aren't fixed will be caught by the compiler and must be updated by hand.
+</p>
+
+<h3 id="crypto_aes_des">The crypto/aes and crypto/des packages</h3>
+
+<p>
+In Go 1, the <code>Reset</code> method has been removed. Go does not guarantee
+that memory is not copied and therefore this method was misleading.
+</p>
+
+<p>
+The cipher-specific types <code>*aes.Cipher</code>, <code>*des.Cipher</code>,
+and <code>*des.TripleDESCipher</code> have been removed in favor of
+<code>cipher.Block</code>.
+</p>
+
+<p>
+<em>Updating</em>:
+Remove the calls to Reset. Replace uses of the specific cipher types with
+cipher.Block.
+</p>
+
+<h3 id="crypto_elliptic">The crypto/elliptic package</h3>
+
+<p>
+In Go 1, <a href="/pkg/crypto/elliptic/#Curve"><code>elliptic.Curve</code></a>
+has been made an interface to permit alternative implementations. The curve
+parameters have been moved to the
+<a href="/pkg/crypto/elliptic/#CurveParams"><code>elliptic.CurveParams</code></a>
+structure.
+</p>
+
+<p>
+<em>Updating</em>:
+Existing users of <code>*elliptic.Curve</code> will need to change to
+simply <code>elliptic.Curve</code>. Calls to <code>Marshal</code>,
+<code>Unmarshal</code> and <code>GenerateKey</code> are now functions
+in <code>crypto/elliptic</code> that take an <code>elliptic.Curve</code>
+as their first argument.
+</p>
+
+<h3 id="crypto_hmac">The crypto/hmac package</h3>
+
+<p>
+In Go 1, the hash-specific functions, such as <code>hmac.NewMD5</code>, have
+been removed from <code>crypto/hmac</code>. Instead, <code>hmac.New</code> takes
+a function that returns a <code>hash.Hash</code>, such as <code>md5.New</code>.
+</p>
+
+<p>
+<em>Updating</em>:
+Running <code>go</code> <code>fix</code> will perform the needed changes.
+</p>
+
+<h3 id="crypto_x509">The crypto/x509 package</h3>
+
+<p>
+In Go 1, the
+<a href="/pkg/crypto/x509/#CreateCertificate"><code>CreateCertificate</code></a>
+and
+<a href="/pkg/crypto/x509/#CreateCRL"><code>CreateCRL</code></a>
+functions in <code>crypto/x509</code> have been altered to take an
+<code>interface{}</code> where they previously took a <code>*rsa.PublicKey</code>
+or <code>*rsa.PrivateKey</code>. This will allow other public key algorithms
+to be implemented in the future.
+</p>
+
+<p>
+<em>Updating</em>:
+No changes will be needed.
+</p>
+
+<h3 id="encoding_binary">The encoding/binary package</h3>
+
+<p>
+In Go 1, the <code>binary.TotalSize</code> function has been replaced by
+<a href="/pkg/encoding/binary/#Size"><code>Size</code></a>,
+which takes an <code>interface{}</code> argument rather than
+a <code>reflect.Value</code>.
+</p>
+
+<p>
+<em>Updating</em>:
+What little code is affected will be caught by the compiler and must be updated by hand.
+</p>
+
+<h3 id="encoding_xml">The encoding/xml package</h3>
+
+<p>
+In Go 1, the <a href="/pkg/encoding/xml/"><code>xml</code></a> package
+has been brought closer in design to the other marshaling packages such
+as <a href="/pkg/encoding/gob/"><code>encoding/gob</code></a>.
+</p>
+
+<p>
+The old <code>Parser</code> type is renamed
+<a href="/pkg/encoding/xml/#Decoder"><code>Decoder</code></a> and has a new
+<a href="/pkg/encoding/xml/#Decoder.Decode"><code>Decode</code></a> method. An
+<a href="/pkg/encoding/xml/#Encoder"><code>Encoder</code></a> type was also introduced.
+</p>
+
+<p>
+The functions <a href="/pkg/encoding/xml/#Marshal"><code>Marshal</code></a>
+and <a href="/pkg/encoding/xml/#Unmarshal"><code>Unmarshal</code></a>
+work with <code>[]byte</code> values now. To work with streams,
+use the new <a href="/pkg/encoding/xml/#Encoder"><code>Encoder</code></a>
+and <a href="/pkg/encoding/xml/#Decoder"><code>Decoder</code></a> types.
+</p>
+
+<p>
+When marshaling or unmarshaling values, the format of supported flags in
+field tags has changed to be closer to the
+<a href="/pkg/encoding/json"><code>json</code></a> package
+(<code>`xml:"name,flag"`</code>). The matching done between field tags, field
+names, and the XML attribute and element names is now case-sensitive.
+The <code>XMLName</code> field tag, if present, must also match the name
+of the XML element being marshaled.
+</p>
+
+<p>
+<em>Updating</em>:
+Running <code>go</code> <code>fix</code> will update most uses of the package except for some calls to
+<code>Unmarshal</code>. Special care must be taken with field tags,
+since the fix tool will not update them and if not fixed by hand they will
+misbehave silently in some cases. For example, the old
+<code>"attr"</code> is now written <code>",attr"</code> while plain
+<code>"attr"</code> remains valid but with a different meaning.
+</p>
+
+<h3 id="expvar">The expvar package</h3>
+
+<p>
+In Go 1, the <code>RemoveAll</code> function has been removed.
+The <code>Iter</code> function and Iter method on <code>*Map</code> have
+been replaced by
+<a href="/pkg/expvar/#Do"><code>Do</code></a>
+and
+<a href="/pkg/expvar/#Map.Do"><code>(*Map).Do</code></a>.
+</p>
+
+<p>
+<em>Updating</em>:
+Most code using <code>expvar</code> will not need changing. The rare code that used
+<code>Iter</code> can be updated to pass a closure to <code>Do</code> to achieve the same effect.
+</p>
+
+<h3 id="flag">The flag package</h3>
+
+<p>
+In Go 1, the interface <a href="/pkg/flag/#Value"><code>flag.Value</code></a> has changed slightly.
+The <code>Set</code> method now returns an <code>error</code> instead of
+a <code>bool</code> to indicate success or failure.
+</p>
+
+<p>
+There is also a new kind of flag, <code>Duration</code>, to support argument
+values specifying time intervals.
+Values for such flags must be given units, just as <code>time.Duration</code>
+formats them: <code>10s</code>, <code>1h30m</code>, etc.
+</p>
+
+<pre><!--{{code "/doc/progs/go1.go" `/timeout/`}}
+-->var timeout = flag.Duration(&#34;timeout&#34;, 30*time.Second, &#34;how long to wait for completion&#34;)</pre>
+
+<p>
+<em>Updating</em>:
+Programs that implement their own flags will need minor manual fixes to update their
+<code>Set</code> methods.
+The <code>Duration</code> flag is new and affects no existing code.
+</p>
+
+
+<h3 id="go">The go/* packages</h3>
+
+<p>
+Several packages under <code>go</code> have slightly revised APIs.
+</p>
+
+<p>
+A concrete <code>Mode</code> type was introduced for configuration mode flags
+in the packages
+<a href="/pkg/go/scanner/"><code>go/scanner</code></a>,
+<a href="/pkg/go/parser/"><code>go/parser</code></a>,
+<a href="/pkg/go/printer/"><code>go/printer</code></a>, and
+<a href="/pkg/go/doc/"><code>go/doc</code></a>.
+</p>
+
+<p>
+The modes <code>AllowIllegalChars</code> and <code>InsertSemis</code> have been removed
+from the <a href="/pkg/go/scanner/"><code>go/scanner</code></a> package. They were mostly
+useful for scanning text other then Go source files. Instead, the
+<a href="/pkg/text/scanner/"><code>text/scanner</code></a> package should be used
+for that purpose.
+</p>
+
+<p>
+The <a href="/pkg/go/scanner/#ErrorHandler"><code>ErrorHandler</code></a> provided
+to the scanner's <a href="/pkg/go/scanner/#Scanner.Init"><code>Init</code></a> method is
+now simply a function rather than an interface. The <code>ErrorVector</code> type has
+been removed in favor of the (existing) <a href="/pkg/go/scanner/#ErrorList"><code>ErrorList</code></a>
+type, and the <code>ErrorVector</code> methods have been migrated. Instead of embedding
+an <code>ErrorVector</code> in a client of the scanner, now a client should maintain
+an <code>ErrorList</code>.
+</p>
+
+<p>
+The set of parse functions provided by the <a href="/pkg/go/parser/"><code>go/parser</code></a>
+package has been reduced to the primary parse function
+<a href="/pkg/go/parser/#ParseFile"><code>ParseFile</code></a>, and a couple of
+convenience functions <a href="/pkg/go/parser/#ParseDir"><code>ParseDir</code></a>
+and <a href="/pkg/go/parser/#ParseExpr"><code>ParseExpr</code></a>.
+</p>
+
+<p>
+The <a href="/pkg/go/printer/"><code>go/printer</code></a> package supports an additional
+configuration mode <a href="/pkg/go/printer/#Mode"><code>SourcePos</code></a>;
+if set, the printer will emit <code>//line</code> comments such that the generated
+output contains the original source code position information. The new type
+<a href="/pkg/go/printer/#CommentedNode"><code>CommentedNode</code></a> can be
+used to provide comments associated with an arbitrary
+<a href="/pkg/go/ast/#Node"><code>ast.Node</code></a> (until now only
+<a href="/pkg/go/ast/#File"><code>ast.File</code></a> carried comment information).
+</p>
+
+<p>
+The type names of the <a href="/pkg/go/doc/"><code>go/doc</code></a> package have been
+streamlined by removing the <code>Doc</code> suffix: <code>PackageDoc</code>
+is now <code>Package</code>, <code>ValueDoc</code> is <code>Value</code>, etc.
+Also, all types now consistently have a <code>Name</code> field (or <code>Names</code>,
+in the case of type <code>Value</code>) and <code>Type.Factories</code> has become
+<code>Type.Funcs</code>.
+Instead of calling <code>doc.NewPackageDoc(pkg, importpath)</code>,
+documentation for a package is created with:
+</p>
+
+<pre>
+    doc.New(pkg, importpath, mode)
+</pre>
+
+<p>
+where the new <code>mode</code> parameter specifies the operation mode:
+if set to <a href="/pkg/go/doc/#AllDecls"><code>AllDecls</code></a>, all declarations
+(not just exported ones) are considered.
+The function <code>NewFileDoc</code> was removed, and the function
+<code>CommentText</code> has become the method
+<a href="/pkg/go/ast/#Text"><code>Text</code></a> of
+<a href="/pkg/go/ast/#CommentGroup"><code>ast.CommentGroup</code></a>.
+</p>
+
+<p>
+In package <a href="/pkg/go/token/"><code>go/token</code></a>, the
+<a href="/pkg/go/token/#FileSet"><code>token.FileSet</code></a> method <code>Files</code>
+(which originally returned a channel of <code>*token.File</code>s) has been replaced
+with the iterator <a href="/pkg/go/token/#FileSet.Iterate"><code>Iterate</code></a> that
+accepts a function argument instead.
+</p>
+
+<p>
+In package <a href="/pkg/go/build/"><code>go/build</code></a>, the API
+has been nearly completely replaced.
+The package still computes Go package information
+but it does not run the build: the <code>Cmd</code> and <code>Script</code>
+types are gone.
+(To build code, use the new
+<a href="/cmd/go/"><code>go</code></a> command instead.)
+The <code>DirInfo</code> type is now named
+<a href="/pkg/go/build/#Package"><code>Package</code></a>.
+<code>FindTree</code> and <code>ScanDir</code> are replaced by
+<a href="/pkg/go/build/#Import"><code>Import</code></a>
+and
+<a href="/pkg/go/build/#ImportDir"><code>ImportDir</code></a>.
+</p>
+
+<p>
+<em>Updating</em>:
+Code that uses packages in <code>go</code> will have to be updated by hand; the
+compiler will reject incorrect uses. Templates used in conjunction with any of the
+<code>go/doc</code> types may need manual fixes; the renamed fields will lead
+to run-time errors.
+</p>
+
+<h3 id="hash">The hash package</h3>
+
+<p>
+In Go 1, the definition of <a href="/pkg/hash/#Hash"><code>hash.Hash</code></a> includes
+a new method, <code>BlockSize</code>.  This new method is used primarily in the
+cryptographic libraries.
+</p>
+
+<p>
+The <code>Sum</code> method of the
+<a href="/pkg/hash/#Hash"><code>hash.Hash</code></a> interface now takes a
+<code>[]byte</code> argument, to which the hash value will be appended.
+The previous behavior can be recreated by adding a <code>nil</code> argument to the call.
+</p>
+
+<p>
+<em>Updating</em>:
+Existing implementations of <code>hash.Hash</code> will need to add a
+<code>BlockSize</code> method.  Hashes that process the input one byte at
+a time can implement <code>BlockSize</code> to return 1.
+Running <code>go</code> <code>fix</code> will update calls to the <code>Sum</code> methods of the various
+implementations of <code>hash.Hash</code>.
+</p>
+
+<p>
+<em>Updating</em>:
+Since the package's functionality is new, no updating is necessary.
+</p>
+
+<h3 id="http">The http package</h3>
+
+<p>
+In Go 1 the <a href="/pkg/net/http/"><code>http</code></a> package is refactored,
+putting some of the utilities into a
+<a href="/pkg/net/http/httputil/"><code>httputil</code></a> subdirectory.
+These pieces are only rarely needed by HTTP clients.
+The affected items are:
+</p>
+
+<ul>
+<li>ClientConn</li>
+<li>DumpRequest</li>
+<li>DumpRequestOut</li>
+<li>DumpResponse</li>
+<li>NewChunkedReader</li>
+<li>NewChunkedWriter</li>
+<li>NewClientConn</li>
+<li>NewProxyClientConn</li>
+<li>NewServerConn</li>
+<li>NewSingleHostReverseProxy</li>
+<li>ReverseProxy</li>
+<li>ServerConn</li>
+</ul>
+
+<p>
+The <code>Request.RawURL</code> field has been removed; it was a
+historical artifact.
+</p>
+
+<p>
+The <code>Handle</code> and <code>HandleFunc</code>
+functions, and the similarly-named methods of <code>ServeMux</code>,
+now panic if an attempt is made to register the same pattern twice.
+</p>
+
+<p>
+<em>Updating</em>:
+Running <code>go</code> <code>fix</code> will update the few programs that are affected except for
+uses of <code>RawURL</code>, which must be fixed by hand.
+</p>
+
+<h3 id="image">The image package</h3>
+
+<p>
+The <a href="/pkg/image/"><code>image</code></a> package has had a number of
+minor changes, rearrangements and renamings.
+</p>
+
+<p>
+Most of the color handling code has been moved into its own package,
+<a href="/pkg/image/color/"><code>image/color</code></a>.
+For the elements that moved, a symmetry arises; for instance,
+each pixel of an
+<a href="/pkg/image/#RGBA"><code>image.RGBA</code></a>
+is a
+<a href="/pkg/image/color/#RGBA"><code>color.RGBA</code></a>.
+</p>
+
+<p>
+The old <code>image/ycbcr</code> package has been folded, with some
+renamings, into the
+<a href="/pkg/image/"><code>image</code></a>
+and
+<a href="/pkg/image/color/"><code>image/color</code></a>
+packages.
+</p>
+
+<p>
+The old <code>image.ColorImage</code> type is still in the <code>image</code>
+package but has been renamed
+<a href="/pkg/image/#Uniform"><code>image.Uniform</code></a>,
+while <code>image.Tiled</code> has been removed.
+</p>
+
+<p>
+This table lists the renamings.
+</p>
+
+<table class="codetable" frame="border" summary="image renames">
+<colgroup align="left" width="50%"></colgroup>
+<colgroup align="left" width="50%"></colgroup>
+<tr>
+<th align="left">Old</th>
+<th align="left">New</th>
+</tr>
+<tr>
+<td colspan="2"><hr></td>
+</tr>
+<tr><td>image.Color</td> <td>color.Color</td></tr>
+<tr><td>image.ColorModel</td> <td>color.Model</td></tr>
+<tr><td>image.ColorModelFunc</td> <td>color.ModelFunc</td></tr>
+<tr><td>image.PalettedColorModel</td> <td>color.Palette</td></tr>
+<tr>
+<td colspan="2"><hr></td>
+</tr>
+<tr><td>image.RGBAColor</td> <td>color.RGBA</td></tr>
+<tr><td>image.RGBA64Color</td> <td>color.RGBA64</td></tr>
+<tr><td>image.NRGBAColor</td> <td>color.NRGBA</td></tr>
+<tr><td>image.NRGBA64Color</td> <td>color.NRGBA64</td></tr>
+<tr><td>image.AlphaColor</td> <td>color.Alpha</td></tr>
+<tr><td>image.Alpha16Color</td> <td>color.Alpha16</td></tr>
+<tr><td>image.GrayColor</td> <td>color.Gray</td></tr>
+<tr><td>image.Gray16Color</td> <td>color.Gray16</td></tr>
+<tr>
+<td colspan="2"><hr></td>
+</tr>
+<tr><td>image.RGBAColorModel</td> <td>color.RGBAModel</td></tr>
+<tr><td>image.RGBA64ColorModel</td> <td>color.RGBA64Model</td></tr>
+<tr><td>image.NRGBAColorModel</td> <td>color.NRGBAModel</td></tr>
+<tr><td>image.NRGBA64ColorModel</td> <td>color.NRGBA64Model</td></tr>
+<tr><td>image.AlphaColorModel</td> <td>color.AlphaModel</td></tr>
+<tr><td>image.Alpha16ColorModel</td> <td>color.Alpha16Model</td></tr>
+<tr><td>image.GrayColorModel</td> <td>color.GrayModel</td></tr>
+<tr><td>image.Gray16ColorModel</td> <td>color.Gray16Model</td></tr>
+<tr>
+<td colspan="2"><hr></td>
+</tr>
+<tr><td>ycbcr.RGBToYCbCr</td> <td>color.RGBToYCbCr</td></tr>
+<tr><td>ycbcr.YCbCrToRGB</td> <td>color.YCbCrToRGB</td></tr>
+<tr><td>ycbcr.YCbCrColorModel</td> <td>color.YCbCrModel</td></tr>
+<tr><td>ycbcr.YCbCrColor</td> <td>color.YCbCr</td></tr>
+<tr><td>ycbcr.YCbCr</td> <td>image.YCbCr</td></tr>
+<tr>
+<td colspan="2"><hr></td>
+</tr>
+<tr><td>ycbcr.SubsampleRatio444</td> <td>image.YCbCrSubsampleRatio444</td></tr>
+<tr><td>ycbcr.SubsampleRatio422</td> <td>image.YCbCrSubsampleRatio422</td></tr>
+<tr><td>ycbcr.SubsampleRatio420</td> <td>image.YCbCrSubsampleRatio420</td></tr>
+<tr>
+<td colspan="2"><hr></td>
+</tr>
+<tr><td>image.ColorImage</td> <td>image.Uniform</td></tr>
+</table>
+
+<p>
+The image package's <code>New</code> functions
+(<a href="/pkg/image/#NewRGBA"><code>NewRGBA</code></a>,
+<a href="/pkg/image/#NewRGBA64"><code>NewRGBA64</code></a>, etc.)
+take an <a href="/pkg/image/#Rectangle"><code>image.Rectangle</code></a> as an argument
+instead of four integers.
+</p>
+
+<p>
+Finally, there are new predefined <code>color.Color</code> variables
+<a href="/pkg/image/color/#Black"><code>color.Black</code></a>,
+<a href="/pkg/image/color/#White"><code>color.White</code></a>,
+<a href="/pkg/image/color/#Opaque"><code>color.Opaque</code></a>
+and
+<a href="/pkg/image/color/#Transparent"><code>color.Transparent</code></a>.
+</p>
+
+<p>
+<em>Updating</em>:
+Running <code>go</code> <code>fix</code> will update almost all code affected by the change.
+</p>
+
+<h3 id="log_syslog">The log/syslog package</h3>
+
+<p>
+In Go 1, the <a href="/pkg/log/syslog/#NewLogger"><code>syslog.NewLogger</code></a>
+function returns an error as well as a <code>log.Logger</code>.
+</p>
+
+<p>
+<em>Updating</em>:
+What little code is affected will be caught by the compiler and must be updated by hand.
+</p>
+
+<h3 id="mime">The mime package</h3>
+
+<p>
+In Go 1, the <a href="/pkg/mime/#FormatMediaType"><code>FormatMediaType</code></a> function
+of the <code>mime</code> package has  been simplified to make it
+consistent with
+<a href="/pkg/mime/#ParseMediaType"><code>ParseMediaType</code></a>.
+It now takes <code>"text/html"</code> rather than <code>"text"</code> and <code>"html"</code>.
+</p>
+
+<p>
+<em>Updating</em>:
+What little code is affected will be caught by the compiler and must be updated by hand.
+</p>
+
+<h3 id="net">The net package</h3>
+
+<p>
+In Go 1, the various <code>SetTimeout</code>,
+<code>SetReadTimeout</code>, and <code>SetWriteTimeout</code> methods
+have been replaced with
+<a href="/pkg/net/#IPConn.SetDeadline"><code>SetDeadline</code></a>,
+<a href="/pkg/net/#IPConn.SetReadDeadline"><code>SetReadDeadline</code></a>, and
+<a href="/pkg/net/#IPConn.SetWriteDeadline"><code>SetWriteDeadline</code></a>,
+respectively.  Rather than taking a timeout value in nanoseconds that
+apply to any activity on the connection, the new methods set an
+absolute deadline (as a <code>time.Time</code> value) after which
+reads and writes will time out and no longer block.
+</p>
+
+<p>
+There are also new functions
+<a href="/pkg/net/#DialTimeout"><code>net.DialTimeout</code></a>
+to simplify timing out dialing a network address and
+<a href="/pkg/net/#ListenMulticastUDP"><code>net.ListenMulticastUDP</code></a>
+to allow multicast UDP to listen concurrently across multiple listeners.
+The <code>net.ListenMulticastUDP</code> function replaces the old
+<code>JoinGroup</code> and <code>LeaveGroup</code> methods.
+</p>
+
+<p>
+<em>Updating</em>:
+Code that uses the old methods will fail to compile and must be updated by hand.
+The semantic change makes it difficult for the fix tool to update automatically.
+</p>
+
+<h3 id="os">The os package</h3>
+
+<p>
+The <code>Time</code> function has been removed; callers should use
+the <a href="/pkg/time/#Time"><code>Time</code></a> type from the
+<code>time</code> package.
+</p>
+
+<p>
+The <code>Exec</code> function has been removed; callers should use
+<code>Exec</code> from the <code>syscall</code> package, where available.
+</p>
+
+<p>
+The <code>ShellExpand</code> function has been renamed to <a
+href="/pkg/os/#ExpandEnv"><code>ExpandEnv</code></a>.
+</p>
+
+<p>
+The <a href="/pkg/os/#NewFile"><code>NewFile</code></a> function
+now takes a <code>uintptr</code> fd, instead of an <code>int</code>.
+The <a href="/pkg/os/#File.Fd"><code>Fd</code></a> method on files now
+also returns a <code>uintptr</code>.
+</p>
+
+<p>
+There are no longer error constants such as <code>EINVAL</code>
+in the <code>os</code> package, since the set of values varied with
+the underlying operating system. There are new portable functions like
+<a href="/pkg/os/#IsPermission"><code>IsPermission</code></a>
+to test common error properties, plus a few new error values
+with more Go-like names, such as
+<a href="/pkg/os/#ErrPermission"><code>ErrPermission</code></a>
+and
+<a href="/pkg/os/#ErrNoEnv"><code>ErrNoEnv</code></a>.
+</p>
+
+<p>
+The <code>Getenverror</code> function has been removed. To distinguish
+between a non-existent environment variable and an empty string,
+use <a href="/pkg/os/#Environ"><code>os.Environ</code></a> or
+<a href="/pkg/syscall/#Getenv"><code>syscall.Getenv</code></a>.
+</p>
+
+
+<p>
+The <a href="/pkg/os/#Process.Wait"><code>Process.Wait</code></a> method has
+dropped its option argument and the associated constants are gone
+from the package.
+Also, the function <code>Wait</code> is gone; only the method of
+the <code>Process</code> type persists.
+</p>
+
+<p>
+The <code>Waitmsg</code> type returned by
+<a href="/pkg/os/#Process.Wait"><code>Process.Wait</code></a>
+has been replaced with a more portable
+<a href="/pkg/os/#ProcessState"><code>ProcessState</code></a>
+type with accessor methods to recover information about the
+process.
+Because of changes to <code>Wait</code>, the <code>ProcessState</code>
+value always describes an exited process.
+Portability concerns simplified the interface in other ways, but the values returned by the
+<a href="/pkg/os/#ProcessState.Sys"><code>ProcessState.Sys</code></a> and
+<a href="/pkg/os/#ProcessState.SysUsage"><code>ProcessState.SysUsage</code></a>
+methods can be type-asserted to underlying system-specific data structures such as
+<a href="/pkg/syscall/#WaitStatus"><code>syscall.WaitStatus</code></a> and
+<a href="/pkg/syscall/#Rusage"><code>syscall.Rusage</code></a> on Unix.
+</p>
+
+<p>
+<em>Updating</em>:
+Running <code>go</code> <code>fix</code> will drop a zero argument to <code>Process.Wait</code>.
+All other changes will be caught by the compiler and must be updated by hand.
+</p>
+
+<h4 id="os_fileinfo">The os.FileInfo type</h4>
+
+<p>
+Go 1 redefines the <a href="/pkg/os/#FileInfo"><code>os.FileInfo</code></a> type,
+changing it from a struct to an interface:
+</p>
+
+<pre>
+    type FileInfo interface {
+        Name() string       // base name of the file
+        Size() int64        // length in bytes
+        Mode() FileMode     // file mode bits
+        ModTime() time.Time // modification time
+        IsDir() bool        // abbreviation for Mode().IsDir()
+        Sys() interface{}   // underlying data source (can return nil)
+    }
+</pre>
+
+<p>
+The file mode information has been moved into a subtype called
+<a href="/pkg/os/#FileMode"><code>os.FileMode</code></a>,
+a simple integer type with <code>IsDir</code>, <code>Perm</code>, and <code>String</code>
+methods.
+</p>
+
+<p>
+The system-specific details of file modes and properties such as (on Unix)
+i-number have been removed from <code>FileInfo</code> altogether.
+Instead, each operating system's <code>os</code> package provides an
+implementation of the <code>FileInfo</code> interface, which
+has a <code>Sys</code> method that returns the
+system-specific representation of file metadata.
+For instance, to discover the i-number of a file on a Unix system, unpack
+the <code>FileInfo</code> like this:
+</p>
+
+<pre>
+    fi, err := os.Stat("hello.go")
+    if err != nil {
+        log.Fatal(err)
+    }
+    // Check that it's a Unix file.
+    unixStat, ok := fi.Sys().(*syscall.Stat_t)
+    if !ok {
+        log.Fatal("hello.go: not a Unix file")
+    }
+    fmt.Printf("file i-number: %d\n", unixStat.Ino)
+</pre>
+
+<p>
+Assuming (which is unwise) that <code>"hello.go"</code> is a Unix file,
+the i-number expression could be contracted to
+</p>
+
+<pre>
+    fi.Sys().(*syscall.Stat_t).Ino
+</pre>
+
+<p>
+The vast majority of uses of <code>FileInfo</code> need only the methods
+of the standard interface.
+</p>
+
+<p>
+The <code>os</code> package no longer contains wrappers for the POSIX errors
+such as <code>ENOENT</code>.
+For the few programs that need to verify particular error conditions, there are
+now the boolean functions
+<a href="/pkg/os/#IsExist"><code>IsExist</code></a>,
+<a href="/pkg/os/#IsNotExist"><code>IsNotExist</code></a>
+and
+<a href="/pkg/os/#IsPermission"><code>IsPermission</code></a>.
+</p>
+
+<pre><!--{{code "/doc/progs/go1.go" `/os\.Open/` `/}/`}}
+-->    f, err := os.OpenFile(name, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0600)
+    if os.IsExist(err) {
+        log.Printf(&#34;%s already exists&#34;, name)
+    }</pre>
+
+<p>
+<em>Updating</em>:
+Running <code>go</code> <code>fix</code> will update code that uses the old equivalent of the current <code>os.FileInfo</code>
+and <code>os.FileMode</code> API.
+Code that needs system-specific file details will need to be updated by hand.
+Code that uses the old POSIX error values from the <code>os</code> package
+will fail to compile and will also need to be updated by hand.
+</p>
+
+<h3 id="os_signal">The os/signal package</h3>
+
+<p>
+The <code>os/signal</code> package in Go 1 replaces the
+<code>Incoming</code> function, which returned a channel
+that received all incoming signals,
+with the selective <code>Notify</code> function, which asks
+for delivery of specific signals on an existing channel.
+</p>
+
+<p>
+<em>Updating</em>:
+Code must be updated by hand.
+A literal translation of
+</p>
+<pre>
+c := signal.Incoming()
+</pre>
+<p>
+is
+</p>
+<pre>
+c := make(chan os.Signal)
+signal.Notify(c) // ask for all signals
+</pre>
+<p>
+but most code should list the specific signals it wants to handle instead:
+</p>
+<pre>
+c := make(chan os.Signal)
+signal.Notify(c, syscall.SIGHUP, syscall.SIGQUIT)
+</pre>
+
+<h3 id="path_filepath">The path/filepath package</h3>
+
+<p>
+In Go 1, the <a href="/pkg/path/filepath/#Walk"><code>Walk</code></a> function of the
+<code>path/filepath</code> package
+has been changed to take a function value of type
+<a href="/pkg/path/filepath/#WalkFunc"><code>WalkFunc</code></a>
+instead of a <code>Visitor</code> interface value.
+<code>WalkFunc</code> unifies the handling of both files and directories.
+</p>
+
+<pre>
+    type WalkFunc func(path string, info os.FileInfo, err error) error
+</pre>
+
+<p>
+The <code>WalkFunc</code> function will be called even for files or directories that could not be opened;
+in such cases the error argument will describe the failure.
+If a directory's contents are to be skipped,
+the function should return the value <a href="/pkg/path/filepath/#variables"><code>filepath.SkipDir</code></a>
+</p>
+
+<pre><!--{{code "/doc/progs/go1.go" `/STARTWALK/` `/ENDWALK/`}}
+-->    markFn := func(path string, info os.FileInfo, err error) error {
+        if path == &#34;pictures&#34; { <span class="comment">// Will skip walking of directory pictures and its contents.</span>
+            return filepath.SkipDir
+        }
+        if err != nil {
+            return err
+        }
+        log.Println(path)
+        return nil
+    }
+    err := filepath.Walk(&#34;.&#34;, markFn)
+    if err != nil {
+        log.Fatal(err)
+    }</pre>
+
+<p>
+<em>Updating</em>:
+The change simplifies most code but has subtle consequences, so affected programs
+will need to be updated by hand.
+The compiler will catch code using the old interface.
+</p>
+
+<h3 id="regexp">The regexp package</h3>
+
+<p>
+The <a href="/pkg/regexp/"><code>regexp</code></a> package has been rewritten.
+It has the same interface but the specification of the regular expressions
+it supports has changed from the old "egrep" form to that of
+<a href="http://code.google.com/p/re2/">RE2</a>.
+</p>
+
+<p>
+<em>Updating</em>:
+Code that uses the package should have its regular expressions checked by hand.
+</p>
+
+<h3 id="runtime">The runtime package</h3>
+
+<p>
+In Go 1, much of the API exported by package
+<code>runtime</code> has been removed in favor of
+functionality provided by other packages.
+Code using the <code>runtime.Type</code> interface
+or its specific concrete type implementations should
+now use package <a href="/pkg/reflect/"><code>reflect</code></a>.
+Code using <code>runtime.Semacquire</code> or <code>runtime.Semrelease</code>
+should use channels or the abstractions in package <a href="/pkg/sync/"><code>sync</code></a>.
+The <code>runtime.Alloc</code>, <code>runtime.Free</code>,
+and <code>runtime.Lookup</code> functions, an unsafe API created for
+debugging the memory allocator, have no replacement.
+</p>
+
+<p>
+Before, <code>runtime.MemStats</code> was a global variable holding
+statistics about memory allocation, and calls to <code>runtime.UpdateMemStats</code>
+ensured that it was up to date.
+In Go 1, <code>runtime.MemStats</code> is a struct type, and code should use
+<a href="/pkg/runtime/#ReadMemStats"><code>runtime.ReadMemStats</code></a>
+to obtain the current statistics.
+</p>
+
+<p>
+The package adds a new function,
+<a href="/pkg/runtime/#NumCPU"><code>runtime.NumCPU</code></a>, that returns the number of CPUs available
+for parallel execution, as reported by the operating system kernel.
+Its value can inform the setting of <code>GOMAXPROCS</code>.
+The <code>runtime.Cgocalls</code> and <code>runtime.Goroutines</code> functions
+have been renamed to <code>runtime.NumCgoCall</code> and <code>runtime.NumGoroutine</code>.
+</p>
+
+<p>
+<em>Updating</em>:
+Running <code>go</code> <code>fix</code> will update code for the function renamings.
+Other code will need to be updated by hand.
+</p>
+
+<h3 id="strconv">The strconv package</h3>
+
+<p>
+In Go 1, the
+<a href="/pkg/strconv/"><code>strconv</code></a>
+package has been significantly reworked to make it more Go-like and less C-like,
+although <code>Atoi</code> lives on (it's similar to
+<code>int(ParseInt(x, 10, 0))</code>, as does
+<code>Itoa(x)</code> (<code>FormatInt(int64(x), 10)</code>).
+There are also new variants of some of the functions that append to byte slices rather than
+return strings, to allow control over allocation.
+</p>
+
+<p>
+This table summarizes the renamings; see the
+<a href="/pkg/strconv/">package documentation</a>
+for full details.
+</p>
+
+<table class="codetable" frame="border" summary="strconv renames">
+<colgroup align="left" width="50%"></colgroup>
+<colgroup align="left" width="50%"></colgroup>
+<tr>
+<th align="left">Old call</th>
+<th align="left">New call</th>
+</tr>
+<tr>
+<td colspan="2"><hr></td>
+</tr>
+<tr><td>Atob(x)</td> <td>ParseBool(x)</td></tr>
+<tr>
+<td colspan="2"><hr></td>
+</tr>
+<tr><td>Atof32(x)</td> <td>ParseFloat(x, 32)§</td></tr>
+<tr><td>Atof64(x)</td> <td>ParseFloat(x, 64)</td></tr>
+<tr><td>AtofN(x, n)</td> <td>ParseFloat(x, n)</td></tr>
+<tr>
+<td colspan="2"><hr></td>
+</tr>
+<tr><td>Atoi(x)</td> <td>Atoi(x)</td></tr>
+<tr><td>Atoi(x)</td> <td>ParseInt(x, 10, 0)§</td></tr>
+<tr><td>Atoi64(x)</td> <td>ParseInt(x, 10, 64)</td></tr>
+<tr>
+<td colspan="2"><hr></td>
+</tr>
+<tr><td>Atoui(x)</td> <td>ParseUint(x, 10, 0)§</td></tr>
+<tr><td>Atoui64(x)</td> <td>ParseUint(x, 10, 64)</td></tr>
+<tr>
+<td colspan="2"><hr></td>
+</tr>
+<tr><td>Btoi64(x, b)</td> <td>ParseInt(x, b, 64)</td></tr>
+<tr><td>Btoui64(x, b)</td> <td>ParseUint(x, b, 64)</td></tr>
+<tr>
+<td colspan="2"><hr></td>
+</tr>
+<tr><td>Btoa(x)</td> <td>FormatBool(x)</td></tr>
+<tr>
+<td colspan="2"><hr></td>
+</tr>
+<tr><td>Ftoa32(x, f, p)</td> <td>FormatFloat(float64(x), f, p, 32)</td></tr>
+<tr><td>Ftoa64(x, f, p)</td> <td>FormatFloat(x, f, p, 64)</td></tr>
+<tr><td>FtoaN(x, f, p, n)</td> <td>FormatFloat(x, f, p, n)</td></tr>
+<tr>
+<td colspan="2"><hr></td>
+</tr>
+<tr><td>Itoa(x)</td> <td>Itoa(x)</td></tr>
+<tr><td>Itoa(x)</td> <td>FormatInt(int64(x), 10)</td></tr>
+<tr><td>Itoa64(x)</td> <td>FormatInt(x, 10)</td></tr>
+<tr>
+<td colspan="2"><hr></td>
+</tr>
+<tr><td>Itob(x, b)</td> <td>FormatInt(int64(x), b)</td></tr>
+<tr><td>Itob64(x, b)</td> <td>FormatInt(x, b)</td></tr>
+<tr>
+<td colspan="2"><hr></td>
+</tr>
+<tr><td>Uitoa(x)</td> <td>FormatUint(uint64(x), 10)</td></tr>
+<tr><td>Uitoa64(x)</td> <td>FormatUint(x, 10)</td></tr>
+<tr>
+<td colspan="2"><hr></td>
+</tr>
+<tr><td>Uitob(x, b)</td> <td>FormatUint(uint64(x), b)</td></tr>
+<tr><td>Uitob64(x, b)</td> <td>FormatUint(x, b)</td></tr>
+</table>
+		
+<p>
+<em>Updating</em>:
+Running <code>go</code> <code>fix</code> will update almost all code affected by the change.
+<br>
+§ <code>Atoi</code> persists but <code>Atoui</code> and <code>Atof32</code> do not, so
+they may require
+a cast that must be added by hand; the <code>go</code> <code>fix</code> tool will warn about it.
+</p>
+
+
+<h3 id="templates">The template packages</h3>
+
+<p>
+The <code>template</code> and <code>exp/template/html</code> packages have moved to 
+<a href="/pkg/text/template/"><code>text/template</code></a> and
+<a href="/pkg/html/template/"><code>html/template</code></a>.
+More significant, the interface to these packages has been simplified.
+The template language is the same, but the concept of "template set" is gone
+and the functions and methods of the packages have changed accordingly,
+often by elimination.
+</p>
+
+<p>
+Instead of sets, a <code>Template</code> object
+may contain multiple named template definitions,
+in effect constructing
+name spaces for template invocation.
+A template can invoke any other template associated with it, but only those
+templates associated with it.
+The simplest way to associate templates is to parse them together, something
+made easier with the new structure of the packages.
+</p>
+
+<p>
+<em>Updating</em>:
+The imports will be updated by fix tool.
+Single-template uses will be otherwise be largely unaffected.
+Code that uses multiple templates in concert will need to be updated by hand.
+The <a href="/pkg/text/template/#examples">examples</a> in
+the documentation for <code>text/template</code> can provide guidance.
+</p>
+
+<h3 id="testing">The testing package</h3>
+
+<p>
+The testing package has a type, <code>B</code>, passed as an argument to benchmark functions.
+In Go 1, <code>B</code> has new methods, analogous to those of <code>T</code>, enabling
+logging and failure reporting.
+</p>
+
+<pre><!--{{code "/doc/progs/go1.go" `/func.*Benchmark/` `/^}/`}}
+-->func BenchmarkSprintf(b *testing.B) {
+    <span class="comment">// Verify correctness before running benchmark.</span>
+    b.StopTimer()
+    got := fmt.Sprintf(&#34;%x&#34;, 23)
+    const expect = &#34;17&#34;
+    if expect != got {
+        b.Fatalf(&#34;expected %q; got %q&#34;, expect, got)
+    }
+    b.StartTimer()
+    for i := 0; i &lt; b.N; i++ {
+        fmt.Sprintf(&#34;%x&#34;, 23)
+    }
+}</pre>
+
+<p>
+<em>Updating</em>:
+Existing code is unaffected, although benchmarks that use <code>println</code>
+or <code>panic</code> should be updated to use the new methods.
+</p>
+
+<h3 id="testing_script">The testing/script package</h3>
+
+<p>
+The testing/script package has been deleted. It was a dreg.
+</p>
+
+<p>
+<em>Updating</em>:
+No code is likely to be affected.
+</p>
+
+<h3 id="unsafe">The unsafe package</h3>
+
+<p>
+In Go 1, the functions
+<code>unsafe.Typeof</code>, <code>unsafe.Reflect</code>,
+<code>unsafe.Unreflect</code>, <code>unsafe.New</code>, and
+<code>unsafe.NewArray</code> have been removed;
+they duplicated safer functionality provided by
+package <a href="/pkg/reflect/"><code>reflect</code></a>.
+</p>
+
+<p>
+<em>Updating</em>:
+Code using these functions must be rewritten to use
+package <a href="/pkg/reflect/"><code>reflect</code></a>.
+The changes to <a href="http://code.google.com/p/go/source/detail?r=2646dc956207">encoding/gob</a> and the <a href="http://code.google.com/p/goprotobuf/source/detail?r=5340ad310031">protocol buffer library</a>
+may be helpful as examples.
+</p>
+
+<h3 id="url">The url package</h3>
+
+<p>
+In Go 1 several fields from the <a href="/pkg/net/url/#URL"><code>url.URL</code></a> type
+were removed or replaced.
+</p>
+
+<p>
+The <a href="/pkg/net/url/#URL.String"><code>String</code></a> method now
+predictably rebuilds an encoded URL string using all of <code>URL</code>'s
+fields as necessary. The resulting string will also no longer have
+passwords escaped.
+</p>
+
+<p>
+The <code>Raw</code> field has been removed. In most cases the <code>String</code>
+method may be used in its place.
+</p>
+
+<p>
+The old <code>RawUserinfo</code> field is replaced by the <code>User</code>
+field, of type <a href="/pkg/net/url/#Userinfo"><code>*net.Userinfo</code></a>.
+Values of this type may be created using the new <a href="/pkg/net/url/#User"><code>net.User</code></a>
+and <a href="/pkg/net/url/#UserPassword"><code>net.UserPassword</code></a>
+functions. The <code>EscapeUserinfo</code> and <code>UnescapeUserinfo</code>
+functions are also gone.
+</p>
+
+<p>
+The <code>RawAuthority</code> field has been removed. The same information is
+available in the <code>Host</code> and <code>User</code> fields.
+</p>
+
+<p>
+The <code>RawPath</code> field and the <code>EncodedPath</code> method have
+been removed. The path information in rooted URLs (with a slash following the
+schema) is now available only in decoded form in the <code>Path</code> field.
+Occasionally, the encoded data may be required to obtain information that
+was lost in the decoding process. These cases must be handled by accessing
+the data the URL was built from.
+</p>
+
+<p>
+URLs with non-rooted paths, such as <code>"mailto:dev@golang.org?subject=Hi"</code>,
+are also handled differently. The <code>OpaquePath</code> boolean field has been
+removed and a new <code>Opaque</code> string field introduced to hold the encoded
+path for such URLs. In Go 1, the cited URL parses as:
+</p>
+
+<pre>
+    URL{
+        Scheme: "mailto",
+        Opaque: "dev@golang.org",
+        RawQuery: "subject=Hi",
+    }
+</pre>
+
+<p>
+A new <a href="/pkg/net/url/#URL.RequestURI"><code>RequestURI</code></a> method was
+added to <code>URL</code>.
+</p>
+
+<p>
+The <code>ParseWithReference</code> function has been renamed to <code>ParseWithFragment</code>.
+</p>
+
+<p>
+<em>Updating</em>:
+Code that uses the old fields will fail to compile and must be updated by hand.
+The semantic changes make it difficult for the fix tool to update automatically.
+</p>
+
+<h2 id="cmd_go">The go command</h2>
+
+<p>
+Go 1 introduces the <a href="/cmd/go/">go command</a>, a tool for fetching,
+building, and installing Go packages and commands. The <code>go</code> command
+does away with makefiles, instead using Go source code to find dependencies and
+determine build conditions. Most existing Go programs will no longer require
+makefiles to be built.
+</p>
+
+<p>
+See <a href="/doc/code.html">How to Write Go Code</a> for a primer on the
+<code>go</code> command and the <a href="/cmd/go/">go command documentation</a>
+for the full details.
+</p>
+
+<p>
+<em>Updating</em>:
+Projects that depend on the Go project's old makefile-based build
+infrastructure (<code>Make.pkg</code>, <code>Make.cmd</code>, and so on) should
+switch to using the <code>go</code> command for building Go code and, if
+necessary, rewrite their makefiles to perform any auxiliary build tasks.
+</p>
+
+<h2 id="cmd_cgo">The cgo command</h2>
+
+<p>
+In Go 1, the <a href="/cmd/cgo">cgo command</a>
+uses a different <code>_cgo_export.h</code>
+file, which is generated for packages containing <code>//export</code> lines.
+The <code>_cgo_export.h</code> file now begins with the C preamble comment,
+so that exported function definitions can use types defined there.
+This has the effect of compiling the preamble multiple times, so a
+package using <code>//export</code> must not put function definitions
+or variable initializations in the C preamble.
+</p>
+
+<h2 id="releases">Packaged releases</h2>
+
+<p>
+One of the most significant changes associated with Go 1 is the availability
+of prepackaged, downloadable distributions.
+They are available for many combinations of architecture and operating system
+(including Windows) and the list will grow.
+Installation details are described on the
+<a href="/doc/install">Getting Started</a> page, while
+the distributions themselves are listed on the
+<a href="http://code.google.com/p/go/downloads/list">downloads page</a>.
+
+
+</div>
+
+<div id="footer">
+Build version go1.0.1.<br>
+Except as <a href="http://code.google.com/policies.html#restrictions">noted</a>,
+the content of this page is licensed under the
+Creative Commons Attribution 3.0 License,
+and code is licensed under a <a href="/LICENSE">BSD license</a>.<br>
+<a href="/doc/tos.html">Terms of Service</a> | 
+<a href="http://www.google.com/intl/en/privacy/privacy-policy.html">Privacy Policy</a>
+</div>
+
+<script type="text/javascript">
+(function() {
+  var ga = document.createElement("script"); ga.type = "text/javascript"; ga.async = true;
+  ga.src = ("https:" == document.location.protocol ? "https://ssl" : "http://www") + ".google-analytics.com/ga.js";
+  var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(ga, s);
+})();
+</script>
+</body>
+<script type="text/javascript">
+  (function() {
+    var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
+    po.src = 'https://apis.google.com/js/plusone.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
+  })();
+</script>
+</html>
+
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/README b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/README
new file mode 100644
index 00000000..9b4c2d8b
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/README
@@ -0,0 +1,28 @@
+The *.dat files in this directory are copied from The WebKit Open Source
+Project, specifically $WEBKITROOT/LayoutTests/html5lib/resources.
+WebKit is licensed under a BSD style license.
+http://webkit.org/coding/bsd-license.html says:
+
+Copyright (C) 2009 Apple Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS "AS IS" AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/adoption01.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/adoption01.dat
new file mode 100644
index 00000000..787e1b01
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/adoption01.dat
@@ -0,0 +1,194 @@
+#data
+<a><p></a></p>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <a>
+|     <p>
+|       <a>
+
+#data
+<a>1<p>2</a>3</p>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <a>
+|       "1"
+|     <p>
+|       <a>
+|         "2"
+|       "3"
+
+#data
+<a>1<button>2</a>3</button>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <a>
+|       "1"
+|     <button>
+|       <a>
+|         "2"
+|       "3"
+
+#data
+<a>1<b>2</a>3</b>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <a>
+|       "1"
+|       <b>
+|         "2"
+|     <b>
+|       "3"
+
+#data
+<a>1<div>2<div>3</a>4</div>5</div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <a>
+|       "1"
+|     <div>
+|       <a>
+|         "2"
+|       <div>
+|         <a>
+|           "3"
+|         "4"
+|       "5"
+
+#data
+<table><a>1<p>2</a>3</p>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <a>
+|       "1"
+|     <p>
+|       <a>
+|         "2"
+|       "3"
+|     <table>
+
+#data
+<b><b><a><p></a>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <b>
+|       <b>
+|         <a>
+|         <p>
+|           <a>
+
+#data
+<b><a><b><p></a>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <b>
+|       <a>
+|         <b>
+|       <b>
+|         <p>
+|           <a>
+
+#data
+<a><b><b><p></a>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <a>
+|       <b>
+|         <b>
+|     <b>
+|       <b>
+|         <p>
+|           <a>
+
+#data
+<p>1<s id="A">2<b id="B">3</p>4</s>5</b>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       "1"
+|       <s>
+|         id="A"
+|         "2"
+|         <b>
+|           id="B"
+|           "3"
+|     <s>
+|       id="A"
+|       <b>
+|         id="B"
+|         "4"
+|     <b>
+|       id="B"
+|       "5"
+
+#data
+<table><a>1<td>2</td>3</table>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <a>
+|       "1"
+|     <a>
+|       "3"
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             "2"
+
+#data
+<table>A<td>B</td>C</table>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "AC"
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             "B"
+
+#data
+<a><svg><tr><input></a>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <a>
+|       <svg svg>
+|         <svg tr>
+|           <svg input>
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/adoption02.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/adoption02.dat
new file mode 100644
index 00000000..d18151b4
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/adoption02.dat
@@ -0,0 +1,31 @@
+#data
+<b>1<i>2<p>3</b>4
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <b>
+|       "1"
+|       <i>
+|         "2"
+|     <i>
+|       <p>
+|         <b>
+|           "3"
+|         "4"
+
+#data
+<a><div><style></style><address><a>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <a>
+|     <div>
+|       <a>
+|         <style>
+|       <address>
+|         <a>
+|         <a>
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/comments01.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/comments01.dat
new file mode 100644
index 00000000..44f18768
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/comments01.dat
@@ -0,0 +1,135 @@
+#data
+FOO<!-- BAR -->BAZ
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO"
+|     <!--  BAR  -->
+|     "BAZ"
+
+#data
+FOO<!-- BAR --!>BAZ
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO"
+|     <!--  BAR  -->
+|     "BAZ"
+
+#data
+FOO<!-- BAR --   >BAZ
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO"
+|     <!--  BAR --   >BAZ -->
+
+#data
+FOO<!-- BAR -- <QUX> -- MUX -->BAZ
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO"
+|     <!--  BAR -- <QUX> -- MUX  -->
+|     "BAZ"
+
+#data
+FOO<!-- BAR -- <QUX> -- MUX --!>BAZ
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO"
+|     <!--  BAR -- <QUX> -- MUX  -->
+|     "BAZ"
+
+#data
+FOO<!-- BAR -- <QUX> -- MUX -- >BAZ
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO"
+|     <!--  BAR -- <QUX> -- MUX -- >BAZ -->
+
+#data
+FOO<!---->BAZ
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO"
+|     <!--  -->
+|     "BAZ"
+
+#data
+FOO<!--->BAZ
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO"
+|     <!--  -->
+|     "BAZ"
+
+#data
+FOO<!-->BAZ
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO"
+|     <!--  -->
+|     "BAZ"
+
+#data
+<?xml version="1.0">Hi
+#errors
+#document
+| <!-- ?xml version="1.0" -->
+| <html>
+|   <head>
+|   <body>
+|     "Hi"
+
+#data
+<?xml version="1.0">
+#errors
+#document
+| <!-- ?xml version="1.0" -->
+| <html>
+|   <head>
+|   <body>
+
+#data
+<?xml version
+#errors
+#document
+| <!-- ?xml version -->
+| <html>
+|   <head>
+|   <body>
+
+#data
+FOO<!----->BAZ
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO"
+|     <!-- - -->
+|     "BAZ"
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/doctype01.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/doctype01.dat
new file mode 100644
index 00000000..ae457328
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/doctype01.dat
@@ -0,0 +1,370 @@
+#data
+<!DOCTYPE html>Hello
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     "Hello"
+
+#data
+<!dOctYpE HtMl>Hello
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     "Hello"
+
+#data
+<!DOCTYPEhtml>Hello
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     "Hello"
+
+#data
+<!DOCTYPE>Hello
+#errors
+#document
+| <!DOCTYPE >
+| <html>
+|   <head>
+|   <body>
+|     "Hello"
+
+#data
+<!DOCTYPE >Hello
+#errors
+#document
+| <!DOCTYPE >
+| <html>
+|   <head>
+|   <body>
+|     "Hello"
+
+#data
+<!DOCTYPE potato>Hello
+#errors
+#document
+| <!DOCTYPE potato>
+| <html>
+|   <head>
+|   <body>
+|     "Hello"
+
+#data
+<!DOCTYPE potato >Hello
+#errors
+#document
+| <!DOCTYPE potato>
+| <html>
+|   <head>
+|   <body>
+|     "Hello"
+
+#data
+<!DOCTYPE potato taco>Hello
+#errors
+#document
+| <!DOCTYPE potato>
+| <html>
+|   <head>
+|   <body>
+|     "Hello"
+
+#data
+<!DOCTYPE potato taco "ddd>Hello
+#errors
+#document
+| <!DOCTYPE potato>
+| <html>
+|   <head>
+|   <body>
+|     "Hello"
+
+#data
+<!DOCTYPE potato sYstEM>Hello
+#errors
+#document
+| <!DOCTYPE potato>
+| <html>
+|   <head>
+|   <body>
+|     "Hello"
+
+#data
+<!DOCTYPE potato sYstEM    >Hello
+#errors
+#document
+| <!DOCTYPE potato>
+| <html>
+|   <head>
+|   <body>
+|     "Hello"
+
+#data
+<!DOCTYPE   potato       sYstEM  ggg>Hello
+#errors
+#document
+| <!DOCTYPE potato>
+| <html>
+|   <head>
+|   <body>
+|     "Hello"
+
+#data
+<!DOCTYPE potato SYSTEM taco  >Hello
+#errors
+#document
+| <!DOCTYPE potato>
+| <html>
+|   <head>
+|   <body>
+|     "Hello"
+
+#data
+<!DOCTYPE potato SYSTEM 'taco"'>Hello
+#errors
+#document
+| <!DOCTYPE potato "" "taco"">
+| <html>
+|   <head>
+|   <body>
+|     "Hello"
+
+#data
+<!DOCTYPE potato SYSTEM "taco">Hello
+#errors
+#document
+| <!DOCTYPE potato "" "taco">
+| <html>
+|   <head>
+|   <body>
+|     "Hello"
+
+#data
+<!DOCTYPE potato SYSTEM "tai'co">Hello
+#errors
+#document
+| <!DOCTYPE potato "" "tai'co">
+| <html>
+|   <head>
+|   <body>
+|     "Hello"
+
+#data
+<!DOCTYPE potato SYSTEMtaco "ddd">Hello
+#errors
+#document
+| <!DOCTYPE potato>
+| <html>
+|   <head>
+|   <body>
+|     "Hello"
+
+#data
+<!DOCTYPE potato grass SYSTEM taco>Hello
+#errors
+#document
+| <!DOCTYPE potato>
+| <html>
+|   <head>
+|   <body>
+|     "Hello"
+
+#data
+<!DOCTYPE potato pUbLIc>Hello
+#errors
+#document
+| <!DOCTYPE potato>
+| <html>
+|   <head>
+|   <body>
+|     "Hello"
+
+#data
+<!DOCTYPE potato pUbLIc >Hello
+#errors
+#document
+| <!DOCTYPE potato>
+| <html>
+|   <head>
+|   <body>
+|     "Hello"
+
+#data
+<!DOCTYPE potato pUbLIcgoof>Hello
+#errors
+#document
+| <!DOCTYPE potato>
+| <html>
+|   <head>
+|   <body>
+|     "Hello"
+
+#data
+<!DOCTYPE potato PUBLIC goof>Hello
+#errors
+#document
+| <!DOCTYPE potato>
+| <html>
+|   <head>
+|   <body>
+|     "Hello"
+
+#data
+<!DOCTYPE potato PUBLIC "go'of">Hello
+#errors
+#document
+| <!DOCTYPE potato "go'of" "">
+| <html>
+|   <head>
+|   <body>
+|     "Hello"
+
+#data
+<!DOCTYPE potato PUBLIC 'go'of'>Hello
+#errors
+#document
+| <!DOCTYPE potato "go" "">
+| <html>
+|   <head>
+|   <body>
+|     "Hello"
+
+#data
+<!DOCTYPE potato PUBLIC 'go:hh   of' >Hello
+#errors
+#document
+| <!DOCTYPE potato "go:hh   of" "">
+| <html>
+|   <head>
+|   <body>
+|     "Hello"
+
+#data
+<!DOCTYPE potato PUBLIC "W3C-//dfdf" SYSTEM ggg>Hello
+#errors
+#document
+| <!DOCTYPE potato "W3C-//dfdf" "">
+| <html>
+|   <head>
+|   <body>
+|     "Hello"
+
+#data
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+   "http://www.w3.org/TR/html4/strict.dtd">Hello
+#errors
+#document
+| <!DOCTYPE html "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+| <html>
+|   <head>
+|   <body>
+|     "Hello"
+
+#data
+<!DOCTYPE ...>Hello
+#errors
+#document
+| <!DOCTYPE ...>
+| <html>
+|   <head>
+|   <body>
+|     "Hello"
+
+#data
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+#errors
+#document
+| <!DOCTYPE html "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+| <html>
+|   <head>
+|   <body>
+
+#data
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
+#errors
+#document
+| <!DOCTYPE html "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
+| <html>
+|   <head>
+|   <body>
+
+#data
+<!DOCTYPE root-element [SYSTEM OR PUBLIC FPI] "uri" [ 
+<!-- internal declarations -->
+]>
+#errors
+#document
+| <!DOCTYPE root-element>
+| <html>
+|   <head>
+|   <body>
+|     "]>"
+
+#data
+<!DOCTYPE html PUBLIC
+  "-//WAPFORUM//DTD XHTML Mobile 1.0//EN"
+    "http://www.wapforum.org/DTD/xhtml-mobile10.dtd">
+#errors
+#document
+| <!DOCTYPE html "-//WAPFORUM//DTD XHTML Mobile 1.0//EN" "http://www.wapforum.org/DTD/xhtml-mobile10.dtd">
+| <html>
+|   <head>
+|   <body>
+
+#data
+<!DOCTYPE HTML SYSTEM "http://www.w3.org/DTD/HTML4-strict.dtd"><body><b>Mine!</b></body>
+#errors
+#document
+| <!DOCTYPE html "" "http://www.w3.org/DTD/HTML4-strict.dtd">
+| <html>
+|   <head>
+|   <body>
+|     <b>
+|       "Mine!"
+
+#data
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN""http://www.w3.org/TR/html4/strict.dtd">
+#errors
+#document
+| <!DOCTYPE html "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+| <html>
+|   <head>
+|   <body>
+
+#data
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"'http://www.w3.org/TR/html4/strict.dtd'>
+#errors
+#document
+| <!DOCTYPE html "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+| <html>
+|   <head>
+|   <body>
+
+#data
+<!DOCTYPE HTML PUBLIC"-//W3C//DTD HTML 4.01//EN"'http://www.w3.org/TR/html4/strict.dtd'>
+#errors
+#document
+| <!DOCTYPE html "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+| <html>
+|   <head>
+|   <body>
+
+#data
+<!DOCTYPE HTML PUBLIC'-//W3C//DTD HTML 4.01//EN''http://www.w3.org/TR/html4/strict.dtd'>
+#errors
+#document
+| <!DOCTYPE html "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+| <html>
+|   <head>
+|   <body>
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/entities01.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/entities01.dat
new file mode 100644
index 00000000..c8073b78
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/entities01.dat
@@ -0,0 +1,603 @@
+#data
+FOO&gt;BAR
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO>BAR"
+
+#data
+FOO&gtBAR
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO>BAR"
+
+#data
+FOO&gt BAR
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO> BAR"
+
+#data
+FOO&gt;;;BAR
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO>;;BAR"
+
+#data
+I'm &notit; I tell you
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "I'm ¬it; I tell you"
+
+#data
+I'm &notin; I tell you
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "I'm ∉ I tell you"
+
+#data
+FOO& BAR
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO& BAR"
+
+#data
+FOO&<BAR>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO&"
+|     <bar>
+
+#data
+FOO&&&&gt;BAR
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO&&&>BAR"
+
+#data
+FOO&#41;BAR
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO)BAR"
+
+#data
+FOO&#x41;BAR
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOOABAR"
+
+#data
+FOO&#X41;BAR
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOOABAR"
+
+#data
+FOO&#BAR
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO&#BAR"
+
+#data
+FOO&#ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO&#ZOO"
+
+#data
+FOO&#xBAR
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOOºR"
+
+#data
+FOO&#xZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO&#xZOO"
+
+#data
+FOO&#XZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO&#XZOO"
+
+#data
+FOO&#41BAR
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO)BAR"
+
+#data
+FOO&#x41BAR
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO䆺R"
+
+#data
+FOO&#x41ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOOAZOO"
+
+#data
+FOO&#x0000;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO�ZOO"
+
+#data
+FOO&#x0078;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOOxZOO"
+
+#data
+FOO&#x0079;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOOyZOO"
+
+#data
+FOO&#x0080;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO€ZOO"
+
+#data
+FOO&#x0081;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOOZOO"
+
+#data
+FOO&#x0082;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO‚ZOO"
+
+#data
+FOO&#x0083;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOOƒZOO"
+
+#data
+FOO&#x0084;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO„ZOO"
+
+#data
+FOO&#x0085;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO…ZOO"
+
+#data
+FOO&#x0086;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO†ZOO"
+
+#data
+FOO&#x0087;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO‡ZOO"
+
+#data
+FOO&#x0088;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOOˆZOO"
+
+#data
+FOO&#x0089;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO‰ZOO"
+
+#data
+FOO&#x008A;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOOŠZOO"
+
+#data
+FOO&#x008B;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO‹ZOO"
+
+#data
+FOO&#x008C;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOOŒZOO"
+
+#data
+FOO&#x008D;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOOZOO"
+
+#data
+FOO&#x008E;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOOŽZOO"
+
+#data
+FOO&#x008F;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOOZOO"
+
+#data
+FOO&#x0090;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOOZOO"
+
+#data
+FOO&#x0091;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO‘ZOO"
+
+#data
+FOO&#x0092;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO’ZOO"
+
+#data
+FOO&#x0093;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO“ZOO"
+
+#data
+FOO&#x0094;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO”ZOO"
+
+#data
+FOO&#x0095;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO•ZOO"
+
+#data
+FOO&#x0096;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO–ZOO"
+
+#data
+FOO&#x0097;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO—ZOO"
+
+#data
+FOO&#x0098;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO˜ZOO"
+
+#data
+FOO&#x0099;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO™ZOO"
+
+#data
+FOO&#x009A;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOOšZOO"
+
+#data
+FOO&#x009B;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO›ZOO"
+
+#data
+FOO&#x009C;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOOœZOO"
+
+#data
+FOO&#x009D;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOOZOO"
+
+#data
+FOO&#x009E;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOOžZOO"
+
+#data
+FOO&#x009F;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOOŸZOO"
+
+#data
+FOO&#x00A0;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO ZOO"
+
+#data
+FOO&#xD7FF;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO퟿ZOO"
+
+#data
+FOO&#xD800;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO�ZOO"
+
+#data
+FOO&#xD801;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO�ZOO"
+
+#data
+FOO&#xDFFE;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO�ZOO"
+
+#data
+FOO&#xDFFF;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO�ZOO"
+
+#data
+FOO&#xE000;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOOZOO"
+
+#data
+FOO&#x10FFFE;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO􏿾ZOO"
+
+#data
+FOO&#x1087D4;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO􈟔ZOO"
+
+#data
+FOO&#x10FFFF;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO􏿿ZOO"
+
+#data
+FOO&#x110000;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO�ZOO"
+
+#data
+FOO&#xFFFFFF;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO�ZOO"
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/entities02.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/entities02.dat
new file mode 100644
index 00000000..e2fb42a0
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/entities02.dat
@@ -0,0 +1,249 @@
+#data
+<div bar="ZZ&gt;YY"></div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       bar="ZZ>YY"
+
+#data
+<div bar="ZZ&"></div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       bar="ZZ&"
+
+#data
+<div bar='ZZ&'></div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       bar="ZZ&"
+
+#data
+<div bar=ZZ&></div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       bar="ZZ&"
+
+#data
+<div bar="ZZ&gt=YY"></div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       bar="ZZ&gt=YY"
+
+#data
+<div bar="ZZ&gt0YY"></div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       bar="ZZ&gt0YY"
+
+#data
+<div bar="ZZ&gt9YY"></div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       bar="ZZ&gt9YY"
+
+#data
+<div bar="ZZ&gtaYY"></div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       bar="ZZ&gtaYY"
+
+#data
+<div bar="ZZ&gtZYY"></div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       bar="ZZ&gtZYY"
+
+#data
+<div bar="ZZ&gt YY"></div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       bar="ZZ> YY"
+
+#data
+<div bar="ZZ&gt"></div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       bar="ZZ>"
+
+#data
+<div bar='ZZ&gt'></div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       bar="ZZ>"
+
+#data
+<div bar=ZZ&gt></div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       bar="ZZ>"
+
+#data
+<div bar="ZZ&pound_id=23"></div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       bar="ZZ£_id=23"
+
+#data
+<div bar="ZZ&prod_id=23"></div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       bar="ZZ&prod_id=23"
+
+#data
+<div bar="ZZ&pound;_id=23"></div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       bar="ZZ£_id=23"
+
+#data
+<div bar="ZZ&prod;_id=23"></div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       bar="ZZ∏_id=23"
+
+#data
+<div bar="ZZ&pound=23"></div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       bar="ZZ&pound=23"
+
+#data
+<div bar="ZZ&prod=23"></div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       bar="ZZ&prod=23"
+
+#data
+<div>ZZ&pound_id=23</div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       "ZZ£_id=23"
+
+#data
+<div>ZZ&prod_id=23</div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       "ZZ&prod_id=23"
+
+#data
+<div>ZZ&pound;_id=23</div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       "ZZ£_id=23"
+
+#data
+<div>ZZ&prod;_id=23</div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       "ZZ∏_id=23"
+
+#data
+<div>ZZ&pound=23</div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       "ZZ£=23"
+
+#data
+<div>ZZ&prod=23</div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       "ZZ&prod=23"
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/html5test-com.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/html5test-com.dat
new file mode 100644
index 00000000..d7cb71db
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/html5test-com.dat
@@ -0,0 +1,246 @@
+#data
+<div<div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div<div>
+
+#data
+<div foo<bar=''>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       foo<bar=""
+
+#data
+<div foo=`bar`>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       foo="`bar`"
+
+#data
+<div \"foo=''>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       \"foo=""
+
+#data
+<a href='\nbar'></a>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <a>
+|       href="\nbar"
+
+#data
+<!DOCTYPE html>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+
+#data
+&lang;&rang;
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "⟨⟩"
+
+#data
+&apos;
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "'"
+
+#data
+&ImaginaryI;
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "ⅈ"
+
+#data
+&Kopf;
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "𝕂"
+
+#data
+&notinva;
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "∉"
+
+#data
+<?import namespace="foo" implementation="#bar">
+#errors
+#document
+| <!-- ?import namespace="foo" implementation="#bar" -->
+| <html>
+|   <head>
+|   <body>
+
+#data
+<!--foo--bar-->
+#errors
+#document
+| <!-- foo--bar -->
+| <html>
+|   <head>
+|   <body>
+
+#data
+<![CDATA[x]]>
+#errors
+#document
+| <!-- [CDATA[x]] -->
+| <html>
+|   <head>
+|   <body>
+
+#data
+<textarea><!--</textarea>--></textarea>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <textarea>
+|       "<!--"
+|     "-->"
+
+#data
+<textarea><!--</textarea>-->
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <textarea>
+|       "<!--"
+|     "-->"
+
+#data
+<style><!--</style>--></style>
+#errors
+#document
+| <html>
+|   <head>
+|     <style>
+|       "<!--"
+|   <body>
+|     "-->"
+
+#data
+<style><!--</style>-->
+#errors
+#document
+| <html>
+|   <head>
+|     <style>
+|       "<!--"
+|   <body>
+|     "-->"
+
+#data
+<ul><li>A </li> <li>B</li></ul>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <ul>
+|       <li>
+|         "A "
+|       " "
+|       <li>
+|         "B"
+
+#data
+<table><form><input type=hidden><input></form><div></div></table>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <input>
+|     <div>
+|     <table>
+|       <form>
+|       <input>
+|         type="hidden"
+
+#data
+<i>A<b>B<p></i>C</b>D
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <i>
+|       "A"
+|       <b>
+|         "B"
+|     <b>
+|     <p>
+|       <b>
+|         <i>
+|         "C"
+|       "D"
+
+#data
+<div></div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+
+#data
+<svg></svg>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+
+#data
+<math></math>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <math math>
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/inbody01.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/inbody01.dat
new file mode 100644
index 00000000..3f2bd374
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/inbody01.dat
@@ -0,0 +1,43 @@
+#data
+<button>1</foo>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <button>
+|       "1"
+
+#data
+<foo>1<p>2</foo>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <foo>
+|       "1"
+|       <p>
+|         "2"
+
+#data
+<dd>1</foo>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <dd>
+|       "1"
+
+#data
+<foo>1<dd>2</foo>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <foo>
+|       "1"
+|       <dd>
+|         "2"
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/isindex.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/isindex.dat
new file mode 100644
index 00000000..88325ffe
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/isindex.dat
@@ -0,0 +1,40 @@
+#data
+<isindex>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <form>
+|       <hr>
+|       <label>
+|         "This is a searchable index. Enter search keywords: "
+|         <input>
+|           name="isindex"
+|       <hr>
+
+#data
+<isindex name="A" action="B" prompt="C" foo="D">
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <form>
+|       action="B"
+|       <hr>
+|       <label>
+|         "C"
+|         <input>
+|           foo="D"
+|           name="isindex"
+|       <hr>
+
+#data
+<form><isindex>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <form>
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/pending-spec-changes-plain-text-unsafe.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/pending-spec-changes-plain-text-unsafe.dat
new file mode 100644
index 00000000..a5ebb1eb
Binary files /dev/null and b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/pending-spec-changes-plain-text-unsafe.dat differ
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/pending-spec-changes.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/pending-spec-changes.dat
new file mode 100644
index 00000000..5a920846
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/pending-spec-changes.dat
@@ -0,0 +1,52 @@
+#data
+<input type="hidden"><frameset>
+#errors
+21: Start tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
+31: “frameset” start tag seen.
+31: End of file seen and there were open elements.
+#document
+| <html>
+|   <head>
+|   <frameset>
+
+#data
+<!DOCTYPE html><table><caption><svg>foo</table>bar
+#errors
+47: End tag “table” did not match the name of the current open element (“svg”).
+47: “table” closed but “caption” was still open.
+47: End tag “table” seen, but there were open elements.
+36: Unclosed element “svg”.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <caption>
+|         <svg svg>
+|           "foo"
+|     "bar"
+
+#data
+<table><tr><td><svg><desc><td></desc><circle>
+#errors
+7: Start tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
+30: A table cell was implicitly closed, but there were open elements.
+26: Unclosed element “desc”.
+20: Unclosed element “svg”.
+37: Stray end tag “desc”.
+45: End of file seen and there were open elements.
+45: Unclosed element “circle”.
+7: Unclosed element “table”.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             <svg svg>
+|               <svg desc>
+|           <td>
+|             <circle>
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/plain-text-unsafe.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/plain-text-unsafe.dat
new file mode 100644
index 00000000..04cc11fb
Binary files /dev/null and b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/plain-text-unsafe.dat differ
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/scriptdata01.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/scriptdata01.dat
new file mode 100644
index 00000000..76b67f4b
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/scriptdata01.dat
@@ -0,0 +1,308 @@
+#data
+FOO<script>'Hello'</script>BAR
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO"
+|     <script>
+|       "'Hello'"
+|     "BAR"
+
+#data
+FOO<script></script>BAR
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO"
+|     <script>
+|     "BAR"
+
+#data
+FOO<script></script >BAR
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO"
+|     <script>
+|     "BAR"
+
+#data
+FOO<script></script/>BAR
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO"
+|     <script>
+|     "BAR"
+
+#data
+FOO<script></script/ >BAR
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO"
+|     <script>
+|     "BAR"
+
+#data
+FOO<script type="text/plain"></scriptx>BAR
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO"
+|     <script>
+|       type="text/plain"
+|       "</scriptx>BAR"
+
+#data
+FOO<script></script foo=">" dd>BAR
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO"
+|     <script>
+|     "BAR"
+
+#data
+FOO<script>'<'</script>BAR
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO"
+|     <script>
+|       "'<'"
+|     "BAR"
+
+#data
+FOO<script>'<!'</script>BAR
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO"
+|     <script>
+|       "'<!'"
+|     "BAR"
+
+#data
+FOO<script>'<!-'</script>BAR
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO"
+|     <script>
+|       "'<!-'"
+|     "BAR"
+
+#data
+FOO<script>'<!--'</script>BAR
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO"
+|     <script>
+|       "'<!--'"
+|     "BAR"
+
+#data
+FOO<script>'<!---'</script>BAR
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO"
+|     <script>
+|       "'<!---'"
+|     "BAR"
+
+#data
+FOO<script>'<!-->'</script>BAR
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO"
+|     <script>
+|       "'<!-->'"
+|     "BAR"
+
+#data
+FOO<script>'<!-->'</script>BAR
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO"
+|     <script>
+|       "'<!-->'"
+|     "BAR"
+
+#data
+FOO<script>'<!-- potato'</script>BAR
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO"
+|     <script>
+|       "'<!-- potato'"
+|     "BAR"
+
+#data
+FOO<script>'<!-- <sCrIpt'</script>BAR
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO"
+|     <script>
+|       "'<!-- <sCrIpt'"
+|     "BAR"
+
+#data
+FOO<script type="text/plain">'<!-- <sCrIpt>'</script>BAR
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO"
+|     <script>
+|       type="text/plain"
+|       "'<!-- <sCrIpt>'</script>BAR"
+
+#data
+FOO<script type="text/plain">'<!-- <sCrIpt> -'</script>BAR
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO"
+|     <script>
+|       type="text/plain"
+|       "'<!-- <sCrIpt> -'</script>BAR"
+
+#data
+FOO<script type="text/plain">'<!-- <sCrIpt> --'</script>BAR
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO"
+|     <script>
+|       type="text/plain"
+|       "'<!-- <sCrIpt> --'</script>BAR"
+
+#data
+FOO<script>'<!-- <sCrIpt> -->'</script>BAR
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO"
+|     <script>
+|       "'<!-- <sCrIpt> -->'"
+|     "BAR"
+
+#data
+FOO<script type="text/plain">'<!-- <sCrIpt> --!>'</script>BAR
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO"
+|     <script>
+|       type="text/plain"
+|       "'<!-- <sCrIpt> --!>'</script>BAR"
+
+#data
+FOO<script type="text/plain">'<!-- <sCrIpt> -- >'</script>BAR
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO"
+|     <script>
+|       type="text/plain"
+|       "'<!-- <sCrIpt> -- >'</script>BAR"
+
+#data
+FOO<script type="text/plain">'<!-- <sCrIpt '</script>BAR
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO"
+|     <script>
+|       type="text/plain"
+|       "'<!-- <sCrIpt '</script>BAR"
+
+#data
+FOO<script type="text/plain">'<!-- <sCrIpt/'</script>BAR
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO"
+|     <script>
+|       type="text/plain"
+|       "'<!-- <sCrIpt/'</script>BAR"
+
+#data
+FOO<script type="text/plain">'<!-- <sCrIpt\'</script>BAR
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO"
+|     <script>
+|       type="text/plain"
+|       "'<!-- <sCrIpt\'"
+|     "BAR"
+
+#data
+FOO<script type="text/plain">'<!-- <sCrIpt/'</script>BAR</script>QUX
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO"
+|     <script>
+|       type="text/plain"
+|       "'<!-- <sCrIpt/'</script>BAR"
+|     "QUX"
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/scripted/adoption01.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/scripted/adoption01.dat
new file mode 100644
index 00000000..4e08d0e8
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/scripted/adoption01.dat
@@ -0,0 +1,15 @@
+#data
+<p><b id="A"><script>document.getElementById("A").id = "B"</script></p>TEXT</b>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <b>
+|         id="B"
+|         <script>
+|           "document.getElementById("A").id = "B""
+|     <b>
+|       id="A"
+|       "TEXT"
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/scripted/webkit01.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/scripted/webkit01.dat
new file mode 100644
index 00000000..ef4a41ca
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/scripted/webkit01.dat
@@ -0,0 +1,28 @@
+#data
+1<script>document.write("2")</script>3
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "1"
+|     <script>
+|       "document.write("2")"
+|     "23"
+
+#data
+1<script>document.write("<script>document.write('2')</scr"+ "ipt><script>document.write('3')</scr" + "ipt>")</script>4
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "1"
+|     <script>
+|       "document.write("<script>document.write('2')</scr"+ "ipt><script>document.write('3')</scr" + "ipt>")"
+|     <script>
+|       "document.write('2')"
+|     "2"
+|     <script>
+|       "document.write('3')"
+|     "34"
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tables01.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tables01.dat
new file mode 100644
index 00000000..c4b47e48
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tables01.dat
@@ -0,0 +1,212 @@
+#data
+<table><th>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <th>
+
+#data
+<table><td>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+
+#data
+<table><col foo='bar'>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <colgroup>
+|         <col>
+|           foo="bar"
+
+#data
+<table><colgroup></html>foo
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "foo"
+|     <table>
+|       <colgroup>
+
+#data
+<table></table><p>foo
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|     <p>
+|       "foo"
+
+#data
+<table></body></caption></col></colgroup></html></tbody></td></tfoot></th></thead></tr><td>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+
+#data
+<table><select><option>3</select></table>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <select>
+|       <option>
+|         "3"
+|     <table>
+
+#data
+<table><select><table></table></select></table>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <select>
+|     <table>
+|     <table>
+
+#data
+<table><select></table>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <select>
+|     <table>
+
+#data
+<table><select><option>A<tr><td>B</td></tr></table>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <select>
+|       <option>
+|         "A"
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             "B"
+
+#data
+<table><td></body></caption></col></colgroup></html>foo
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             "foo"
+
+#data
+<table><td>A</table>B
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             "A"
+|     "B"
+
+#data
+<table><tr><caption>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|       <caption>
+
+#data
+<table><tr></body></caption></col></colgroup></html></td></th><td>foo
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             "foo"
+
+#data
+<table><td><tr>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|         <tr>
+
+#data
+<table><td><button><td>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             <button>
+|           <td>
+
+#data
+<table><tr><td><svg><desc><td>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             <svg svg>
+|               <svg desc>
+|           <td>
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests1.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests1.dat
new file mode 100644
index 00000000..cbf8bdda
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests1.dat
@@ -0,0 +1,1952 @@
+#data
+Test
+#errors
+Line: 1 Col: 4 Unexpected non-space characters. Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <body>
+|     "Test"
+
+#data
+<p>One<p>Two
+#errors
+Line: 1 Col: 3 Unexpected start tag (p). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       "One"
+|     <p>
+|       "Two"
+
+#data
+Line1<br>Line2<br>Line3<br>Line4
+#errors
+Line: 1 Col: 5 Unexpected non-space characters. Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <body>
+|     "Line1"
+|     <br>
+|     "Line2"
+|     <br>
+|     "Line3"
+|     <br>
+|     "Line4"
+
+#data
+<html>
+#errors
+Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <body>
+
+#data
+<head>
+#errors
+Line: 1 Col: 6 Unexpected start tag (head). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <body>
+
+#data
+<body>
+#errors
+Line: 1 Col: 6 Unexpected start tag (body). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <body>
+
+#data
+<html><head>
+#errors
+Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <body>
+
+#data
+<html><head></head>
+#errors
+Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <body>
+
+#data
+<html><head></head><body>
+#errors
+Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <body>
+
+#data
+<html><head></head><body></body>
+#errors
+Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <body>
+
+#data
+<html><head><body></body></html>
+#errors
+Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <body>
+
+#data
+<html><head></body></html>
+#errors
+Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
+Line: 1 Col: 19 Unexpected end tag (body).
+Line: 1 Col: 26 Unexpected end tag (html).
+#document
+| <html>
+|   <head>
+|   <body>
+
+#data
+<html><head><body></html>
+#errors
+Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <body>
+
+#data
+<html><body></html>
+#errors
+Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <body>
+
+#data
+<body></html>
+#errors
+Line: 1 Col: 6 Unexpected start tag (body). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <body>
+
+#data
+<head></html>
+#errors
+Line: 1 Col: 6 Unexpected start tag (head). Expected DOCTYPE.
+Line: 1 Col: 13 Unexpected end tag (html). Ignored.
+#document
+| <html>
+|   <head>
+|   <body>
+
+#data
+</head>
+#errors
+Line: 1 Col: 7 Unexpected end tag (head). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <body>
+
+#data
+</body>
+#errors
+Line: 1 Col: 7 Unexpected end tag (body). Expected DOCTYPE.
+Line: 1 Col: 7 Unexpected end tag (body) after the (implied) root element.
+#document
+| <html>
+|   <head>
+|   <body>
+
+#data
+</html>
+#errors
+Line: 1 Col: 7 Unexpected end tag (html). Expected DOCTYPE.
+Line: 1 Col: 7 Unexpected end tag (html) after the (implied) root element.
+#document
+| <html>
+|   <head>
+|   <body>
+
+#data
+<b><table><td><i></table>
+#errors
+Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
+Line: 1 Col: 14 Unexpected table cell start tag (td) in the table body phase.
+Line: 1 Col: 25 Got table cell end tag (td) while required end tags are missing.
+Line: 1 Col: 25 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <b>
+|       <table>
+|         <tbody>
+|           <tr>
+|             <td>
+|               <i>
+
+#data
+<b><table><td></b><i></table>X
+#errors
+Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
+Line: 1 Col: 14 Unexpected table cell start tag (td) in the table body phase.
+Line: 1 Col: 18 End tag (b) violates step 1, paragraph 1 of the adoption agency algorithm.
+Line: 1 Col: 29 Got table cell end tag (td) while required end tags are missing.
+Line: 1 Col: 30 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <b>
+|       <table>
+|         <tbody>
+|           <tr>
+|             <td>
+|               <i>
+|       "X"
+
+#data
+<h1>Hello<h2>World
+#errors
+4: Start tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
+13: Heading cannot be a child of another heading.
+18: End of file seen and there were open elements.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <h1>
+|       "Hello"
+|     <h2>
+|       "World"
+
+#data
+<a><p>X<a>Y</a>Z</p></a>
+#errors
+Line: 1 Col: 3 Unexpected start tag (a). Expected DOCTYPE.
+Line: 1 Col: 10 Unexpected start tag (a) implies end tag (a).
+Line: 1 Col: 10 End tag (a) violates step 1, paragraph 3 of the adoption agency algorithm.
+Line: 1 Col: 24 End tag (a) violates step 1, paragraph 1 of the adoption agency algorithm.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <a>
+|     <p>
+|       <a>
+|         "X"
+|       <a>
+|         "Y"
+|       "Z"
+
+#data
+<b><button>foo</b>bar
+#errors
+Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
+Line: 1 Col: 15 End tag (b) violates step 1, paragraph 1 of the adoption agency algorithm.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <b>
+|     <button>
+|       <b>
+|         "foo"
+|       "bar"
+
+#data
+<!DOCTYPE html><span><button>foo</span>bar
+#errors
+39: End tag “span” seen but there were unclosed elements.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <span>
+|       <button>
+|         "foobar"
+
+#data
+<p><b><div><marquee></p></b></div>X
+#errors
+Line: 1 Col: 3 Unexpected start tag (p). Expected DOCTYPE.
+Line: 1 Col: 11 Unexpected end tag (p). Ignored.
+Line: 1 Col: 24 Unexpected end tag (p). Ignored.
+Line: 1 Col: 28 End tag (b) violates step 1, paragraph 1 of the adoption agency algorithm.
+Line: 1 Col: 34 End tag (div) seen too early. Expected other end tag.
+Line: 1 Col: 35 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <b>
+|     <div>
+|       <b>
+|         <marquee>
+|           <p>
+|           "X"
+
+#data
+<script><div></script></div><title><p></title><p><p>
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 28 Unexpected end tag (div). Ignored.
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<div>"
+|     <title>
+|       "<p>"
+|   <body>
+|     <p>
+|     <p>
+
+#data
+<!--><div>--<!-->
+#errors
+Line: 1 Col: 5 Incorrect comment.
+Line: 1 Col: 10 Unexpected start tag (div). Expected DOCTYPE.
+Line: 1 Col: 17 Incorrect comment.
+Line: 1 Col: 17 Expected closing tag. Unexpected end of file.
+#document
+| <!--  -->
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       "--"
+|       <!--  -->
+
+#data
+<p><hr></p>
+#errors
+Line: 1 Col: 3 Unexpected start tag (p). Expected DOCTYPE.
+Line: 1 Col: 11 Unexpected end tag (p). Ignored.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|     <hr>
+|     <p>
+
+#data
+<select><b><option><select><option></b></select>X
+#errors
+Line: 1 Col: 8 Unexpected start tag (select). Expected DOCTYPE.
+Line: 1 Col: 11 Unexpected start tag token (b) in the select phase. Ignored.
+Line: 1 Col: 27 Unexpected select start tag in the select phase treated as select end tag.
+Line: 1 Col: 39 End tag (b) violates step 1, paragraph 1 of the adoption agency algorithm.
+Line: 1 Col: 48 Unexpected end tag (select). Ignored.
+Line: 1 Col: 49 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <select>
+|       <option>
+|     <option>
+|       "X"
+
+#data
+<a><table><td><a><table></table><a></tr><a></table><b>X</b>C<a>Y
+#errors
+Line: 1 Col: 3 Unexpected start tag (a). Expected DOCTYPE.
+Line: 1 Col: 14 Unexpected table cell start tag (td) in the table body phase.
+Line: 1 Col: 35 Unexpected start tag (a) implies end tag (a).
+Line: 1 Col: 40 Got table cell end tag (td) while required end tags are missing.
+Line: 1 Col: 43 Unexpected start tag (a) in table context caused voodoo mode.
+Line: 1 Col: 43 Unexpected start tag (a) implies end tag (a).
+Line: 1 Col: 43 End tag (a) violates step 1, paragraph 1 of the adoption agency algorithm.
+Line: 1 Col: 51 Unexpected implied end tag (a) in the table phase.
+Line: 1 Col: 63 Unexpected start tag (a) implies end tag (a).
+Line: 1 Col: 64 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <a>
+|       <a>
+|       <table>
+|         <tbody>
+|           <tr>
+|             <td>
+|               <a>
+|                 <table>
+|               <a>
+|     <a>
+|       <b>
+|         "X"
+|       "C"
+|     <a>
+|       "Y"
+
+#data
+<a X>0<b>1<a Y>2
+#errors
+Line: 1 Col: 5 Unexpected start tag (a). Expected DOCTYPE.
+Line: 1 Col: 15 Unexpected start tag (a) implies end tag (a).
+Line: 1 Col: 15 End tag (a) violates step 1, paragraph 3 of the adoption agency algorithm.
+Line: 1 Col: 16 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <a>
+|       x=""
+|       "0"
+|       <b>
+|         "1"
+|     <b>
+|       <a>
+|         y=""
+|         "2"
+
+#data
+<!-----><font><div>hello<table>excite!<b>me!<th><i>please!</tr><!--X-->
+#errors
+Line: 1 Col: 7 Unexpected '-' after '--' found in comment.
+Line: 1 Col: 14 Unexpected start tag (font). Expected DOCTYPE.
+Line: 1 Col: 38 Unexpected non-space characters in table context caused voodoo mode.
+Line: 1 Col: 41 Unexpected start tag (b) in table context caused voodoo mode.
+Line: 1 Col: 48 Unexpected implied end tag (b) in the table phase.
+Line: 1 Col: 48 Unexpected table cell start tag (th) in the table body phase.
+Line: 1 Col: 63 Got table cell end tag (th) while required end tags are missing.
+Line: 1 Col: 71 Unexpected end of file. Expected table content.
+#document
+| <!-- - -->
+| <html>
+|   <head>
+|   <body>
+|     <font>
+|       <div>
+|         "helloexcite!"
+|         <b>
+|           "me!"
+|         <table>
+|           <tbody>
+|             <tr>
+|               <th>
+|                 <i>
+|                   "please!"
+|             <!-- X -->
+
+#data
+<!DOCTYPE html><li>hello<li>world<ul>how<li>do</ul>you</body><!--do-->
+#errors
+Line: 1 Col: 61 Unexpected end tag (li). Missing end tag (body).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <li>
+|       "hello"
+|     <li>
+|       "world"
+|       <ul>
+|         "how"
+|         <li>
+|           "do"
+|       "you"
+|   <!-- do -->
+
+#data
+<!DOCTYPE html>A<option>B<optgroup>C<select>D</option>E
+#errors
+Line: 1 Col: 54 Unexpected end tag (option) in the select phase. Ignored.
+Line: 1 Col: 55 Expected closing tag. Unexpected end of file.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     "A"
+|     <option>
+|       "B"
+|     <optgroup>
+|       "C"
+|       <select>
+|         "DE"
+
+#data
+<
+#errors
+Line: 1 Col: 1 Expected tag name. Got something else instead
+Line: 1 Col: 1 Unexpected non-space characters. Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <body>
+|     "<"
+
+#data
+<#
+#errors
+Line: 1 Col: 1 Expected tag name. Got something else instead
+Line: 1 Col: 1 Unexpected non-space characters. Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <body>
+|     "<#"
+
+#data
+</
+#errors
+Line: 1 Col: 2 Expected closing tag. Unexpected end of file.
+Line: 1 Col: 2 Unexpected non-space characters. Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <body>
+|     "</"
+
+#data
+</#
+#errors
+Line: 1 Col: 2 Expected closing tag. Unexpected character '#' found.
+Line: 1 Col: 3 Unexpected End of file. Expected DOCTYPE.
+#document
+| <!-- # -->
+| <html>
+|   <head>
+|   <body>
+
+#data
+<?
+#errors
+Line: 1 Col: 1 Expected tag name. Got '?' instead. (HTML doesn't support processing instructions.)
+Line: 1 Col: 2 Unexpected End of file. Expected DOCTYPE.
+#document
+| <!-- ? -->
+| <html>
+|   <head>
+|   <body>
+
+#data
+<?#
+#errors
+Line: 1 Col: 1 Expected tag name. Got '?' instead. (HTML doesn't support processing instructions.)
+Line: 1 Col: 3 Unexpected End of file. Expected DOCTYPE.
+#document
+| <!-- ?# -->
+| <html>
+|   <head>
+|   <body>
+
+#data
+<!
+#errors
+Line: 1 Col: 2 Expected '--' or 'DOCTYPE'. Not found.
+Line: 1 Col: 2 Unexpected End of file. Expected DOCTYPE.
+#document
+| <!--  -->
+| <html>
+|   <head>
+|   <body>
+
+#data
+<!#
+#errors
+Line: 1 Col: 3 Expected '--' or 'DOCTYPE'. Not found.
+Line: 1 Col: 3 Unexpected End of file. Expected DOCTYPE.
+#document
+| <!-- # -->
+| <html>
+|   <head>
+|   <body>
+
+#data
+<?COMMENT?>
+#errors
+Line: 1 Col: 1 Expected tag name. Got '?' instead. (HTML doesn't support processing instructions.)
+Line: 1 Col: 11 Unexpected End of file. Expected DOCTYPE.
+#document
+| <!-- ?COMMENT? -->
+| <html>
+|   <head>
+|   <body>
+
+#data
+<!COMMENT>
+#errors
+Line: 1 Col: 2 Expected '--' or 'DOCTYPE'. Not found.
+Line: 1 Col: 10 Unexpected End of file. Expected DOCTYPE.
+#document
+| <!-- COMMENT -->
+| <html>
+|   <head>
+|   <body>
+
+#data
+</ COMMENT >
+#errors
+Line: 1 Col: 2 Expected closing tag. Unexpected character ' ' found.
+Line: 1 Col: 12 Unexpected End of file. Expected DOCTYPE.
+#document
+| <!--  COMMENT  -->
+| <html>
+|   <head>
+|   <body>
+
+#data
+<?COM--MENT?>
+#errors
+Line: 1 Col: 1 Expected tag name. Got '?' instead. (HTML doesn't support processing instructions.)
+Line: 1 Col: 13 Unexpected End of file. Expected DOCTYPE.
+#document
+| <!-- ?COM--MENT? -->
+| <html>
+|   <head>
+|   <body>
+
+#data
+<!COM--MENT>
+#errors
+Line: 1 Col: 2 Expected '--' or 'DOCTYPE'. Not found.
+Line: 1 Col: 12 Unexpected End of file. Expected DOCTYPE.
+#document
+| <!-- COM--MENT -->
+| <html>
+|   <head>
+|   <body>
+
+#data
+</ COM--MENT >
+#errors
+Line: 1 Col: 2 Expected closing tag. Unexpected character ' ' found.
+Line: 1 Col: 14 Unexpected End of file. Expected DOCTYPE.
+#document
+| <!--  COM--MENT  -->
+| <html>
+|   <head>
+|   <body>
+
+#data
+<!DOCTYPE html><style> EOF
+#errors
+Line: 1 Col: 26 Unexpected end of file. Expected end tag (style).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <style>
+|       " EOF"
+|   <body>
+
+#data
+<!DOCTYPE html><script> <!-- </script> --> </script> EOF
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       " <!-- "
+|     " "
+|   <body>
+|     "-->  EOF"
+
+#data
+<b><p></b>TEST
+#errors
+Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
+Line: 1 Col: 10 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <b>
+|     <p>
+|       <b>
+|       "TEST"
+
+#data
+<p id=a><b><p id=b></b>TEST
+#errors
+Line: 1 Col: 8 Unexpected start tag (p). Expected DOCTYPE.
+Line: 1 Col: 19 Unexpected end tag (p). Ignored.
+Line: 1 Col: 23 End tag (b) violates step 1, paragraph 2 of the adoption agency algorithm.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       id="a"
+|       <b>
+|     <p>
+|       id="b"
+|       "TEST"
+
+#data
+<b id=a><p><b id=b></p></b>TEST
+#errors
+Line: 1 Col: 8 Unexpected start tag (b). Expected DOCTYPE.
+Line: 1 Col: 23 Unexpected end tag (p). Ignored.
+Line: 1 Col: 27 End tag (b) violates step 1, paragraph 2 of the adoption agency algorithm.
+Line: 1 Col: 31 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <b>
+|       id="a"
+|       <p>
+|         <b>
+|           id="b"
+|       "TEST"
+
+#data
+<!DOCTYPE html><title>U-test</title><body><div><p>Test<u></p></div></body>
+#errors
+Line: 1 Col: 61 Unexpected end tag (p). Ignored.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <title>
+|       "U-test"
+|   <body>
+|     <div>
+|       <p>
+|         "Test"
+|         <u>
+
+#data
+<!DOCTYPE html><font><table></font></table></font>
+#errors
+Line: 1 Col: 35 Unexpected end tag (font) in table context caused voodoo mode.
+Line: 1 Col: 35 End tag (font) violates step 1, paragraph 1 of the adoption agency algorithm.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <font>
+|       <table>
+
+#data
+<font><p>hello<b>cruel</font>world
+#errors
+Line: 1 Col: 6 Unexpected start tag (font). Expected DOCTYPE.
+Line: 1 Col: 29 End tag (font) violates step 1, paragraph 3 of the adoption agency algorithm.
+Line: 1 Col: 29 End tag (font) violates step 1, paragraph 3 of the adoption agency algorithm.
+Line: 1 Col: 34 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <font>
+|     <p>
+|       <font>
+|         "hello"
+|         <b>
+|           "cruel"
+|       <b>
+|         "world"
+
+#data
+<b>Test</i>Test
+#errors
+Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
+Line: 1 Col: 11 End tag (i) violates step 1, paragraph 1 of the adoption agency algorithm.
+Line: 1 Col: 15 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <b>
+|       "TestTest"
+
+#data
+<b>A<cite>B<div>C
+#errors
+Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
+Line: 1 Col: 17 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <b>
+|       "A"
+|       <cite>
+|         "B"
+|         <div>
+|           "C"
+
+#data
+<b>A<cite>B<div>C</cite>D
+#errors
+Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
+Line: 1 Col: 24 Unexpected end tag (cite). Ignored.
+Line: 1 Col: 25 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <b>
+|       "A"
+|       <cite>
+|         "B"
+|         <div>
+|           "CD"
+
+#data
+<b>A<cite>B<div>C</b>D
+#errors
+Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
+Line: 1 Col: 21 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
+Line: 1 Col: 22 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <b>
+|       "A"
+|       <cite>
+|         "B"
+|     <div>
+|       <b>
+|         "C"
+|       "D"
+
+#data
+
+#errors
+Line: 1 Col: 0 Unexpected End of file. Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <body>
+
+#data
+<DIV>
+#errors
+Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
+Line: 1 Col: 5 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+
+#data
+<DIV> abc
+#errors
+Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
+Line: 1 Col: 9 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       " abc"
+
+#data
+<DIV> abc <B>
+#errors
+Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
+Line: 1 Col: 13 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       " abc "
+|       <b>
+
+#data
+<DIV> abc <B> def
+#errors
+Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
+Line: 1 Col: 17 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       " abc "
+|       <b>
+|         " def"
+
+#data
+<DIV> abc <B> def <I>
+#errors
+Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
+Line: 1 Col: 21 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       " abc "
+|       <b>
+|         " def "
+|         <i>
+
+#data
+<DIV> abc <B> def <I> ghi
+#errors
+Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
+Line: 1 Col: 25 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       " abc "
+|       <b>
+|         " def "
+|         <i>
+|           " ghi"
+
+#data
+<DIV> abc <B> def <I> ghi <P>
+#errors
+Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
+Line: 1 Col: 29 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       " abc "
+|       <b>
+|         " def "
+|         <i>
+|           " ghi "
+|           <p>
+
+#data
+<DIV> abc <B> def <I> ghi <P> jkl
+#errors
+Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
+Line: 1 Col: 33 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       " abc "
+|       <b>
+|         " def "
+|         <i>
+|           " ghi "
+|           <p>
+|             " jkl"
+
+#data
+<DIV> abc <B> def <I> ghi <P> jkl </B>
+#errors
+Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
+Line: 1 Col: 38 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
+Line: 1 Col: 38 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       " abc "
+|       <b>
+|         " def "
+|         <i>
+|           " ghi "
+|       <i>
+|         <p>
+|           <b>
+|             " jkl "
+
+#data
+<DIV> abc <B> def <I> ghi <P> jkl </B> mno
+#errors
+Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
+Line: 1 Col: 38 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
+Line: 1 Col: 42 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       " abc "
+|       <b>
+|         " def "
+|         <i>
+|           " ghi "
+|       <i>
+|         <p>
+|           <b>
+|             " jkl "
+|           " mno"
+
+#data
+<DIV> abc <B> def <I> ghi <P> jkl </B> mno </I>
+#errors
+Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
+Line: 1 Col: 38 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
+Line: 1 Col: 47 End tag (i) violates step 1, paragraph 3 of the adoption agency algorithm.
+Line: 1 Col: 47 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       " abc "
+|       <b>
+|         " def "
+|         <i>
+|           " ghi "
+|       <i>
+|       <p>
+|         <i>
+|           <b>
+|             " jkl "
+|           " mno "
+
+#data
+<DIV> abc <B> def <I> ghi <P> jkl </B> mno </I> pqr
+#errors
+Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
+Line: 1 Col: 38 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
+Line: 1 Col: 47 End tag (i) violates step 1, paragraph 3 of the adoption agency algorithm.
+Line: 1 Col: 51 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       " abc "
+|       <b>
+|         " def "
+|         <i>
+|           " ghi "
+|       <i>
+|       <p>
+|         <i>
+|           <b>
+|             " jkl "
+|           " mno "
+|         " pqr"
+
+#data
+<DIV> abc <B> def <I> ghi <P> jkl </B> mno </I> pqr </P>
+#errors
+Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
+Line: 1 Col: 38 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
+Line: 1 Col: 47 End tag (i) violates step 1, paragraph 3 of the adoption agency algorithm.
+Line: 1 Col: 56 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       " abc "
+|       <b>
+|         " def "
+|         <i>
+|           " ghi "
+|       <i>
+|       <p>
+|         <i>
+|           <b>
+|             " jkl "
+|           " mno "
+|         " pqr "
+
+#data
+<DIV> abc <B> def <I> ghi <P> jkl </B> mno </I> pqr </P> stu
+#errors
+Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
+Line: 1 Col: 38 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
+Line: 1 Col: 47 End tag (i) violates step 1, paragraph 3 of the adoption agency algorithm.
+Line: 1 Col: 60 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       " abc "
+|       <b>
+|         " def "
+|         <i>
+|           " ghi "
+|       <i>
+|       <p>
+|         <i>
+|           <b>
+|             " jkl "
+|           " mno "
+|         " pqr "
+|       " stu"
+
+#data
+<test attribute---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->
+#errors
+Line: 1 Col: 1040 Unexpected start tag (test). Expected DOCTYPE.
+Line: 1 Col: 1040 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <test>
+|       attribute----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------=""
+
+#data
+<a href="blah">aba<table><a href="foo">br<tr><td></td></tr>x</table>aoe
+#errors
+Line: 1 Col: 15 Unexpected start tag (a). Expected DOCTYPE.
+Line: 1 Col: 39 Unexpected start tag (a) in table context caused voodoo mode.
+Line: 1 Col: 39 Unexpected start tag (a) implies end tag (a).
+Line: 1 Col: 39 End tag (a) violates step 1, paragraph 1 of the adoption agency algorithm.
+Line: 1 Col: 45 Unexpected implied end tag (a) in the table phase.
+Line: 1 Col: 68 Unexpected implied end tag (a) in the table phase.
+Line: 1 Col: 71 Expected closing tag. Unexpected end of file.
+
+#document
+| <html>
+|   <head>
+|   <body>
+|     <a>
+|       href="blah"
+|       "aba"
+|       <a>
+|         href="foo"
+|         "br"
+|       <a>
+|         href="foo"
+|         "x"
+|       <table>
+|         <tbody>
+|           <tr>
+|             <td>
+|     <a>
+|       href="foo"
+|       "aoe"
+
+#data
+<a href="blah">aba<table><tr><td><a href="foo">br</td></tr>x</table>aoe
+#errors
+Line: 1 Col: 15 Unexpected start tag (a). Expected DOCTYPE.
+Line: 1 Col: 54 Got table cell end tag (td) while required end tags are missing.
+Line: 1 Col: 60 Unexpected non-space characters in table context caused voodoo mode.
+Line: 1 Col: 71 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <a>
+|       href="blah"
+|       "abax"
+|       <table>
+|         <tbody>
+|           <tr>
+|             <td>
+|               <a>
+|                 href="foo"
+|                 "br"
+|       "aoe"
+
+#data
+<table><a href="blah">aba<tr><td><a href="foo">br</td></tr>x</table>aoe
+#errors
+Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+Line: 1 Col: 22 Unexpected start tag (a) in table context caused voodoo mode.
+Line: 1 Col: 29 Unexpected implied end tag (a) in the table phase.
+Line: 1 Col: 54 Got table cell end tag (td) while required end tags are missing.
+Line: 1 Col: 68 Unexpected implied end tag (a) in the table phase.
+Line: 1 Col: 71 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <a>
+|       href="blah"
+|       "aba"
+|     <a>
+|       href="blah"
+|       "x"
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             <a>
+|               href="foo"
+|               "br"
+|     <a>
+|       href="blah"
+|       "aoe"
+
+#data
+<a href=a>aa<marquee>aa<a href=b>bb</marquee>aa
+#errors
+Line: 1 Col: 10 Unexpected start tag (a). Expected DOCTYPE.
+Line: 1 Col: 45 End tag (marquee) seen too early. Expected other end tag.
+Line: 1 Col: 47 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <a>
+|       href="a"
+|       "aa"
+|       <marquee>
+|         "aa"
+|         <a>
+|           href="b"
+|           "bb"
+|       "aa"
+
+#data
+<wbr><strike><code></strike><code><strike></code>
+#errors
+Line: 1 Col: 5 Unexpected start tag (wbr). Expected DOCTYPE.
+Line: 1 Col: 28 End tag (strike) violates step 1, paragraph 3 of the adoption agency algorithm.
+Line: 1 Col: 49 Unexpected end tag (code). Ignored.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <wbr>
+|     <strike>
+|       <code>
+|     <code>
+|       <code>
+|         <strike>
+
+#data
+<!DOCTYPE html><spacer>foo
+#errors
+26: End of file seen and there were open elements.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <spacer>
+|       "foo"
+
+#data
+<title><meta></title><link><title><meta></title>
+#errors
+Line: 1 Col: 7 Unexpected start tag (title). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|     <title>
+|       "<meta>"
+|     <link>
+|     <title>
+|       "<meta>"
+|   <body>
+
+#data
+<style><!--</style><meta><script>--><link></script>
+#errors
+Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
+Line: 1 Col: 51 Unexpected end of file. Expected end tag (style).
+#document
+| <html>
+|   <head>
+|     <style>
+|       "<!--"
+|     <meta>
+|     <script>
+|       "--><link>"
+|   <body>
+
+#data
+<head><meta></head><link>
+#errors
+Line: 1 Col: 6 Unexpected start tag (head). Expected DOCTYPE.
+Line: 1 Col: 25 Unexpected start tag (link) that can be in head. Moved.
+#document
+| <html>
+|   <head>
+|     <meta>
+|     <link>
+|   <body>
+
+#data
+<table><tr><tr><td><td><span><th><span>X</table>
+#errors
+Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+Line: 1 Col: 33 Got table cell end tag (td) while required end tags are missing.
+Line: 1 Col: 48 Got table cell end tag (th) while required end tags are missing.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|         <tr>
+|           <td>
+|           <td>
+|             <span>
+|           <th>
+|             <span>
+|               "X"
+
+#data
+<body><body><base><link><meta><title><p></title><body><p></body>
+#errors
+Line: 1 Col: 6 Unexpected start tag (body). Expected DOCTYPE.
+Line: 1 Col: 12 Unexpected start tag (body).
+Line: 1 Col: 54 Unexpected start tag (body).
+Line: 1 Col: 64 Unexpected end tag (p). Missing end tag (body).
+#document
+| <html>
+|   <head>
+|   <body>
+|     <base>
+|     <link>
+|     <meta>
+|     <title>
+|       "<p>"
+|     <p>
+
+#data
+<textarea><p></textarea>
+#errors
+Line: 1 Col: 10 Unexpected start tag (textarea). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <textarea>
+|       "<p>"
+
+#data
+<p><image></p>
+#errors
+Line: 1 Col: 3 Unexpected start tag (p). Expected DOCTYPE.
+Line: 1 Col: 10 Unexpected start tag (image). Treated as img.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <img>
+
+#data
+<a><table><a></table><p><a><div><a>
+#errors
+Line: 1 Col: 3 Unexpected start tag (a). Expected DOCTYPE.
+Line: 1 Col: 13 Unexpected start tag (a) in table context caused voodoo mode.
+Line: 1 Col: 13 Unexpected start tag (a) implies end tag (a).
+Line: 1 Col: 13 End tag (a) violates step 1, paragraph 1 of the adoption agency algorithm.
+Line: 1 Col: 21 Unexpected end tag (table). Expected end tag (a).
+Line: 1 Col: 27 Unexpected start tag (a) implies end tag (a).
+Line: 1 Col: 27 End tag (a) violates step 1, paragraph 2 of the adoption agency algorithm.
+Line: 1 Col: 32 Unexpected end tag (p). Ignored.
+Line: 1 Col: 35 Unexpected start tag (a) implies end tag (a).
+Line: 1 Col: 35 End tag (a) violates step 1, paragraph 2 of the adoption agency algorithm.
+Line: 1 Col: 35 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <a>
+|       <a>
+|       <table>
+|     <p>
+|       <a>
+|     <div>
+|       <a>
+
+#data
+<head></p><meta><p>
+#errors
+Line: 1 Col: 6 Unexpected start tag (head). Expected DOCTYPE.
+Line: 1 Col: 10 Unexpected end tag (p). Ignored.
+#document
+| <html>
+|   <head>
+|     <meta>
+|   <body>
+|     <p>
+
+#data
+<head></html><meta><p>
+#errors
+Line: 1 Col: 6 Unexpected start tag (head). Expected DOCTYPE.
+Line: 1 Col: 19 Unexpected start tag (meta).
+#document
+| <html>
+|   <head>
+|   <body>
+|     <meta>
+|     <p>
+
+#data
+<b><table><td><i></table>
+#errors
+Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
+Line: 1 Col: 14 Unexpected table cell start tag (td) in the table body phase.
+Line: 1 Col: 25 Got table cell end tag (td) while required end tags are missing.
+Line: 1 Col: 25 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <b>
+|       <table>
+|         <tbody>
+|           <tr>
+|             <td>
+|               <i>
+
+#data
+<b><table><td></b><i></table>
+#errors
+Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
+Line: 1 Col: 14 Unexpected table cell start tag (td) in the table body phase.
+Line: 1 Col: 18 End tag (b) violates step 1, paragraph 1 of the adoption agency algorithm.
+Line: 1 Col: 29 Got table cell end tag (td) while required end tags are missing.
+Line: 1 Col: 29 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <b>
+|       <table>
+|         <tbody>
+|           <tr>
+|             <td>
+|               <i>
+
+#data
+<h1><h2>
+#errors
+4: Start tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
+8: Heading cannot be a child of another heading.
+8: End of file seen and there were open elements.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <h1>
+|     <h2>
+
+#data
+<a><p><a></a></p></a>
+#errors
+Line: 1 Col: 3 Unexpected start tag (a). Expected DOCTYPE.
+Line: 1 Col: 9 Unexpected start tag (a) implies end tag (a).
+Line: 1 Col: 9 End tag (a) violates step 1, paragraph 3 of the adoption agency algorithm.
+Line: 1 Col: 21 End tag (a) violates step 1, paragraph 1 of the adoption agency algorithm.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <a>
+|     <p>
+|       <a>
+|       <a>
+
+#data
+<b><button></b></button></b>
+#errors
+Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
+Line: 1 Col: 15 End tag (b) violates step 1, paragraph 1 of the adoption agency algorithm.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <b>
+|     <button>
+|       <b>
+
+#data
+<p><b><div><marquee></p></b></div>
+#errors
+Line: 1 Col: 3 Unexpected start tag (p). Expected DOCTYPE.
+Line: 1 Col: 11 Unexpected end tag (p). Ignored.
+Line: 1 Col: 24 Unexpected end tag (p). Ignored.
+Line: 1 Col: 28 End tag (b) violates step 1, paragraph 1 of the adoption agency algorithm.
+Line: 1 Col: 34 End tag (div) seen too early. Expected other end tag.
+Line: 1 Col: 34 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <b>
+|     <div>
+|       <b>
+|         <marquee>
+|           <p>
+
+#data
+<script></script></div><title></title><p><p>
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 23 Unexpected end tag (div). Ignored.
+#document
+| <html>
+|   <head>
+|     <script>
+|     <title>
+|   <body>
+|     <p>
+|     <p>
+
+#data
+<p><hr></p>
+#errors
+Line: 1 Col: 3 Unexpected start tag (p). Expected DOCTYPE.
+Line: 1 Col: 11 Unexpected end tag (p). Ignored.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|     <hr>
+|     <p>
+
+#data
+<select><b><option><select><option></b></select>
+#errors
+Line: 1 Col: 8 Unexpected start tag (select). Expected DOCTYPE.
+Line: 1 Col: 11 Unexpected start tag token (b) in the select phase. Ignored.
+Line: 1 Col: 27 Unexpected select start tag in the select phase treated as select end tag.
+Line: 1 Col: 39 End tag (b) violates step 1, paragraph 1 of the adoption agency algorithm.
+Line: 1 Col: 48 Unexpected end tag (select). Ignored.
+Line: 1 Col: 48 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <select>
+|       <option>
+|     <option>
+
+#data
+<html><head><title></title><body></body></html>
+#errors
+Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|     <title>
+|   <body>
+
+#data
+<a><table><td><a><table></table><a></tr><a></table><a>
+#errors
+Line: 1 Col: 3 Unexpected start tag (a). Expected DOCTYPE.
+Line: 1 Col: 14 Unexpected table cell start tag (td) in the table body phase.
+Line: 1 Col: 35 Unexpected start tag (a) implies end tag (a).
+Line: 1 Col: 40 Got table cell end tag (td) while required end tags are missing.
+Line: 1 Col: 43 Unexpected start tag (a) in table context caused voodoo mode.
+Line: 1 Col: 43 Unexpected start tag (a) implies end tag (a).
+Line: 1 Col: 43 End tag (a) violates step 1, paragraph 1 of the adoption agency algorithm.
+Line: 1 Col: 51 Unexpected implied end tag (a) in the table phase.
+Line: 1 Col: 54 Unexpected start tag (a) implies end tag (a).
+Line: 1 Col: 54 End tag (a) violates step 1, paragraph 2 of the adoption agency algorithm.
+Line: 1 Col: 54 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <a>
+|       <a>
+|       <table>
+|         <tbody>
+|           <tr>
+|             <td>
+|               <a>
+|                 <table>
+|               <a>
+|     <a>
+
+#data
+<ul><li></li><div><li></div><li><li><div><li><address><li><b><em></b><li></ul>
+#errors
+Line: 1 Col: 4 Unexpected start tag (ul). Expected DOCTYPE.
+Line: 1 Col: 45 Missing end tag (div, li).
+Line: 1 Col: 58 Missing end tag (address, li).
+Line: 1 Col: 69 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <ul>
+|       <li>
+|       <div>
+|         <li>
+|       <li>
+|       <li>
+|         <div>
+|       <li>
+|         <address>
+|       <li>
+|         <b>
+|           <em>
+|       <li>
+
+#data
+<ul><li><ul></li><li>a</li></ul></li></ul>
+#errors
+XXX: fix me
+#document
+| <html>
+|   <head>
+|   <body>
+|     <ul>
+|       <li>
+|         <ul>
+|           <li>
+|             "a"
+
+#data
+<frameset><frame><frameset><frame></frameset><noframes></noframes></frameset>
+#errors
+Line: 1 Col: 10 Unexpected start tag (frameset). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <frameset>
+|     <frame>
+|     <frameset>
+|       <frame>
+|     <noframes>
+
+#data
+<h1><table><td><h3></table><h3></h1>
+#errors
+4: Start tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
+15: “td” start tag in table body.
+27: Unclosed elements.
+31: Heading cannot be a child of another heading.
+36: End tag “h1” seen but there were unclosed elements.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <h1>
+|       <table>
+|         <tbody>
+|           <tr>
+|             <td>
+|               <h3>
+|     <h3>
+
+#data
+<table><colgroup><col><colgroup><col><col><col><colgroup><col><col><thead><tr><td></table>
+#errors
+Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <colgroup>
+|         <col>
+|       <colgroup>
+|         <col>
+|         <col>
+|         <col>
+|       <colgroup>
+|         <col>
+|         <col>
+|       <thead>
+|         <tr>
+|           <td>
+
+#data
+<table><col><tbody><col><tr><col><td><col></table><col>
+#errors
+Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+Line: 1 Col: 37 Unexpected table cell start tag (td) in the table body phase.
+Line: 1 Col: 55 Unexpected start tag col. Ignored.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <colgroup>
+|         <col>
+|       <tbody>
+|       <colgroup>
+|         <col>
+|       <tbody>
+|         <tr>
+|       <colgroup>
+|         <col>
+|       <tbody>
+|         <tr>
+|           <td>
+|       <colgroup>
+|         <col>
+
+#data
+<table><colgroup><tbody><colgroup><tr><colgroup><td><colgroup></table><colgroup>
+#errors
+Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+Line: 1 Col: 52 Unexpected table cell start tag (td) in the table body phase.
+Line: 1 Col: 80 Unexpected start tag colgroup. Ignored.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <colgroup>
+|       <tbody>
+|       <colgroup>
+|       <tbody>
+|         <tr>
+|       <colgroup>
+|       <tbody>
+|         <tr>
+|           <td>
+|       <colgroup>
+
+#data
+</strong></b></em></i></u></strike></s></blink></tt></pre></big></small></font></select></h1></h2></h3></h4></h5></h6></body></br></a></img></title></span></style></script></table></th></td></tr></frame></area></link></param></hr></input></col></base></meta></basefont></bgsound></embed></spacer></p></dd></dt></caption></colgroup></tbody></tfoot></thead></address></blockquote></center></dir></div></dl></fieldset></listing></menu></ol></ul></li></nobr></wbr></form></button></marquee></object></html></frameset></head></iframe></image></isindex></noembed></noframes></noscript></optgroup></option></plaintext></textarea>
+#errors
+Line: 1 Col: 9 Unexpected end tag (strong). Expected DOCTYPE.
+Line: 1 Col: 9 Unexpected end tag (strong) after the (implied) root element.
+Line: 1 Col: 13 Unexpected end tag (b) after the (implied) root element.
+Line: 1 Col: 18 Unexpected end tag (em) after the (implied) root element.
+Line: 1 Col: 22 Unexpected end tag (i) after the (implied) root element.
+Line: 1 Col: 26 Unexpected end tag (u) after the (implied) root element.
+Line: 1 Col: 35 Unexpected end tag (strike) after the (implied) root element.
+Line: 1 Col: 39 Unexpected end tag (s) after the (implied) root element.
+Line: 1 Col: 47 Unexpected end tag (blink) after the (implied) root element.
+Line: 1 Col: 52 Unexpected end tag (tt) after the (implied) root element.
+Line: 1 Col: 58 Unexpected end tag (pre) after the (implied) root element.
+Line: 1 Col: 64 Unexpected end tag (big) after the (implied) root element.
+Line: 1 Col: 72 Unexpected end tag (small) after the (implied) root element.
+Line: 1 Col: 79 Unexpected end tag (font) after the (implied) root element.
+Line: 1 Col: 88 Unexpected end tag (select) after the (implied) root element.
+Line: 1 Col: 93 Unexpected end tag (h1) after the (implied) root element.
+Line: 1 Col: 98 Unexpected end tag (h2) after the (implied) root element.
+Line: 1 Col: 103 Unexpected end tag (h3) after the (implied) root element.
+Line: 1 Col: 108 Unexpected end tag (h4) after the (implied) root element.
+Line: 1 Col: 113 Unexpected end tag (h5) after the (implied) root element.
+Line: 1 Col: 118 Unexpected end tag (h6) after the (implied) root element.
+Line: 1 Col: 125 Unexpected end tag (body) after the (implied) root element.
+Line: 1 Col: 130 Unexpected end tag (br). Treated as br element.
+Line: 1 Col: 134 End tag (a) violates step 1, paragraph 1 of the adoption agency algorithm.
+Line: 1 Col: 140 This element (img) has no end tag.
+Line: 1 Col: 148 Unexpected end tag (title). Ignored.
+Line: 1 Col: 155 Unexpected end tag (span). Ignored.
+Line: 1 Col: 163 Unexpected end tag (style). Ignored.
+Line: 1 Col: 172 Unexpected end tag (script). Ignored.
+Line: 1 Col: 180 Unexpected end tag (table). Ignored.
+Line: 1 Col: 185 Unexpected end tag (th). Ignored.
+Line: 1 Col: 190 Unexpected end tag (td). Ignored.
+Line: 1 Col: 195 Unexpected end tag (tr). Ignored.
+Line: 1 Col: 203 This element (frame) has no end tag.
+Line: 1 Col: 210 This element (area) has no end tag.
+Line: 1 Col: 217 Unexpected end tag (link). Ignored.
+Line: 1 Col: 225 This element (param) has no end tag.
+Line: 1 Col: 230 This element (hr) has no end tag.
+Line: 1 Col: 238 This element (input) has no end tag.
+Line: 1 Col: 244 Unexpected end tag (col). Ignored.
+Line: 1 Col: 251 Unexpected end tag (base). Ignored.
+Line: 1 Col: 258 Unexpected end tag (meta). Ignored.
+Line: 1 Col: 269 This element (basefont) has no end tag.
+Line: 1 Col: 279 This element (bgsound) has no end tag.
+Line: 1 Col: 287 This element (embed) has no end tag.
+Line: 1 Col: 296 This element (spacer) has no end tag.
+Line: 1 Col: 300 Unexpected end tag (p). Ignored.
+Line: 1 Col: 305 End tag (dd) seen too early. Expected other end tag.
+Line: 1 Col: 310 End tag (dt) seen too early. Expected other end tag.
+Line: 1 Col: 320 Unexpected end tag (caption). Ignored.
+Line: 1 Col: 331 Unexpected end tag (colgroup). Ignored.
+Line: 1 Col: 339 Unexpected end tag (tbody). Ignored.
+Line: 1 Col: 347 Unexpected end tag (tfoot). Ignored.
+Line: 1 Col: 355 Unexpected end tag (thead). Ignored.
+Line: 1 Col: 365 End tag (address) seen too early. Expected other end tag.
+Line: 1 Col: 378 End tag (blockquote) seen too early. Expected other end tag.
+Line: 1 Col: 387 End tag (center) seen too early. Expected other end tag.
+Line: 1 Col: 393 Unexpected end tag (dir). Ignored.
+Line: 1 Col: 399 End tag (div) seen too early. Expected other end tag.
+Line: 1 Col: 404 End tag (dl) seen too early. Expected other end tag.
+Line: 1 Col: 415 End tag (fieldset) seen too early. Expected other end tag.
+Line: 1 Col: 425 End tag (listing) seen too early. Expected other end tag.
+Line: 1 Col: 432 End tag (menu) seen too early. Expected other end tag.
+Line: 1 Col: 437 End tag (ol) seen too early. Expected other end tag.
+Line: 1 Col: 442 End tag (ul) seen too early. Expected other end tag.
+Line: 1 Col: 447 End tag (li) seen too early. Expected other end tag.
+Line: 1 Col: 454 End tag (nobr) violates step 1, paragraph 1 of the adoption agency algorithm.
+Line: 1 Col: 460 This element (wbr) has no end tag.
+Line: 1 Col: 476 End tag (button) seen too early. Expected other end tag.
+Line: 1 Col: 486 End tag (marquee) seen too early. Expected other end tag.
+Line: 1 Col: 495 End tag (object) seen too early. Expected other end tag.
+Line: 1 Col: 513 Unexpected end tag (html). Ignored.
+Line: 1 Col: 513 Unexpected end tag (frameset). Ignored.
+Line: 1 Col: 520 Unexpected end tag (head). Ignored.
+Line: 1 Col: 529 Unexpected end tag (iframe). Ignored.
+Line: 1 Col: 537 This element (image) has no end tag.
+Line: 1 Col: 547 This element (isindex) has no end tag.
+Line: 1 Col: 557 Unexpected end tag (noembed). Ignored.
+Line: 1 Col: 568 Unexpected end tag (noframes). Ignored.
+Line: 1 Col: 579 Unexpected end tag (noscript). Ignored.
+Line: 1 Col: 590 Unexpected end tag (optgroup). Ignored.
+Line: 1 Col: 599 Unexpected end tag (option). Ignored.
+Line: 1 Col: 611 Unexpected end tag (plaintext). Ignored.
+Line: 1 Col: 622 Unexpected end tag (textarea). Ignored.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <br>
+|     <p>
+
+#data
+<table><tr></strong></b></em></i></u></strike></s></blink></tt></pre></big></small></font></select></h1></h2></h3></h4></h5></h6></body></br></a></img></title></span></style></script></table></th></td></tr></frame></area></link></param></hr></input></col></base></meta></basefont></bgsound></embed></spacer></p></dd></dt></caption></colgroup></tbody></tfoot></thead></address></blockquote></center></dir></div></dl></fieldset></listing></menu></ol></ul></li></nobr></wbr></form></button></marquee></object></html></frameset></head></iframe></image></isindex></noembed></noframes></noscript></optgroup></option></plaintext></textarea>
+#errors
+Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+Line: 1 Col: 20 Unexpected end tag (strong) in table context caused voodoo mode.
+Line: 1 Col: 20 End tag (strong) violates step 1, paragraph 1 of the adoption agency algorithm.
+Line: 1 Col: 24 Unexpected end tag (b) in table context caused voodoo mode.
+Line: 1 Col: 24 End tag (b) violates step 1, paragraph 1 of the adoption agency algorithm.
+Line: 1 Col: 29 Unexpected end tag (em) in table context caused voodoo mode.
+Line: 1 Col: 29 End tag (em) violates step 1, paragraph 1 of the adoption agency algorithm.
+Line: 1 Col: 33 Unexpected end tag (i) in table context caused voodoo mode.
+Line: 1 Col: 33 End tag (i) violates step 1, paragraph 1 of the adoption agency algorithm.
+Line: 1 Col: 37 Unexpected end tag (u) in table context caused voodoo mode.
+Line: 1 Col: 37 End tag (u) violates step 1, paragraph 1 of the adoption agency algorithm.
+Line: 1 Col: 46 Unexpected end tag (strike) in table context caused voodoo mode.
+Line: 1 Col: 46 End tag (strike) violates step 1, paragraph 1 of the adoption agency algorithm.
+Line: 1 Col: 50 Unexpected end tag (s) in table context caused voodoo mode.
+Line: 1 Col: 50 End tag (s) violates step 1, paragraph 1 of the adoption agency algorithm.
+Line: 1 Col: 58 Unexpected end tag (blink) in table context caused voodoo mode.
+Line: 1 Col: 58 Unexpected end tag (blink). Ignored.
+Line: 1 Col: 63 Unexpected end tag (tt) in table context caused voodoo mode.
+Line: 1 Col: 63 End tag (tt) violates step 1, paragraph 1 of the adoption agency algorithm.
+Line: 1 Col: 69 Unexpected end tag (pre) in table context caused voodoo mode.
+Line: 1 Col: 69 End tag (pre) seen too early. Expected other end tag.
+Line: 1 Col: 75 Unexpected end tag (big) in table context caused voodoo mode.
+Line: 1 Col: 75 End tag (big) violates step 1, paragraph 1 of the adoption agency algorithm.
+Line: 1 Col: 83 Unexpected end tag (small) in table context caused voodoo mode.
+Line: 1 Col: 83 End tag (small) violates step 1, paragraph 1 of the adoption agency algorithm.
+Line: 1 Col: 90 Unexpected end tag (font) in table context caused voodoo mode.
+Line: 1 Col: 90 End tag (font) violates step 1, paragraph 1 of the adoption agency algorithm.
+Line: 1 Col: 99 Unexpected end tag (select) in table context caused voodoo mode.
+Line: 1 Col: 99 Unexpected end tag (select). Ignored.
+Line: 1 Col: 104 Unexpected end tag (h1) in table context caused voodoo mode.
+Line: 1 Col: 104 End tag (h1) seen too early. Expected other end tag.
+Line: 1 Col: 109 Unexpected end tag (h2) in table context caused voodoo mode.
+Line: 1 Col: 109 End tag (h2) seen too early. Expected other end tag.
+Line: 1 Col: 114 Unexpected end tag (h3) in table context caused voodoo mode.
+Line: 1 Col: 114 End tag (h3) seen too early. Expected other end tag.
+Line: 1 Col: 119 Unexpected end tag (h4) in table context caused voodoo mode.
+Line: 1 Col: 119 End tag (h4) seen too early. Expected other end tag.
+Line: 1 Col: 124 Unexpected end tag (h5) in table context caused voodoo mode.
+Line: 1 Col: 124 End tag (h5) seen too early. Expected other end tag.
+Line: 1 Col: 129 Unexpected end tag (h6) in table context caused voodoo mode.
+Line: 1 Col: 129 End tag (h6) seen too early. Expected other end tag.
+Line: 1 Col: 136 Unexpected end tag (body) in the table row phase. Ignored.
+Line: 1 Col: 141 Unexpected end tag (br) in table context caused voodoo mode.
+Line: 1 Col: 141 Unexpected end tag (br). Treated as br element.
+Line: 1 Col: 145 Unexpected end tag (a) in table context caused voodoo mode.
+Line: 1 Col: 145 End tag (a) violates step 1, paragraph 1 of the adoption agency algorithm.
+Line: 1 Col: 151 Unexpected end tag (img) in table context caused voodoo mode.
+Line: 1 Col: 151 This element (img) has no end tag.
+Line: 1 Col: 159 Unexpected end tag (title) in table context caused voodoo mode.
+Line: 1 Col: 159 Unexpected end tag (title). Ignored.
+Line: 1 Col: 166 Unexpected end tag (span) in table context caused voodoo mode.
+Line: 1 Col: 166 Unexpected end tag (span). Ignored.
+Line: 1 Col: 174 Unexpected end tag (style) in table context caused voodoo mode.
+Line: 1 Col: 174 Unexpected end tag (style). Ignored.
+Line: 1 Col: 183 Unexpected end tag (script) in table context caused voodoo mode.
+Line: 1 Col: 183 Unexpected end tag (script). Ignored.
+Line: 1 Col: 196 Unexpected end tag (th). Ignored.
+Line: 1 Col: 201 Unexpected end tag (td). Ignored.
+Line: 1 Col: 206 Unexpected end tag (tr). Ignored.
+Line: 1 Col: 214 This element (frame) has no end tag.
+Line: 1 Col: 221 This element (area) has no end tag.
+Line: 1 Col: 228 Unexpected end tag (link). Ignored.
+Line: 1 Col: 236 This element (param) has no end tag.
+Line: 1 Col: 241 This element (hr) has no end tag.
+Line: 1 Col: 249 This element (input) has no end tag.
+Line: 1 Col: 255 Unexpected end tag (col). Ignored.
+Line: 1 Col: 262 Unexpected end tag (base). Ignored.
+Line: 1 Col: 269 Unexpected end tag (meta). Ignored.
+Line: 1 Col: 280 This element (basefont) has no end tag.
+Line: 1 Col: 290 This element (bgsound) has no end tag.
+Line: 1 Col: 298 This element (embed) has no end tag.
+Line: 1 Col: 307 This element (spacer) has no end tag.
+Line: 1 Col: 311 Unexpected end tag (p). Ignored.
+Line: 1 Col: 316 End tag (dd) seen too early. Expected other end tag.
+Line: 1 Col: 321 End tag (dt) seen too early. Expected other end tag.
+Line: 1 Col: 331 Unexpected end tag (caption). Ignored.
+Line: 1 Col: 342 Unexpected end tag (colgroup). Ignored.
+Line: 1 Col: 350 Unexpected end tag (tbody). Ignored.
+Line: 1 Col: 358 Unexpected end tag (tfoot). Ignored.
+Line: 1 Col: 366 Unexpected end tag (thead). Ignored.
+Line: 1 Col: 376 End tag (address) seen too early. Expected other end tag.
+Line: 1 Col: 389 End tag (blockquote) seen too early. Expected other end tag.
+Line: 1 Col: 398 End tag (center) seen too early. Expected other end tag.
+Line: 1 Col: 404 Unexpected end tag (dir). Ignored.
+Line: 1 Col: 410 End tag (div) seen too early. Expected other end tag.
+Line: 1 Col: 415 End tag (dl) seen too early. Expected other end tag.
+Line: 1 Col: 426 End tag (fieldset) seen too early. Expected other end tag.
+Line: 1 Col: 436 End tag (listing) seen too early. Expected other end tag.
+Line: 1 Col: 443 End tag (menu) seen too early. Expected other end tag.
+Line: 1 Col: 448 End tag (ol) seen too early. Expected other end tag.
+Line: 1 Col: 453 End tag (ul) seen too early. Expected other end tag.
+Line: 1 Col: 458 End tag (li) seen too early. Expected other end tag.
+Line: 1 Col: 465 End tag (nobr) violates step 1, paragraph 1 of the adoption agency algorithm.
+Line: 1 Col: 471 This element (wbr) has no end tag.
+Line: 1 Col: 487 End tag (button) seen too early. Expected other end tag.
+Line: 1 Col: 497 End tag (marquee) seen too early. Expected other end tag.
+Line: 1 Col: 506 End tag (object) seen too early. Expected other end tag.
+Line: 1 Col: 524 Unexpected end tag (html). Ignored.
+Line: 1 Col: 524 Unexpected end tag (frameset). Ignored.
+Line: 1 Col: 531 Unexpected end tag (head). Ignored.
+Line: 1 Col: 540 Unexpected end tag (iframe). Ignored.
+Line: 1 Col: 548 This element (image) has no end tag.
+Line: 1 Col: 558 This element (isindex) has no end tag.
+Line: 1 Col: 568 Unexpected end tag (noembed). Ignored.
+Line: 1 Col: 579 Unexpected end tag (noframes). Ignored.
+Line: 1 Col: 590 Unexpected end tag (noscript). Ignored.
+Line: 1 Col: 601 Unexpected end tag (optgroup). Ignored.
+Line: 1 Col: 610 Unexpected end tag (option). Ignored.
+Line: 1 Col: 622 Unexpected end tag (plaintext). Ignored.
+Line: 1 Col: 633 Unexpected end tag (textarea). Ignored.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <br>
+|     <table>
+|       <tbody>
+|         <tr>
+|     <p>
+
+#data
+<frameset>
+#errors
+Line: 1 Col: 10 Unexpected start tag (frameset). Expected DOCTYPE.
+Line: 1 Col: 10 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <frameset>
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests10.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests10.dat
new file mode 100644
index 00000000..4f8df86f
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests10.dat
@@ -0,0 +1,799 @@
+#data
+<!DOCTYPE html><svg></svg>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+
+#data
+<!DOCTYPE html><svg></svg><![CDATA[a]]>
+#errors
+29: Bogus comment
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|     <!-- [CDATA[a]] -->
+
+#data
+<!DOCTYPE html><body><svg></svg>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+
+#data
+<!DOCTYPE html><body><select><svg></svg></select>
+#errors
+35: Stray “svg” start tag.
+42: Stray end tag “svg”
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <select>
+
+#data
+<!DOCTYPE html><body><select><option><svg></svg></option></select>
+#errors
+43: Stray “svg” start tag.
+50: Stray end tag “svg”
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <select>
+|       <option>
+
+#data
+<!DOCTYPE html><body><table><svg></svg></table>
+#errors
+34: Start tag “svg” seen in “table”.
+41: Stray end tag “svg”.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|     <table>
+
+#data
+<!DOCTYPE html><body><table><svg><g>foo</g></svg></table>
+#errors
+34: Start tag “svg” seen in “table”.
+46: Stray end tag “g”.
+53: Stray end tag “svg”.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       <svg g>
+|         "foo"
+|     <table>
+
+#data
+<!DOCTYPE html><body><table><svg><g>foo</g><g>bar</g></svg></table>
+#errors
+34: Start tag “svg” seen in “table”.
+46: Stray end tag “g”.
+58: Stray end tag “g”.
+65: Stray end tag “svg”.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       <svg g>
+|         "foo"
+|       <svg g>
+|         "bar"
+|     <table>
+
+#data
+<!DOCTYPE html><body><table><tbody><svg><g>foo</g><g>bar</g></svg></tbody></table>
+#errors
+41: Start tag “svg” seen in “table”.
+53: Stray end tag “g”.
+65: Stray end tag “g”.
+72: Stray end tag “svg”.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       <svg g>
+|         "foo"
+|       <svg g>
+|         "bar"
+|     <table>
+|       <tbody>
+
+#data
+<!DOCTYPE html><body><table><tbody><tr><svg><g>foo</g><g>bar</g></svg></tr></tbody></table>
+#errors
+45: Start tag “svg” seen in “table”.
+57: Stray end tag “g”.
+69: Stray end tag “g”.
+76: Stray end tag “svg”.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       <svg g>
+|         "foo"
+|       <svg g>
+|         "bar"
+|     <table>
+|       <tbody>
+|         <tr>
+
+#data
+<!DOCTYPE html><body><table><tbody><tr><td><svg><g>foo</g><g>bar</g></svg></td></tr></tbody></table>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             <svg svg>
+|               <svg g>
+|                 "foo"
+|               <svg g>
+|                 "bar"
+
+#data
+<!DOCTYPE html><body><table><tbody><tr><td><svg><g>foo</g><g>bar</g></svg><p>baz</td></tr></tbody></table>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             <svg svg>
+|               <svg g>
+|                 "foo"
+|               <svg g>
+|                 "bar"
+|             <p>
+|               "baz"
+
+#data
+<!DOCTYPE html><body><table><caption><svg><g>foo</g><g>bar</g></svg><p>baz</caption></table>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <caption>
+|         <svg svg>
+|           <svg g>
+|             "foo"
+|           <svg g>
+|             "bar"
+|         <p>
+|           "baz"
+
+#data
+<!DOCTYPE html><body><table><caption><svg><g>foo</g><g>bar</g><p>baz</table><p>quux
+#errors
+70: HTML start tag “p” in a foreign namespace context.
+81: “table” closed but “caption” was still open.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <caption>
+|         <svg svg>
+|           <svg g>
+|             "foo"
+|           <svg g>
+|             "bar"
+|         <p>
+|           "baz"
+|     <p>
+|       "quux"
+
+#data
+<!DOCTYPE html><body><table><caption><svg><g>foo</g><g>bar</g>baz</table><p>quux
+#errors
+78: “table” closed but “caption” was still open.
+78: Unclosed elements on stack.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <caption>
+|         <svg svg>
+|           <svg g>
+|             "foo"
+|           <svg g>
+|             "bar"
+|           "baz"
+|     <p>
+|       "quux"
+
+#data
+<!DOCTYPE html><body><table><colgroup><svg><g>foo</g><g>bar</g><p>baz</table><p>quux
+#errors
+44: Start tag “svg” seen in “table”.
+56: Stray end tag “g”.
+68: Stray end tag “g”.
+71: HTML start tag “p” in a foreign namespace context.
+71: Start tag “p” seen in “table”.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       <svg g>
+|         "foo"
+|       <svg g>
+|         "bar"
+|     <p>
+|       "baz"
+|     <table>
+|       <colgroup>
+|     <p>
+|       "quux"
+
+#data
+<!DOCTYPE html><body><table><tr><td><select><svg><g>foo</g><g>bar</g><p>baz</table><p>quux
+#errors
+50: Stray “svg” start tag.
+54: Stray “g” start tag.
+62: Stray end tag “g”
+66: Stray “g” start tag.
+74: Stray end tag “g”
+77: Stray “p” start tag.
+88: “table” end tag with “select” open.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             <select>
+|               "foobarbaz"
+|     <p>
+|       "quux"
+
+#data
+<!DOCTYPE html><body><table><select><svg><g>foo</g><g>bar</g><p>baz</table><p>quux
+#errors
+36: Start tag “select” seen in “table”.
+42: Stray “svg” start tag.
+46: Stray “g” start tag.
+54: Stray end tag “g”
+58: Stray “g” start tag.
+66: Stray end tag “g”
+69: Stray “p” start tag.
+80: “table” end tag with “select” open.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <select>
+|       "foobarbaz"
+|     <table>
+|     <p>
+|       "quux"
+
+#data
+<!DOCTYPE html><body></body></html><svg><g>foo</g><g>bar</g><p>baz
+#errors
+41: Stray “svg” start tag.
+68: HTML start tag “p” in a foreign namespace context.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       <svg g>
+|         "foo"
+|       <svg g>
+|         "bar"
+|     <p>
+|       "baz"
+
+#data
+<!DOCTYPE html><body></body><svg><g>foo</g><g>bar</g><p>baz
+#errors
+34: Stray “svg” start tag.
+61: HTML start tag “p” in a foreign namespace context.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       <svg g>
+|         "foo"
+|       <svg g>
+|         "bar"
+|     <p>
+|       "baz"
+
+#data
+<!DOCTYPE html><frameset><svg><g></g><g></g><p><span>
+#errors
+31: Stray “svg” start tag.
+35: Stray “g” start tag.
+40: Stray end tag “g”
+44: Stray “g” start tag.
+49: Stray end tag “g”
+52: Stray “p” start tag.
+58: Stray “span” start tag.
+58: End of file seen and there were open elements.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <frameset>
+
+#data
+<!DOCTYPE html><frameset></frameset><svg><g></g><g></g><p><span>
+#errors
+42: Stray “svg” start tag.
+46: Stray “g” start tag.
+51: Stray end tag “g”
+55: Stray “g” start tag.
+60: Stray end tag “g”
+63: Stray “p” start tag.
+69: Stray “span” start tag.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <frameset>
+
+#data
+<!DOCTYPE html><body xlink:href=foo><svg xlink:href=foo></svg>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     xlink:href="foo"
+|     <svg svg>
+|       xlink href="foo"
+
+#data
+<!DOCTYPE html><body xlink:href=foo xml:lang=en><svg><g xml:lang=en xlink:href=foo></g></svg>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     xlink:href="foo"
+|     xml:lang="en"
+|     <svg svg>
+|       <svg g>
+|         xlink href="foo"
+|         xml lang="en"
+
+#data
+<!DOCTYPE html><body xlink:href=foo xml:lang=en><svg><g xml:lang=en xlink:href=foo /></svg>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     xlink:href="foo"
+|     xml:lang="en"
+|     <svg svg>
+|       <svg g>
+|         xlink href="foo"
+|         xml lang="en"
+
+#data
+<!DOCTYPE html><body xlink:href=foo xml:lang=en><svg><g xml:lang=en xlink:href=foo />bar</svg>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     xlink:href="foo"
+|     xml:lang="en"
+|     <svg svg>
+|       <svg g>
+|         xlink href="foo"
+|         xml lang="en"
+|       "bar"
+
+#data
+<svg></path>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+
+#data
+<div><svg></div>a
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       <svg svg>
+|     "a"
+
+#data
+<div><svg><path></div>a
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       <svg svg>
+|         <svg path>
+|     "a"
+
+#data
+<div><svg><path></svg><path>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       <svg svg>
+|         <svg path>
+|       <path>
+
+#data
+<div><svg><path><foreignObject><math></div>a
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       <svg svg>
+|         <svg path>
+|           <svg foreignObject>
+|             <math math>
+|               "a"
+
+#data
+<div><svg><path><foreignObject><p></div>a
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       <svg svg>
+|         <svg path>
+|           <svg foreignObject>
+|             <p>
+|               "a"
+
+#data
+<!DOCTYPE html><svg><desc><div><svg><ul>a
+#errors
+40: HTML start tag “ul” in a foreign namespace context.
+41: End of file in a foreign namespace context.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       <svg desc>
+|         <div>
+|           <svg svg>
+|           <ul>
+|             "a"
+
+#data
+<!DOCTYPE html><svg><desc><svg><ul>a
+#errors
+35: HTML start tag “ul” in a foreign namespace context.
+36: End of file in a foreign namespace context.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       <svg desc>
+|         <svg svg>
+|         <ul>
+|           "a"
+
+#data
+<!DOCTYPE html><p><svg><desc><p>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <svg svg>
+|         <svg desc>
+|           <p>
+
+#data
+<!DOCTYPE html><p><svg><title><p>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <svg svg>
+|         <svg title>
+|           <p>
+
+#data
+<div><svg><path><foreignObject><p></foreignObject><p>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       <svg svg>
+|         <svg path>
+|           <svg foreignObject>
+|             <p>
+|             <p>
+
+#data
+<math><mi><div><object><div><span></span></div></object></div></mi><mi>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       <math mi>
+|         <div>
+|           <object>
+|             <div>
+|               <span>
+|       <math mi>
+
+#data
+<math><mi><svg><foreignObject><div><div></div></div></foreignObject></svg></mi><mi>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       <math mi>
+|         <svg svg>
+|           <svg foreignObject>
+|             <div>
+|               <div>
+|       <math mi>
+
+#data
+<svg><script></script><path>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       <svg script>
+|       <svg path>
+
+#data
+<table><svg></svg><tr>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|     <table>
+|       <tbody>
+|         <tr>
+
+#data
+<math><mi><mglyph>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       <math mi>
+|         <math mglyph>
+
+#data
+<math><mi><malignmark>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       <math mi>
+|         <math malignmark>
+
+#data
+<math><mo><mglyph>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       <math mo>
+|         <math mglyph>
+
+#data
+<math><mo><malignmark>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       <math mo>
+|         <math malignmark>
+
+#data
+<math><mn><mglyph>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       <math mn>
+|         <math mglyph>
+
+#data
+<math><mn><malignmark>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       <math mn>
+|         <math malignmark>
+
+#data
+<math><ms><mglyph>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       <math ms>
+|         <math mglyph>
+
+#data
+<math><ms><malignmark>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       <math ms>
+|         <math malignmark>
+
+#data
+<math><mtext><mglyph>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       <math mtext>
+|         <math mglyph>
+
+#data
+<math><mtext><malignmark>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       <math mtext>
+|         <math malignmark>
+
+#data
+<math><annotation-xml><svg></svg></annotation-xml><mi>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       <math annotation-xml>
+|         <svg svg>
+|       <math mi>
+
+#data
+<math><annotation-xml><svg><foreignObject><div><math><mi></mi></math><span></span></div></foreignObject><path></path></svg></annotation-xml><mi>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       <math annotation-xml>
+|         <svg svg>
+|           <svg foreignObject>
+|             <div>
+|               <math math>
+|                 <math mi>
+|               <span>
+|           <svg path>
+|       <math mi>
+
+#data
+<math><annotation-xml><svg><foreignObject><math><mi><svg></svg></mi><mo></mo></math><span></span></foreignObject><path></path></svg></annotation-xml><mi>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       <math annotation-xml>
+|         <svg svg>
+|           <svg foreignObject>
+|             <math math>
+|               <math mi>
+|                 <svg svg>
+|               <math mo>
+|             <span>
+|           <svg path>
+|       <math mi>
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests11.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests11.dat
new file mode 100644
index 00000000..638cde47
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests11.dat
@@ -0,0 +1,482 @@
+#data
+<!DOCTYPE html><body><svg attributeName='' attributeType='' baseFrequency='' baseProfile='' calcMode='' clipPathUnits='' contentScriptType='' contentStyleType='' diffuseConstant='' edgeMode='' externalResourcesRequired='' filterRes='' filterUnits='' glyphRef='' gradientTransform='' gradientUnits='' kernelMatrix='' kernelUnitLength='' keyPoints='' keySplines='' keyTimes='' lengthAdjust='' limitingConeAngle='' markerHeight='' markerUnits='' markerWidth='' maskContentUnits='' maskUnits='' numOctaves='' pathLength='' patternContentUnits='' patternTransform='' patternUnits='' pointsAtX='' pointsAtY='' pointsAtZ='' preserveAlpha='' preserveAspectRatio='' primitiveUnits='' refX='' refY='' repeatCount='' repeatDur='' requiredExtensions='' requiredFeatures='' specularConstant='' specularExponent='' spreadMethod='' startOffset='' stdDeviation='' stitchTiles='' surfaceScale='' systemLanguage='' tableValues='' targetX='' targetY='' textLength='' viewBox='' viewTarget='' xChannelSelector='' yChannelSelector='' zoomAndPan=''></svg>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       attributeName=""
+|       attributeType=""
+|       baseFrequency=""
+|       baseProfile=""
+|       calcMode=""
+|       clipPathUnits=""
+|       contentScriptType=""
+|       contentStyleType=""
+|       diffuseConstant=""
+|       edgeMode=""
+|       externalResourcesRequired=""
+|       filterRes=""
+|       filterUnits=""
+|       glyphRef=""
+|       gradientTransform=""
+|       gradientUnits=""
+|       kernelMatrix=""
+|       kernelUnitLength=""
+|       keyPoints=""
+|       keySplines=""
+|       keyTimes=""
+|       lengthAdjust=""
+|       limitingConeAngle=""
+|       markerHeight=""
+|       markerUnits=""
+|       markerWidth=""
+|       maskContentUnits=""
+|       maskUnits=""
+|       numOctaves=""
+|       pathLength=""
+|       patternContentUnits=""
+|       patternTransform=""
+|       patternUnits=""
+|       pointsAtX=""
+|       pointsAtY=""
+|       pointsAtZ=""
+|       preserveAlpha=""
+|       preserveAspectRatio=""
+|       primitiveUnits=""
+|       refX=""
+|       refY=""
+|       repeatCount=""
+|       repeatDur=""
+|       requiredExtensions=""
+|       requiredFeatures=""
+|       specularConstant=""
+|       specularExponent=""
+|       spreadMethod=""
+|       startOffset=""
+|       stdDeviation=""
+|       stitchTiles=""
+|       surfaceScale=""
+|       systemLanguage=""
+|       tableValues=""
+|       targetX=""
+|       targetY=""
+|       textLength=""
+|       viewBox=""
+|       viewTarget=""
+|       xChannelSelector=""
+|       yChannelSelector=""
+|       zoomAndPan=""
+
+#data
+<!DOCTYPE html><BODY><SVG ATTRIBUTENAME='' ATTRIBUTETYPE='' BASEFREQUENCY='' BASEPROFILE='' CALCMODE='' CLIPPATHUNITS='' CONTENTSCRIPTTYPE='' CONTENTSTYLETYPE='' DIFFUSECONSTANT='' EDGEMODE='' EXTERNALRESOURCESREQUIRED='' FILTERRES='' FILTERUNITS='' GLYPHREF='' GRADIENTTRANSFORM='' GRADIENTUNITS='' KERNELMATRIX='' KERNELUNITLENGTH='' KEYPOINTS='' KEYSPLINES='' KEYTIMES='' LENGTHADJUST='' LIMITINGCONEANGLE='' MARKERHEIGHT='' MARKERUNITS='' MARKERWIDTH='' MASKCONTENTUNITS='' MASKUNITS='' NUMOCTAVES='' PATHLENGTH='' PATTERNCONTENTUNITS='' PATTERNTRANSFORM='' PATTERNUNITS='' POINTSATX='' POINTSATY='' POINTSATZ='' PRESERVEALPHA='' PRESERVEASPECTRATIO='' PRIMITIVEUNITS='' REFX='' REFY='' REPEATCOUNT='' REPEATDUR='' REQUIREDEXTENSIONS='' REQUIREDFEATURES='' SPECULARCONSTANT='' SPECULAREXPONENT='' SPREADMETHOD='' STARTOFFSET='' STDDEVIATION='' STITCHTILES='' SURFACESCALE='' SYSTEMLANGUAGE='' TABLEVALUES='' TARGETX='' TARGETY='' TEXTLENGTH='' VIEWBOX='' VIEWTARGET='' XCHANNELSELECTOR='' YCHANNELSELECTOR='' ZOOMANDPAN=''></SVG>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       attributeName=""
+|       attributeType=""
+|       baseFrequency=""
+|       baseProfile=""
+|       calcMode=""
+|       clipPathUnits=""
+|       contentScriptType=""
+|       contentStyleType=""
+|       diffuseConstant=""
+|       edgeMode=""
+|       externalResourcesRequired=""
+|       filterRes=""
+|       filterUnits=""
+|       glyphRef=""
+|       gradientTransform=""
+|       gradientUnits=""
+|       kernelMatrix=""
+|       kernelUnitLength=""
+|       keyPoints=""
+|       keySplines=""
+|       keyTimes=""
+|       lengthAdjust=""
+|       limitingConeAngle=""
+|       markerHeight=""
+|       markerUnits=""
+|       markerWidth=""
+|       maskContentUnits=""
+|       maskUnits=""
+|       numOctaves=""
+|       pathLength=""
+|       patternContentUnits=""
+|       patternTransform=""
+|       patternUnits=""
+|       pointsAtX=""
+|       pointsAtY=""
+|       pointsAtZ=""
+|       preserveAlpha=""
+|       preserveAspectRatio=""
+|       primitiveUnits=""
+|       refX=""
+|       refY=""
+|       repeatCount=""
+|       repeatDur=""
+|       requiredExtensions=""
+|       requiredFeatures=""
+|       specularConstant=""
+|       specularExponent=""
+|       spreadMethod=""
+|       startOffset=""
+|       stdDeviation=""
+|       stitchTiles=""
+|       surfaceScale=""
+|       systemLanguage=""
+|       tableValues=""
+|       targetX=""
+|       targetY=""
+|       textLength=""
+|       viewBox=""
+|       viewTarget=""
+|       xChannelSelector=""
+|       yChannelSelector=""
+|       zoomAndPan=""
+
+#data
+<!DOCTYPE html><body><svg attributename='' attributetype='' basefrequency='' baseprofile='' calcmode='' clippathunits='' contentscripttype='' contentstyletype='' diffuseconstant='' edgemode='' externalresourcesrequired='' filterres='' filterunits='' glyphref='' gradienttransform='' gradientunits='' kernelmatrix='' kernelunitlength='' keypoints='' keysplines='' keytimes='' lengthadjust='' limitingconeangle='' markerheight='' markerunits='' markerwidth='' maskcontentunits='' maskunits='' numoctaves='' pathlength='' patterncontentunits='' patterntransform='' patternunits='' pointsatx='' pointsaty='' pointsatz='' preservealpha='' preserveaspectratio='' primitiveunits='' refx='' refy='' repeatcount='' repeatdur='' requiredextensions='' requiredfeatures='' specularconstant='' specularexponent='' spreadmethod='' startoffset='' stddeviation='' stitchtiles='' surfacescale='' systemlanguage='' tablevalues='' targetx='' targety='' textlength='' viewbox='' viewtarget='' xchannelselector='' ychannelselector='' zoomandpan=''></svg>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       attributeName=""
+|       attributeType=""
+|       baseFrequency=""
+|       baseProfile=""
+|       calcMode=""
+|       clipPathUnits=""
+|       contentScriptType=""
+|       contentStyleType=""
+|       diffuseConstant=""
+|       edgeMode=""
+|       externalResourcesRequired=""
+|       filterRes=""
+|       filterUnits=""
+|       glyphRef=""
+|       gradientTransform=""
+|       gradientUnits=""
+|       kernelMatrix=""
+|       kernelUnitLength=""
+|       keyPoints=""
+|       keySplines=""
+|       keyTimes=""
+|       lengthAdjust=""
+|       limitingConeAngle=""
+|       markerHeight=""
+|       markerUnits=""
+|       markerWidth=""
+|       maskContentUnits=""
+|       maskUnits=""
+|       numOctaves=""
+|       pathLength=""
+|       patternContentUnits=""
+|       patternTransform=""
+|       patternUnits=""
+|       pointsAtX=""
+|       pointsAtY=""
+|       pointsAtZ=""
+|       preserveAlpha=""
+|       preserveAspectRatio=""
+|       primitiveUnits=""
+|       refX=""
+|       refY=""
+|       repeatCount=""
+|       repeatDur=""
+|       requiredExtensions=""
+|       requiredFeatures=""
+|       specularConstant=""
+|       specularExponent=""
+|       spreadMethod=""
+|       startOffset=""
+|       stdDeviation=""
+|       stitchTiles=""
+|       surfaceScale=""
+|       systemLanguage=""
+|       tableValues=""
+|       targetX=""
+|       targetY=""
+|       textLength=""
+|       viewBox=""
+|       viewTarget=""
+|       xChannelSelector=""
+|       yChannelSelector=""
+|       zoomAndPan=""
+
+#data
+<!DOCTYPE html><body><math attributeName='' attributeType='' baseFrequency='' baseProfile='' calcMode='' clipPathUnits='' contentScriptType='' contentStyleType='' diffuseConstant='' edgeMode='' externalResourcesRequired='' filterRes='' filterUnits='' glyphRef='' gradientTransform='' gradientUnits='' kernelMatrix='' kernelUnitLength='' keyPoints='' keySplines='' keyTimes='' lengthAdjust='' limitingConeAngle='' markerHeight='' markerUnits='' markerWidth='' maskContentUnits='' maskUnits='' numOctaves='' pathLength='' patternContentUnits='' patternTransform='' patternUnits='' pointsAtX='' pointsAtY='' pointsAtZ='' preserveAlpha='' preserveAspectRatio='' primitiveUnits='' refX='' refY='' repeatCount='' repeatDur='' requiredExtensions='' requiredFeatures='' specularConstant='' specularExponent='' spreadMethod='' startOffset='' stdDeviation='' stitchTiles='' surfaceScale='' systemLanguage='' tableValues='' targetX='' targetY='' textLength='' viewBox='' viewTarget='' xChannelSelector='' yChannelSelector='' zoomAndPan=''></math>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       attributename=""
+|       attributetype=""
+|       basefrequency=""
+|       baseprofile=""
+|       calcmode=""
+|       clippathunits=""
+|       contentscripttype=""
+|       contentstyletype=""
+|       diffuseconstant=""
+|       edgemode=""
+|       externalresourcesrequired=""
+|       filterres=""
+|       filterunits=""
+|       glyphref=""
+|       gradienttransform=""
+|       gradientunits=""
+|       kernelmatrix=""
+|       kernelunitlength=""
+|       keypoints=""
+|       keysplines=""
+|       keytimes=""
+|       lengthadjust=""
+|       limitingconeangle=""
+|       markerheight=""
+|       markerunits=""
+|       markerwidth=""
+|       maskcontentunits=""
+|       maskunits=""
+|       numoctaves=""
+|       pathlength=""
+|       patterncontentunits=""
+|       patterntransform=""
+|       patternunits=""
+|       pointsatx=""
+|       pointsaty=""
+|       pointsatz=""
+|       preservealpha=""
+|       preserveaspectratio=""
+|       primitiveunits=""
+|       refx=""
+|       refy=""
+|       repeatcount=""
+|       repeatdur=""
+|       requiredextensions=""
+|       requiredfeatures=""
+|       specularconstant=""
+|       specularexponent=""
+|       spreadmethod=""
+|       startoffset=""
+|       stddeviation=""
+|       stitchtiles=""
+|       surfacescale=""
+|       systemlanguage=""
+|       tablevalues=""
+|       targetx=""
+|       targety=""
+|       textlength=""
+|       viewbox=""
+|       viewtarget=""
+|       xchannelselector=""
+|       ychannelselector=""
+|       zoomandpan=""
+
+#data
+<!DOCTYPE html><body><svg><altGlyph /><altGlyphDef /><altGlyphItem /><animateColor /><animateMotion /><animateTransform /><clipPath /><feBlend /><feColorMatrix /><feComponentTransfer /><feComposite /><feConvolveMatrix /><feDiffuseLighting /><feDisplacementMap /><feDistantLight /><feFlood /><feFuncA /><feFuncB /><feFuncG /><feFuncR /><feGaussianBlur /><feImage /><feMerge /><feMergeNode /><feMorphology /><feOffset /><fePointLight /><feSpecularLighting /><feSpotLight /><feTile /><feTurbulence /><foreignObject /><glyphRef /><linearGradient /><radialGradient /><textPath /></svg>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       <svg altGlyph>
+|       <svg altGlyphDef>
+|       <svg altGlyphItem>
+|       <svg animateColor>
+|       <svg animateMotion>
+|       <svg animateTransform>
+|       <svg clipPath>
+|       <svg feBlend>
+|       <svg feColorMatrix>
+|       <svg feComponentTransfer>
+|       <svg feComposite>
+|       <svg feConvolveMatrix>
+|       <svg feDiffuseLighting>
+|       <svg feDisplacementMap>
+|       <svg feDistantLight>
+|       <svg feFlood>
+|       <svg feFuncA>
+|       <svg feFuncB>
+|       <svg feFuncG>
+|       <svg feFuncR>
+|       <svg feGaussianBlur>
+|       <svg feImage>
+|       <svg feMerge>
+|       <svg feMergeNode>
+|       <svg feMorphology>
+|       <svg feOffset>
+|       <svg fePointLight>
+|       <svg feSpecularLighting>
+|       <svg feSpotLight>
+|       <svg feTile>
+|       <svg feTurbulence>
+|       <svg foreignObject>
+|       <svg glyphRef>
+|       <svg linearGradient>
+|       <svg radialGradient>
+|       <svg textPath>
+
+#data
+<!DOCTYPE html><body><svg><altglyph /><altglyphdef /><altglyphitem /><animatecolor /><animatemotion /><animatetransform /><clippath /><feblend /><fecolormatrix /><fecomponenttransfer /><fecomposite /><feconvolvematrix /><fediffuselighting /><fedisplacementmap /><fedistantlight /><feflood /><fefunca /><fefuncb /><fefuncg /><fefuncr /><fegaussianblur /><feimage /><femerge /><femergenode /><femorphology /><feoffset /><fepointlight /><fespecularlighting /><fespotlight /><fetile /><feturbulence /><foreignobject /><glyphref /><lineargradient /><radialgradient /><textpath /></svg>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       <svg altGlyph>
+|       <svg altGlyphDef>
+|       <svg altGlyphItem>
+|       <svg animateColor>
+|       <svg animateMotion>
+|       <svg animateTransform>
+|       <svg clipPath>
+|       <svg feBlend>
+|       <svg feColorMatrix>
+|       <svg feComponentTransfer>
+|       <svg feComposite>
+|       <svg feConvolveMatrix>
+|       <svg feDiffuseLighting>
+|       <svg feDisplacementMap>
+|       <svg feDistantLight>
+|       <svg feFlood>
+|       <svg feFuncA>
+|       <svg feFuncB>
+|       <svg feFuncG>
+|       <svg feFuncR>
+|       <svg feGaussianBlur>
+|       <svg feImage>
+|       <svg feMerge>
+|       <svg feMergeNode>
+|       <svg feMorphology>
+|       <svg feOffset>
+|       <svg fePointLight>
+|       <svg feSpecularLighting>
+|       <svg feSpotLight>
+|       <svg feTile>
+|       <svg feTurbulence>
+|       <svg foreignObject>
+|       <svg glyphRef>
+|       <svg linearGradient>
+|       <svg radialGradient>
+|       <svg textPath>
+
+#data
+<!DOCTYPE html><BODY><SVG><ALTGLYPH /><ALTGLYPHDEF /><ALTGLYPHITEM /><ANIMATECOLOR /><ANIMATEMOTION /><ANIMATETRANSFORM /><CLIPPATH /><FEBLEND /><FECOLORMATRIX /><FECOMPONENTTRANSFER /><FECOMPOSITE /><FECONVOLVEMATRIX /><FEDIFFUSELIGHTING /><FEDISPLACEMENTMAP /><FEDISTANTLIGHT /><FEFLOOD /><FEFUNCA /><FEFUNCB /><FEFUNCG /><FEFUNCR /><FEGAUSSIANBLUR /><FEIMAGE /><FEMERGE /><FEMERGENODE /><FEMORPHOLOGY /><FEOFFSET /><FEPOINTLIGHT /><FESPECULARLIGHTING /><FESPOTLIGHT /><FETILE /><FETURBULENCE /><FOREIGNOBJECT /><GLYPHREF /><LINEARGRADIENT /><RADIALGRADIENT /><TEXTPATH /></SVG>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       <svg altGlyph>
+|       <svg altGlyphDef>
+|       <svg altGlyphItem>
+|       <svg animateColor>
+|       <svg animateMotion>
+|       <svg animateTransform>
+|       <svg clipPath>
+|       <svg feBlend>
+|       <svg feColorMatrix>
+|       <svg feComponentTransfer>
+|       <svg feComposite>
+|       <svg feConvolveMatrix>
+|       <svg feDiffuseLighting>
+|       <svg feDisplacementMap>
+|       <svg feDistantLight>
+|       <svg feFlood>
+|       <svg feFuncA>
+|       <svg feFuncB>
+|       <svg feFuncG>
+|       <svg feFuncR>
+|       <svg feGaussianBlur>
+|       <svg feImage>
+|       <svg feMerge>
+|       <svg feMergeNode>
+|       <svg feMorphology>
+|       <svg feOffset>
+|       <svg fePointLight>
+|       <svg feSpecularLighting>
+|       <svg feSpotLight>
+|       <svg feTile>
+|       <svg feTurbulence>
+|       <svg foreignObject>
+|       <svg glyphRef>
+|       <svg linearGradient>
+|       <svg radialGradient>
+|       <svg textPath>
+
+#data
+<!DOCTYPE html><body><math><altGlyph /><altGlyphDef /><altGlyphItem /><animateColor /><animateMotion /><animateTransform /><clipPath /><feBlend /><feColorMatrix /><feComponentTransfer /><feComposite /><feConvolveMatrix /><feDiffuseLighting /><feDisplacementMap /><feDistantLight /><feFlood /><feFuncA /><feFuncB /><feFuncG /><feFuncR /><feGaussianBlur /><feImage /><feMerge /><feMergeNode /><feMorphology /><feOffset /><fePointLight /><feSpecularLighting /><feSpotLight /><feTile /><feTurbulence /><foreignObject /><glyphRef /><linearGradient /><radialGradient /><textPath /></math>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       <math altglyph>
+|       <math altglyphdef>
+|       <math altglyphitem>
+|       <math animatecolor>
+|       <math animatemotion>
+|       <math animatetransform>
+|       <math clippath>
+|       <math feblend>
+|       <math fecolormatrix>
+|       <math fecomponenttransfer>
+|       <math fecomposite>
+|       <math feconvolvematrix>
+|       <math fediffuselighting>
+|       <math fedisplacementmap>
+|       <math fedistantlight>
+|       <math feflood>
+|       <math fefunca>
+|       <math fefuncb>
+|       <math fefuncg>
+|       <math fefuncr>
+|       <math fegaussianblur>
+|       <math feimage>
+|       <math femerge>
+|       <math femergenode>
+|       <math femorphology>
+|       <math feoffset>
+|       <math fepointlight>
+|       <math fespecularlighting>
+|       <math fespotlight>
+|       <math fetile>
+|       <math feturbulence>
+|       <math foreignobject>
+|       <math glyphref>
+|       <math lineargradient>
+|       <math radialgradient>
+|       <math textpath>
+
+#data
+<!DOCTYPE html><body><svg><solidColor /></svg>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       <svg solidcolor>
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests12.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests12.dat
new file mode 100644
index 00000000..63107d27
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests12.dat
@@ -0,0 +1,62 @@
+#data
+<!DOCTYPE html><body><p>foo<math><mtext><i>baz</i></mtext><annotation-xml><svg><desc><b>eggs</b></desc><g><foreignObject><P>spam<TABLE><tr><td><img></td></table></foreignObject></g><g>quux</g></svg></annotation-xml></math>bar
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       "foo"
+|       <math math>
+|         <math mtext>
+|           <i>
+|             "baz"
+|         <math annotation-xml>
+|           <svg svg>
+|             <svg desc>
+|               <b>
+|                 "eggs"
+|             <svg g>
+|               <svg foreignObject>
+|                 <p>
+|                   "spam"
+|                 <table>
+|                   <tbody>
+|                     <tr>
+|                       <td>
+|                         <img>
+|             <svg g>
+|               "quux"
+|       "bar"
+
+#data
+<!DOCTYPE html><body>foo<math><mtext><i>baz</i></mtext><annotation-xml><svg><desc><b>eggs</b></desc><g><foreignObject><P>spam<TABLE><tr><td><img></td></table></foreignObject></g><g>quux</g></svg></annotation-xml></math>bar
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     "foo"
+|     <math math>
+|       <math mtext>
+|         <i>
+|           "baz"
+|       <math annotation-xml>
+|         <svg svg>
+|           <svg desc>
+|             <b>
+|               "eggs"
+|           <svg g>
+|             <svg foreignObject>
+|               <p>
+|                 "spam"
+|               <table>
+|                 <tbody>
+|                   <tr>
+|                     <td>
+|                       <img>
+|           <svg g>
+|             "quux"
+|     "bar"
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests14.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests14.dat
new file mode 100644
index 00000000..b8713f88
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests14.dat
@@ -0,0 +1,74 @@
+#data
+<!DOCTYPE html><html><body><xyz:abc></xyz:abc>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <xyz:abc>
+
+#data
+<!DOCTYPE html><html><body><xyz:abc></xyz:abc><span></span>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <xyz:abc>
+|     <span>
+
+#data
+<!DOCTYPE html><html><html abc:def=gh><xyz:abc></xyz:abc>
+#errors
+15: Unexpected start tag html
+#document
+| <!DOCTYPE html>
+| <html>
+|   abc:def="gh"
+|   <head>
+|   <body>
+|     <xyz:abc>
+
+#data
+<!DOCTYPE html><html xml:lang=bar><html xml:lang=foo>
+#errors
+15: Unexpected start tag html
+#document
+| <!DOCTYPE html>
+| <html>
+|   xml:lang="bar"
+|   <head>
+|   <body>
+
+#data
+<!DOCTYPE html><html 123=456>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   123="456"
+|   <head>
+|   <body>
+
+#data
+<!DOCTYPE html><html 123=456><html 789=012>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   123="456"
+|   789="012"
+|   <head>
+|   <body>
+
+#data
+<!DOCTYPE html><html><body 789=012>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     789="012"
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests15.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests15.dat
new file mode 100644
index 00000000..6ce1c0d1
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests15.dat
@@ -0,0 +1,208 @@
+#data
+<!DOCTYPE html><p><b><i><u></p> <p>X
+#errors
+Line: 1 Col: 31 Unexpected end tag (p). Ignored.
+Line: 1 Col: 36 Expected closing tag. Unexpected end of file.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <b>
+|         <i>
+|           <u>
+|     <b>
+|       <i>
+|         <u>
+|           " "
+|           <p>
+|             "X"
+
+#data
+<p><b><i><u></p>
+<p>X
+#errors
+Line: 1 Col: 3 Unexpected start tag (p). Expected DOCTYPE.
+Line: 1 Col: 16 Unexpected end tag (p). Ignored.
+Line: 2 Col: 4 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <b>
+|         <i>
+|           <u>
+|     <b>
+|       <i>
+|         <u>
+|           "
+"
+|           <p>
+|             "X"
+
+#data
+<!doctype html></html> <head>
+#errors
+Line: 1 Col: 22 Unexpected end tag (html) after the (implied) root element.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     " "
+
+#data
+<!doctype html></body><meta>
+#errors
+Line: 1 Col: 22 Unexpected end tag (body) after the (implied) root element.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <meta>
+
+#data
+<html></html><!-- foo -->
+#errors
+Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
+Line: 1 Col: 13 Unexpected end tag (html) after the (implied) root element.
+#document
+| <html>
+|   <head>
+|   <body>
+| <!--  foo  -->
+
+#data
+<!doctype html></body><title>X</title>
+#errors
+Line: 1 Col: 22 Unexpected end tag (body) after the (implied) root element.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <title>
+|       "X"
+
+#data
+<!doctype html><table> X<meta></table>
+#errors
+Line: 1 Col: 24 Unexpected non-space characters in table context caused voodoo mode.
+Line: 1 Col: 30 Unexpected start tag (meta) in table context caused voodoo mode.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     " X"
+|     <meta>
+|     <table>
+
+#data
+<!doctype html><table> x</table>
+#errors
+Line: 1 Col: 24 Unexpected non-space characters in table context caused voodoo mode.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     " x"
+|     <table>
+
+#data
+<!doctype html><table> x </table>
+#errors
+Line: 1 Col: 25 Unexpected non-space characters in table context caused voodoo mode.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     " x "
+|     <table>
+
+#data
+<!doctype html><table><tr> x</table>
+#errors
+Line: 1 Col: 28 Unexpected non-space characters in table context caused voodoo mode.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     " x"
+|     <table>
+|       <tbody>
+|         <tr>
+
+#data
+<!doctype html><table>X<style> <tr>x </style> </table>
+#errors
+Line: 1 Col: 23 Unexpected non-space characters in table context caused voodoo mode.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     "X"
+|     <table>
+|       <style>
+|         " <tr>x "
+|       " "
+
+#data
+<!doctype html><div><table><a>foo</a> <tr><td>bar</td> </tr></table></div>
+#errors
+Line: 1 Col: 30 Unexpected start tag (a) in table context caused voodoo mode.
+Line: 1 Col: 37 Unexpected end tag (a) in table context caused voodoo mode.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       <a>
+|         "foo"
+|       <table>
+|         " "
+|         <tbody>
+|           <tr>
+|             <td>
+|               "bar"
+|             " "
+
+#data
+<frame></frame></frame><frameset><frame><frameset><frame></frameset><noframes></frameset><noframes>
+#errors
+6: Start tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
+13: Stray start tag “frame”.
+21: Stray end tag “frame”.
+29: Stray end tag “frame”.
+39: “frameset” start tag after “body” already open.
+105: End of file seen inside an [R]CDATA element.
+105: End of file seen and there were open elements.
+XXX: These errors are wrong, please fix me!
+#document
+| <html>
+|   <head>
+|   <frameset>
+|     <frame>
+|     <frameset>
+|       <frame>
+|     <noframes>
+|       "</frameset><noframes>"
+
+#data
+<!DOCTYPE html><object></html>
+#errors
+1: Expected closing tag. Unexpected end of file
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <object>
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests16.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests16.dat
new file mode 100644
index 00000000..c8ef66f0
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests16.dat
@@ -0,0 +1,2299 @@
+#data
+<!doctype html><script>
+#errors
+Line: 1 Col: 23 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|   <body>
+
+#data
+<!doctype html><script>a
+#errors
+Line: 1 Col: 24 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "a"
+|   <body>
+
+#data
+<!doctype html><script><
+#errors
+Line: 1 Col: 24 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<"
+|   <body>
+
+#data
+<!doctype html><script></
+#errors
+Line: 1 Col: 25 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "</"
+|   <body>
+
+#data
+<!doctype html><script></S
+#errors
+Line: 1 Col: 26 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "</S"
+|   <body>
+
+#data
+<!doctype html><script></SC
+#errors
+Line: 1 Col: 27 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "</SC"
+|   <body>
+
+#data
+<!doctype html><script></SCR
+#errors
+Line: 1 Col: 28 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "</SCR"
+|   <body>
+
+#data
+<!doctype html><script></SCRI
+#errors
+Line: 1 Col: 29 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "</SCRI"
+|   <body>
+
+#data
+<!doctype html><script></SCRIP
+#errors
+Line: 1 Col: 30 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "</SCRIP"
+|   <body>
+
+#data
+<!doctype html><script></SCRIPT
+#errors
+Line: 1 Col: 31 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "</SCRIPT"
+|   <body>
+
+#data
+<!doctype html><script></SCRIPT 
+#errors
+Line: 1 Col: 32 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|   <body>
+
+#data
+<!doctype html><script></s
+#errors
+Line: 1 Col: 26 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "</s"
+|   <body>
+
+#data
+<!doctype html><script></sc
+#errors
+Line: 1 Col: 27 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "</sc"
+|   <body>
+
+#data
+<!doctype html><script></scr
+#errors
+Line: 1 Col: 28 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "</scr"
+|   <body>
+
+#data
+<!doctype html><script></scri
+#errors
+Line: 1 Col: 29 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "</scri"
+|   <body>
+
+#data
+<!doctype html><script></scrip
+#errors
+Line: 1 Col: 30 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "</scrip"
+|   <body>
+
+#data
+<!doctype html><script></script
+#errors
+Line: 1 Col: 31 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "</script"
+|   <body>
+
+#data
+<!doctype html><script></script 
+#errors
+Line: 1 Col: 32 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|   <body>
+
+#data
+<!doctype html><script><!
+#errors
+Line: 1 Col: 25 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!"
+|   <body>
+
+#data
+<!doctype html><script><!a
+#errors
+Line: 1 Col: 26 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!a"
+|   <body>
+
+#data
+<!doctype html><script><!-
+#errors
+Line: 1 Col: 26 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!-"
+|   <body>
+
+#data
+<!doctype html><script><!-a
+#errors
+Line: 1 Col: 27 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!-a"
+|   <body>
+
+#data
+<!doctype html><script><!--
+#errors
+Line: 1 Col: 27 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--"
+|   <body>
+
+#data
+<!doctype html><script><!--a
+#errors
+Line: 1 Col: 28 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--a"
+|   <body>
+
+#data
+<!doctype html><script><!--<
+#errors
+Line: 1 Col: 28 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<"
+|   <body>
+
+#data
+<!doctype html><script><!--<a
+#errors
+Line: 1 Col: 29 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<a"
+|   <body>
+
+#data
+<!doctype html><script><!--</
+#errors
+Line: 1 Col: 27 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--</"
+|   <body>
+
+#data
+<!doctype html><script><!--</script
+#errors
+Line: 1 Col: 35 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--</script"
+|   <body>
+
+#data
+<!doctype html><script><!--</script 
+#errors
+Line: 1 Col: 36 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--"
+|   <body>
+
+#data
+<!doctype html><script><!--<s
+#errors
+Line: 1 Col: 29 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<s"
+|   <body>
+
+#data
+<!doctype html><script><!--<script
+#errors
+Line: 1 Col: 34 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script"
+|   <body>
+
+#data
+<!doctype html><script><!--<script 
+#errors
+Line: 1 Col: 35 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script "
+|   <body>
+
+#data
+<!doctype html><script><!--<script <
+#errors
+Line: 1 Col: 36 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script <"
+|   <body>
+
+#data
+<!doctype html><script><!--<script <a
+#errors
+Line: 1 Col: 37 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script <a"
+|   <body>
+
+#data
+<!doctype html><script><!--<script </
+#errors
+Line: 1 Col: 37 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script </"
+|   <body>
+
+#data
+<!doctype html><script><!--<script </s
+#errors
+Line: 1 Col: 38 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script </s"
+|   <body>
+
+#data
+<!doctype html><script><!--<script </script
+#errors
+Line: 1 Col: 43 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script </script"
+|   <body>
+
+#data
+<!doctype html><script><!--<script </scripta
+#errors
+Line: 1 Col: 44 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script </scripta"
+|   <body>
+
+#data
+<!doctype html><script><!--<script </script 
+#errors
+Line: 1 Col: 44 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script </script "
+|   <body>
+
+#data
+<!doctype html><script><!--<script </script>
+#errors
+Line: 1 Col: 44 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script </script>"
+|   <body>
+
+#data
+<!doctype html><script><!--<script </script/
+#errors
+Line: 1 Col: 44 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script </script/"
+|   <body>
+
+#data
+<!doctype html><script><!--<script </script <
+#errors
+Line: 1 Col: 45 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script </script <"
+|   <body>
+
+#data
+<!doctype html><script><!--<script </script <a
+#errors
+Line: 1 Col: 46 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script </script <a"
+|   <body>
+
+#data
+<!doctype html><script><!--<script </script </
+#errors
+Line: 1 Col: 46 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script </script </"
+|   <body>
+
+#data
+<!doctype html><script><!--<script </script </script
+#errors
+Line: 1 Col: 52 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script </script </script"
+|   <body>
+
+#data
+<!doctype html><script><!--<script </script </script 
+#errors
+Line: 1 Col: 53 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script </script "
+|   <body>
+
+#data
+<!doctype html><script><!--<script </script </script/
+#errors
+Line: 1 Col: 53 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script </script "
+|   <body>
+
+#data
+<!doctype html><script><!--<script </script </script>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script </script "
+|   <body>
+
+#data
+<!doctype html><script><!--<script -
+#errors
+Line: 1 Col: 36 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script -"
+|   <body>
+
+#data
+<!doctype html><script><!--<script -a
+#errors
+Line: 1 Col: 37 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script -a"
+|   <body>
+
+#data
+<!doctype html><script><!--<script -<
+#errors
+Line: 1 Col: 37 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script -<"
+|   <body>
+
+#data
+<!doctype html><script><!--<script --
+#errors
+Line: 1 Col: 37 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script --"
+|   <body>
+
+#data
+<!doctype html><script><!--<script --a
+#errors
+Line: 1 Col: 38 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script --a"
+|   <body>
+
+#data
+<!doctype html><script><!--<script --<
+#errors
+Line: 1 Col: 38 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script --<"
+|   <body>
+
+#data
+<!doctype html><script><!--<script -->
+#errors
+Line: 1 Col: 38 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script -->"
+|   <body>
+
+#data
+<!doctype html><script><!--<script --><
+#errors
+Line: 1 Col: 39 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script --><"
+|   <body>
+
+#data
+<!doctype html><script><!--<script --></
+#errors
+Line: 1 Col: 40 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script --></"
+|   <body>
+
+#data
+<!doctype html><script><!--<script --></script
+#errors
+Line: 1 Col: 46 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script --></script"
+|   <body>
+
+#data
+<!doctype html><script><!--<script --></script 
+#errors
+Line: 1 Col: 47 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script -->"
+|   <body>
+
+#data
+<!doctype html><script><!--<script --></script/
+#errors
+Line: 1 Col: 47 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script -->"
+|   <body>
+
+#data
+<!doctype html><script><!--<script --></script>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script -->"
+|   <body>
+
+#data
+<!doctype html><script><!--<script><\/script>--></script>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script><\/script>-->"
+|   <body>
+
+#data
+<!doctype html><script><!--<script></scr'+'ipt>--></script>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script></scr'+'ipt>-->"
+|   <body>
+
+#data
+<!doctype html><script><!--<script></script><script></script></script>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script></script><script></script>"
+|   <body>
+
+#data
+<!doctype html><script><!--<script></script><script></script>--><!--</script>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script></script><script></script>--><!--"
+|   <body>
+
+#data
+<!doctype html><script><!--<script></script><script></script>-- ></script>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script></script><script></script>-- >"
+|   <body>
+
+#data
+<!doctype html><script><!--<script></script><script></script>- -></script>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script></script><script></script>- ->"
+|   <body>
+
+#data
+<!doctype html><script><!--<script></script><script></script>- - ></script>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script></script><script></script>- - >"
+|   <body>
+
+#data
+<!doctype html><script><!--<script></script><script></script>-></script>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script></script><script></script>->"
+|   <body>
+
+#data
+<!doctype html><script><!--<script>--!></script>X
+#errors
+Line: 1 Col: 49 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script>--!></script>X"
+|   <body>
+
+#data
+<!doctype html><script><!--<scr'+'ipt></script>--></script>
+#errors
+Line: 1 Col: 59 Unexpected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<scr'+'ipt>"
+|   <body>
+|     "-->"
+
+#data
+<!doctype html><script><!--<script></scr'+'ipt></script>X
+#errors
+Line: 1 Col: 57 Unexpected end of file. Expected end tag (script).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script></scr'+'ipt></script>X"
+|   <body>
+
+#data
+<!doctype html><style><!--<style></style>--></style>
+#errors
+Line: 1 Col: 52 Unexpected end tag (style).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <style>
+|       "<!--<style>"
+|   <body>
+|     "-->"
+
+#data
+<!doctype html><style><!--</style>X
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <style>
+|       "<!--"
+|   <body>
+|     "X"
+
+#data
+<!doctype html><style><!--...</style>...--></style>
+#errors
+Line: 1 Col: 51 Unexpected end tag (style).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <style>
+|       "<!--..."
+|   <body>
+|     "...-->"
+
+#data
+<!doctype html><style><!--<br><html xmlns:v="urn:schemas-microsoft-com:vml"><!--[if !mso]><style></style>X
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <style>
+|       "<!--<br><html xmlns:v="urn:schemas-microsoft-com:vml"><!--[if !mso]><style>"
+|   <body>
+|     "X"
+
+#data
+<!doctype html><style><!--...<style><!--...--!></style>--></style>
+#errors
+Line: 1 Col: 66 Unexpected end tag (style).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <style>
+|       "<!--...<style><!--...--!>"
+|   <body>
+|     "-->"
+
+#data
+<!doctype html><style><!--...</style><!-- --><style>@import ...</style>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <style>
+|       "<!--..."
+|     <!--   -->
+|     <style>
+|       "@import ..."
+|   <body>
+
+#data
+<!doctype html><style>...<style><!--...</style><!-- --></style>
+#errors
+Line: 1 Col: 63 Unexpected end tag (style).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <style>
+|       "...<style><!--..."
+|     <!--   -->
+|   <body>
+
+#data
+<!doctype html><style>...<!--[if IE]><style>...</style>X
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <style>
+|       "...<!--[if IE]><style>..."
+|   <body>
+|     "X"
+
+#data
+<!doctype html><title><!--<title></title>--></title>
+#errors
+Line: 1 Col: 52 Unexpected end tag (title).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <title>
+|       "<!--<title>"
+|   <body>
+|     "-->"
+
+#data
+<!doctype html><title>&lt;/title></title>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <title>
+|       "</title>"
+|   <body>
+
+#data
+<!doctype html><title>foo/title><link></head><body>X
+#errors
+Line: 1 Col: 52 Unexpected end of file. Expected end tag (title).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <title>
+|       "foo/title><link></head><body>X"
+|   <body>
+
+#data
+<!doctype html><noscript><!--<noscript></noscript>--></noscript>
+#errors
+Line: 1 Col: 64 Unexpected end tag (noscript).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <noscript>
+|       "<!--<noscript>"
+|   <body>
+|     "-->"
+
+#data
+<!doctype html><noscript><!--</noscript>X<noscript>--></noscript>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <noscript>
+|       "<!--"
+|   <body>
+|     "X"
+|     <noscript>
+|       "-->"
+
+#data
+<!doctype html><noscript><iframe></noscript>X
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <noscript>
+|       "<iframe>"
+|   <body>
+|     "X"
+
+#data
+<!doctype html><noframes><!--<noframes></noframes>--></noframes>
+#errors
+Line: 1 Col: 64 Unexpected end tag (noframes).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <noframes>
+|       "<!--<noframes>"
+|   <body>
+|     "-->"
+
+#data
+<!doctype html><noframes><body><script><!--...</script></body></noframes></html>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <noframes>
+|       "<body><script><!--...</script></body>"
+|   <body>
+
+#data
+<!doctype html><textarea><!--<textarea></textarea>--></textarea>
+#errors
+Line: 1 Col: 64 Unexpected end tag (textarea).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <textarea>
+|       "<!--<textarea>"
+|     "-->"
+
+#data
+<!doctype html><textarea>&lt;/textarea></textarea>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <textarea>
+|       "</textarea>"
+
+#data
+<!doctype html><textarea>&lt;</textarea>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <textarea>
+|       "<"
+
+#data
+<!doctype html><textarea>a&lt;b</textarea>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <textarea>
+|       "a<b"
+
+#data
+<!doctype html><iframe><!--<iframe></iframe>--></iframe>
+#errors
+Line: 1 Col: 56 Unexpected end tag (iframe).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <iframe>
+|       "<!--<iframe>"
+|     "-->"
+
+#data
+<!doctype html><iframe>...<!--X->...<!--/X->...</iframe>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <iframe>
+|       "...<!--X->...<!--/X->..."
+
+#data
+<!doctype html><xmp><!--<xmp></xmp>--></xmp>
+#errors
+Line: 1 Col: 44 Unexpected end tag (xmp).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <xmp>
+|       "<!--<xmp>"
+|     "-->"
+
+#data
+<!doctype html><noembed><!--<noembed></noembed>--></noembed>
+#errors
+Line: 1 Col: 60 Unexpected end tag (noembed).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <noembed>
+|       "<!--<noembed>"
+|     "-->"
+
+#data
+<script>
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 8 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|   <body>
+
+#data
+<script>a
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 9 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "a"
+|   <body>
+
+#data
+<script><
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 9 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<"
+|   <body>
+
+#data
+<script></
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 10 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "</"
+|   <body>
+
+#data
+<script></S
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 11 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "</S"
+|   <body>
+
+#data
+<script></SC
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 12 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "</SC"
+|   <body>
+
+#data
+<script></SCR
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 13 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "</SCR"
+|   <body>
+
+#data
+<script></SCRI
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 14 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "</SCRI"
+|   <body>
+
+#data
+<script></SCRIP
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 15 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "</SCRIP"
+|   <body>
+
+#data
+<script></SCRIPT
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 16 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "</SCRIPT"
+|   <body>
+
+#data
+<script></SCRIPT 
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 17 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|   <body>
+
+#data
+<script></s
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 11 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "</s"
+|   <body>
+
+#data
+<script></sc
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 12 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "</sc"
+|   <body>
+
+#data
+<script></scr
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 13 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "</scr"
+|   <body>
+
+#data
+<script></scri
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 14 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "</scri"
+|   <body>
+
+#data
+<script></scrip
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 15 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "</scrip"
+|   <body>
+
+#data
+<script></script
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 16 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "</script"
+|   <body>
+
+#data
+<script></script 
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 17 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|   <body>
+
+#data
+<script><!
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 10 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!"
+|   <body>
+
+#data
+<script><!a
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 11 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!a"
+|   <body>
+
+#data
+<script><!-
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 11 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!-"
+|   <body>
+
+#data
+<script><!-a
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 12 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!-a"
+|   <body>
+
+#data
+<script><!--
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 12 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--"
+|   <body>
+
+#data
+<script><!--a
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 13 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--a"
+|   <body>
+
+#data
+<script><!--<
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 13 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<"
+|   <body>
+
+#data
+<script><!--<a
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 14 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<a"
+|   <body>
+
+#data
+<script><!--</
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 14 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--</"
+|   <body>
+
+#data
+<script><!--</script
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 20 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--</script"
+|   <body>
+
+#data
+<script><!--</script 
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 21 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--"
+|   <body>
+
+#data
+<script><!--<s
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 14 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<s"
+|   <body>
+
+#data
+<script><!--<script
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 19 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script"
+|   <body>
+
+#data
+<script><!--<script 
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 20 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script "
+|   <body>
+
+#data
+<script><!--<script <
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 21 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script <"
+|   <body>
+
+#data
+<script><!--<script <a
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 22 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script <a"
+|   <body>
+
+#data
+<script><!--<script </
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 22 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script </"
+|   <body>
+
+#data
+<script><!--<script </s
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 23 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script </s"
+|   <body>
+
+#data
+<script><!--<script </script
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 28 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script </script"
+|   <body>
+
+#data
+<script><!--<script </scripta
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 29 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script </scripta"
+|   <body>
+
+#data
+<script><!--<script </script 
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 29 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script </script "
+|   <body>
+
+#data
+<script><!--<script </script>
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 29 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script </script>"
+|   <body>
+
+#data
+<script><!--<script </script/
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 29 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script </script/"
+|   <body>
+
+#data
+<script><!--<script </script <
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 30 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script </script <"
+|   <body>
+
+#data
+<script><!--<script </script <a
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 31 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script </script <a"
+|   <body>
+
+#data
+<script><!--<script </script </
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 31 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script </script </"
+|   <body>
+
+#data
+<script><!--<script </script </script
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 38 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script </script </script"
+|   <body>
+
+#data
+<script><!--<script </script </script 
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 38 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script </script "
+|   <body>
+
+#data
+<script><!--<script </script </script/
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 38 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script </script "
+|   <body>
+
+#data
+<script><!--<script </script </script>
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script </script "
+|   <body>
+
+#data
+<script><!--<script -
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 21 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script -"
+|   <body>
+
+#data
+<script><!--<script -a
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 22 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script -a"
+|   <body>
+
+#data
+<script><!--<script --
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 22 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script --"
+|   <body>
+
+#data
+<script><!--<script --a
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 23 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script --a"
+|   <body>
+
+#data
+<script><!--<script -->
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 23 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script -->"
+|   <body>
+
+#data
+<script><!--<script --><
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 24 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script --><"
+|   <body>
+
+#data
+<script><!--<script --></
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 25 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script --></"
+|   <body>
+
+#data
+<script><!--<script --></script
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 31 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script --></script"
+|   <body>
+
+#data
+<script><!--<script --></script 
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 32 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script -->"
+|   <body>
+
+#data
+<script><!--<script --></script/
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 32 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script -->"
+|   <body>
+
+#data
+<script><!--<script --></script>
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script -->"
+|   <body>
+
+#data
+<script><!--<script><\/script>--></script>
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script><\/script>-->"
+|   <body>
+
+#data
+<script><!--<script></scr'+'ipt>--></script>
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script></scr'+'ipt>-->"
+|   <body>
+
+#data
+<script><!--<script></script><script></script></script>
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script></script><script></script>"
+|   <body>
+
+#data
+<script><!--<script></script><script></script>--><!--</script>
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script></script><script></script>--><!--"
+|   <body>
+
+#data
+<script><!--<script></script><script></script>-- ></script>
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script></script><script></script>-- >"
+|   <body>
+
+#data
+<script><!--<script></script><script></script>- -></script>
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script></script><script></script>- ->"
+|   <body>
+
+#data
+<script><!--<script></script><script></script>- - ></script>
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script></script><script></script>- - >"
+|   <body>
+
+#data
+<script><!--<script></script><script></script>-></script>
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script></script><script></script>->"
+|   <body>
+
+#data
+<script><!--<script>--!></script>X
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 34 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script>--!></script>X"
+|   <body>
+
+#data
+<script><!--<scr'+'ipt></script>--></script>
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 44 Unexpected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<scr'+'ipt>"
+|   <body>
+|     "-->"
+
+#data
+<script><!--<script></scr'+'ipt></script>X
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 42 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "<!--<script></scr'+'ipt></script>X"
+|   <body>
+
+#data
+<style><!--<style></style>--></style>
+#errors
+Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
+Line: 1 Col: 37 Unexpected end tag (style).
+#document
+| <html>
+|   <head>
+|     <style>
+|       "<!--<style>"
+|   <body>
+|     "-->"
+
+#data
+<style><!--</style>X
+#errors
+Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|     <style>
+|       "<!--"
+|   <body>
+|     "X"
+
+#data
+<style><!--...</style>...--></style>
+#errors
+Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
+Line: 1 Col: 36 Unexpected end tag (style).
+#document
+| <html>
+|   <head>
+|     <style>
+|       "<!--..."
+|   <body>
+|     "...-->"
+
+#data
+<style><!--<br><html xmlns:v="urn:schemas-microsoft-com:vml"><!--[if !mso]><style></style>X
+#errors
+Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|     <style>
+|       "<!--<br><html xmlns:v="urn:schemas-microsoft-com:vml"><!--[if !mso]><style>"
+|   <body>
+|     "X"
+
+#data
+<style><!--...<style><!--...--!></style>--></style>
+#errors
+Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
+Line: 1 Col: 51 Unexpected end tag (style).
+#document
+| <html>
+|   <head>
+|     <style>
+|       "<!--...<style><!--...--!>"
+|   <body>
+|     "-->"
+
+#data
+<style><!--...</style><!-- --><style>@import ...</style>
+#errors
+Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|     <style>
+|       "<!--..."
+|     <!--   -->
+|     <style>
+|       "@import ..."
+|   <body>
+
+#data
+<style>...<style><!--...</style><!-- --></style>
+#errors
+Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
+Line: 1 Col: 48 Unexpected end tag (style).
+#document
+| <html>
+|   <head>
+|     <style>
+|       "...<style><!--..."
+|     <!--   -->
+|   <body>
+
+#data
+<style>...<!--[if IE]><style>...</style>X
+#errors
+Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|     <style>
+|       "...<!--[if IE]><style>..."
+|   <body>
+|     "X"
+
+#data
+<title><!--<title></title>--></title>
+#errors
+Line: 1 Col: 7 Unexpected start tag (title). Expected DOCTYPE.
+Line: 1 Col: 37 Unexpected end tag (title).
+#document
+| <html>
+|   <head>
+|     <title>
+|       "<!--<title>"
+|   <body>
+|     "-->"
+
+#data
+<title>&lt;/title></title>
+#errors
+Line: 1 Col: 7 Unexpected start tag (title). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|     <title>
+|       "</title>"
+|   <body>
+
+#data
+<title>foo/title><link></head><body>X
+#errors
+Line: 1 Col: 7 Unexpected start tag (title). Expected DOCTYPE.
+Line: 1 Col: 37 Unexpected end of file. Expected end tag (title).
+#document
+| <html>
+|   <head>
+|     <title>
+|       "foo/title><link></head><body>X"
+|   <body>
+
+#data
+<noscript><!--<noscript></noscript>--></noscript>
+#errors
+Line: 1 Col: 10 Unexpected start tag (noscript). Expected DOCTYPE.
+Line: 1 Col: 49 Unexpected end tag (noscript).
+#document
+| <html>
+|   <head>
+|     <noscript>
+|       "<!--<noscript>"
+|   <body>
+|     "-->"
+
+#data
+<noscript><!--</noscript>X<noscript>--></noscript>
+#errors
+Line: 1 Col: 10 Unexpected start tag (noscript). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|     <noscript>
+|       "<!--"
+|   <body>
+|     "X"
+|     <noscript>
+|       "-->"
+
+#data
+<noscript><iframe></noscript>X
+#errors
+Line: 1 Col: 10 Unexpected start tag (noscript). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|     <noscript>
+|       "<iframe>"
+|   <body>
+|     "X"
+
+#data
+<noframes><!--<noframes></noframes>--></noframes>
+#errors
+Line: 1 Col: 10 Unexpected start tag (noframes). Expected DOCTYPE.
+Line: 1 Col: 49 Unexpected end tag (noframes).
+#document
+| <html>
+|   <head>
+|     <noframes>
+|       "<!--<noframes>"
+|   <body>
+|     "-->"
+
+#data
+<noframes><body><script><!--...</script></body></noframes></html>
+#errors
+Line: 1 Col: 10 Unexpected start tag (noframes). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|     <noframes>
+|       "<body><script><!--...</script></body>"
+|   <body>
+
+#data
+<textarea><!--<textarea></textarea>--></textarea>
+#errors
+Line: 1 Col: 10 Unexpected start tag (textarea). Expected DOCTYPE.
+Line: 1 Col: 49 Unexpected end tag (textarea).
+#document
+| <html>
+|   <head>
+|   <body>
+|     <textarea>
+|       "<!--<textarea>"
+|     "-->"
+
+#data
+<textarea>&lt;/textarea></textarea>
+#errors
+Line: 1 Col: 10 Unexpected start tag (textarea). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <textarea>
+|       "</textarea>"
+
+#data
+<iframe><!--<iframe></iframe>--></iframe>
+#errors
+Line: 1 Col: 8 Unexpected start tag (iframe). Expected DOCTYPE.
+Line: 1 Col: 41 Unexpected end tag (iframe).
+#document
+| <html>
+|   <head>
+|   <body>
+|     <iframe>
+|       "<!--<iframe>"
+|     "-->"
+
+#data
+<iframe>...<!--X->...<!--/X->...</iframe>
+#errors
+Line: 1 Col: 8 Unexpected start tag (iframe). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <iframe>
+|       "...<!--X->...<!--/X->..."
+
+#data
+<xmp><!--<xmp></xmp>--></xmp>
+#errors
+Line: 1 Col: 5 Unexpected start tag (xmp). Expected DOCTYPE.
+Line: 1 Col: 29 Unexpected end tag (xmp).
+#document
+| <html>
+|   <head>
+|   <body>
+|     <xmp>
+|       "<!--<xmp>"
+|     "-->"
+
+#data
+<noembed><!--<noembed></noembed>--></noembed>
+#errors
+Line: 1 Col: 9 Unexpected start tag (noembed). Expected DOCTYPE.
+Line: 1 Col: 45 Unexpected end tag (noembed).
+#document
+| <html>
+|   <head>
+|   <body>
+|     <noembed>
+|       "<!--<noembed>"
+|     "-->"
+
+#data
+<!doctype html><table>
+
+#errors
+Line 2 Col 0 Unexpected end of file. Expected table content.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       "
+"
+
+#data
+<!doctype html><table><td><span><font></span><span>
+#errors
+Line 1 Col 26 Unexpected table cell start tag (td) in the table body phase.
+Line 1 Col 45 Unexpected end tag (span).
+Line 1 Col 51 Expected closing tag. Unexpected end of file.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             <span>
+|               <font>
+|             <font>
+|               <span>
+
+#data
+<!doctype html><form><table></form><form></table></form>
+#errors
+35: Stray end tag “form”.
+41: Start tag “form” seen in “table”.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <form>
+|       <table>
+|         <form>
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests17.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests17.dat
new file mode 100644
index 00000000..7b555f88
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests17.dat
@@ -0,0 +1,153 @@
+#data
+<!doctype html><table><tbody><select><tr>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <select>
+|     <table>
+|       <tbody>
+|         <tr>
+
+#data
+<!doctype html><table><tr><select><td>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <select>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+
+#data
+<!doctype html><table><tr><td><select><td>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             <select>
+|           <td>
+
+#data
+<!doctype html><table><tr><th><select><td>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <th>
+|             <select>
+|           <td>
+
+#data
+<!doctype html><table><caption><select><tr>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <caption>
+|         <select>
+|       <tbody>
+|         <tr>
+
+#data
+<!doctype html><select><tr>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <select>
+
+#data
+<!doctype html><select><td>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <select>
+
+#data
+<!doctype html><select><th>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <select>
+
+#data
+<!doctype html><select><tbody>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <select>
+
+#data
+<!doctype html><select><thead>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <select>
+
+#data
+<!doctype html><select><tfoot>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <select>
+
+#data
+<!doctype html><select><caption>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <select>
+
+#data
+<!doctype html><table><tr></table>a
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|     "a"
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests18.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests18.dat
new file mode 100644
index 00000000..680e1f06
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests18.dat
@@ -0,0 +1,269 @@
+#data
+<!doctype html><plaintext></plaintext>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <plaintext>
+|       "</plaintext>"
+
+#data
+<!doctype html><table><plaintext></plaintext>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <plaintext>
+|       "</plaintext>"
+|     <table>
+
+#data
+<!doctype html><table><tbody><plaintext></plaintext>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <plaintext>
+|       "</plaintext>"
+|     <table>
+|       <tbody>
+
+#data
+<!doctype html><table><tbody><tr><plaintext></plaintext>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <plaintext>
+|       "</plaintext>"
+|     <table>
+|       <tbody>
+|         <tr>
+
+#data
+<!doctype html><table><tbody><tr><plaintext></plaintext>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <plaintext>
+|       "</plaintext>"
+|     <table>
+|       <tbody>
+|         <tr>
+
+#data
+<!doctype html><table><td><plaintext></plaintext>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             <plaintext>
+|               "</plaintext>"
+
+#data
+<!doctype html><table><caption><plaintext></plaintext>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <caption>
+|         <plaintext>
+|           "</plaintext>"
+
+#data
+<!doctype html><table><tr><style></script></style>abc
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     "abc"
+|     <table>
+|       <tbody>
+|         <tr>
+|           <style>
+|             "</script>"
+
+#data
+<!doctype html><table><tr><script></style></script>abc
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     "abc"
+|     <table>
+|       <tbody>
+|         <tr>
+|           <script>
+|             "</style>"
+
+#data
+<!doctype html><table><caption><style></script></style>abc
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <caption>
+|         <style>
+|           "</script>"
+|         "abc"
+
+#data
+<!doctype html><table><td><style></script></style>abc
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             <style>
+|               "</script>"
+|             "abc"
+
+#data
+<!doctype html><select><script></style></script>abc
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <select>
+|       <script>
+|         "</style>"
+|       "abc"
+
+#data
+<!doctype html><table><select><script></style></script>abc
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <select>
+|       <script>
+|         "</style>"
+|       "abc"
+|     <table>
+
+#data
+<!doctype html><table><tr><select><script></style></script>abc
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <select>
+|       <script>
+|         "</style>"
+|       "abc"
+|     <table>
+|       <tbody>
+|         <tr>
+
+#data
+<!doctype html><frameset></frameset><noframes>abc
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <frameset>
+|   <noframes>
+|     "abc"
+
+#data
+<!doctype html><frameset></frameset><noframes>abc</noframes><!--abc-->
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <frameset>
+|   <noframes>
+|     "abc"
+|   <!-- abc -->
+
+#data
+<!doctype html><frameset></frameset></html><noframes>abc
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <frameset>
+|   <noframes>
+|     "abc"
+
+#data
+<!doctype html><frameset></frameset></html><noframes>abc</noframes><!--abc-->
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <frameset>
+|   <noframes>
+|     "abc"
+| <!-- abc -->
+
+#data
+<!doctype html><table><tr></tbody><tfoot>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|       <tfoot>
+
+#data
+<!doctype html><table><td><svg></svg>abc<td>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             <svg svg>
+|             "abc"
+|           <td>
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests19.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests19.dat
new file mode 100644
index 00000000..0d62f5a5
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests19.dat
@@ -0,0 +1,1237 @@
+#data
+<!doctype html><math><mn DefinitionUrl="foo">
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       <math mn>
+|         definitionURL="foo"
+
+#data
+<!doctype html><html></p><!--foo-->
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <!-- foo -->
+|   <head>
+|   <body>
+
+#data
+<!doctype html><head></head></p><!--foo-->
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <!-- foo -->
+|   <body>
+
+#data
+<!doctype html><body><p><pre>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|     <pre>
+
+#data
+<!doctype html><body><p><listing>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|     <listing>
+
+#data
+<!doctype html><p><plaintext>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|     <plaintext>
+
+#data
+<!doctype html><p><h1>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|     <h1>
+
+#data
+<!doctype html><form><isindex>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <form>
+
+#data
+<!doctype html><isindex action="POST">
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <form>
+|       action="POST"
+|       <hr>
+|       <label>
+|         "This is a searchable index. Enter search keywords: "
+|         <input>
+|           name="isindex"
+|       <hr>
+
+#data
+<!doctype html><isindex prompt="this is isindex">
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <form>
+|       <hr>
+|       <label>
+|         "this is isindex"
+|         <input>
+|           name="isindex"
+|       <hr>
+
+#data
+<!doctype html><isindex type="hidden">
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <form>
+|       <hr>
+|       <label>
+|         "This is a searchable index. Enter search keywords: "
+|         <input>
+|           name="isindex"
+|           type="hidden"
+|       <hr>
+
+#data
+<!doctype html><isindex name="foo">
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <form>
+|       <hr>
+|       <label>
+|         "This is a searchable index. Enter search keywords: "
+|         <input>
+|           name="isindex"
+|       <hr>
+
+#data
+<!doctype html><ruby><p><rp>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <ruby>
+|       <p>
+|       <rp>
+
+#data
+<!doctype html><ruby><div><span><rp>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <ruby>
+|       <div>
+|         <span>
+|           <rp>
+
+#data
+<!doctype html><ruby><div><p><rp>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <ruby>
+|       <div>
+|         <p>
+|         <rp>
+
+#data
+<!doctype html><ruby><p><rt>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <ruby>
+|       <p>
+|       <rt>
+
+#data
+<!doctype html><ruby><div><span><rt>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <ruby>
+|       <div>
+|         <span>
+|           <rt>
+
+#data
+<!doctype html><ruby><div><p><rt>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <ruby>
+|       <div>
+|         <p>
+|         <rt>
+
+#data
+<!doctype html><math/><foo>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|     <foo>
+
+#data
+<!doctype html><svg/><foo>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|     <foo>
+
+#data
+<!doctype html><div></body><!--foo-->
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|   <!-- foo -->
+
+#data
+<!doctype html><h1><div><h3><span></h1>foo
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <h1>
+|       <div>
+|         <h3>
+|           <span>
+|         "foo"
+
+#data
+<!doctype html><p></h3>foo
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       "foo"
+
+#data
+<!doctype html><h3><li>abc</h2>foo
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <h3>
+|       <li>
+|         "abc"
+|     "foo"
+
+#data
+<!doctype html><table>abc<!--foo-->
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     "abc"
+|     <table>
+|       <!-- foo -->
+
+#data
+<!doctype html><table>  <!--foo-->
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       "  "
+|       <!-- foo -->
+
+#data
+<!doctype html><table> b <!--foo-->
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     " b "
+|     <table>
+|       <!-- foo -->
+
+#data
+<!doctype html><select><option><option>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <select>
+|       <option>
+|       <option>
+
+#data
+<!doctype html><select><option></optgroup>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <select>
+|       <option>
+
+#data
+<!doctype html><select><option></optgroup>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <select>
+|       <option>
+
+#data
+<!doctype html><p><math><mi><p><h1>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <math math>
+|         <math mi>
+|           <p>
+|           <h1>
+
+#data
+<!doctype html><p><math><mo><p><h1>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <math math>
+|         <math mo>
+|           <p>
+|           <h1>
+
+#data
+<!doctype html><p><math><mn><p><h1>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <math math>
+|         <math mn>
+|           <p>
+|           <h1>
+
+#data
+<!doctype html><p><math><ms><p><h1>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <math math>
+|         <math ms>
+|           <p>
+|           <h1>
+
+#data
+<!doctype html><p><math><mtext><p><h1>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <math math>
+|         <math mtext>
+|           <p>
+|           <h1>
+
+#data
+<!doctype html><frameset></noframes>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <frameset>
+
+#data
+<!doctype html><html c=d><body></html><html a=b>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   a="b"
+|   c="d"
+|   <head>
+|   <body>
+
+#data
+<!doctype html><html c=d><frameset></frameset></html><html a=b>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   a="b"
+|   c="d"
+|   <head>
+|   <frameset>
+
+#data
+<!doctype html><html><frameset></frameset></html><!--foo-->
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <frameset>
+| <!-- foo -->
+
+#data
+<!doctype html><html><frameset></frameset></html>  
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <frameset>
+|   "  "
+
+#data
+<!doctype html><html><frameset></frameset></html>abc
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <frameset>
+
+#data
+<!doctype html><html><frameset></frameset></html><p>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <frameset>
+
+#data
+<!doctype html><html><frameset></frameset></html></p>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <frameset>
+
+#data
+<html><frameset></frameset></html><!doctype html>
+#errors
+#document
+| <html>
+|   <head>
+|   <frameset>
+
+#data
+<!doctype html><body><frameset>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+
+#data
+<!doctype html><p><frameset><frame>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <frameset>
+|     <frame>
+
+#data
+<!doctype html><p>a<frameset>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       "a"
+
+#data
+<!doctype html><p> <frameset><frame>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <frameset>
+|     <frame>
+
+#data
+<!doctype html><pre><frameset>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <pre>
+
+#data
+<!doctype html><listing><frameset>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <listing>
+
+#data
+<!doctype html><li><frameset>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <li>
+
+#data
+<!doctype html><dd><frameset>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <dd>
+
+#data
+<!doctype html><dt><frameset>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <dt>
+
+#data
+<!doctype html><button><frameset>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <button>
+
+#data
+<!doctype html><applet><frameset>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <applet>
+
+#data
+<!doctype html><marquee><frameset>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <marquee>
+
+#data
+<!doctype html><object><frameset>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <object>
+
+#data
+<!doctype html><table><frameset>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <table>
+
+#data
+<!doctype html><area><frameset>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <area>
+
+#data
+<!doctype html><basefont><frameset>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <basefont>
+|   <frameset>
+
+#data
+<!doctype html><bgsound><frameset>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <bgsound>
+|   <frameset>
+
+#data
+<!doctype html><br><frameset>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <br>
+
+#data
+<!doctype html><embed><frameset>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <embed>
+
+#data
+<!doctype html><img><frameset>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <img>
+
+#data
+<!doctype html><input><frameset>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <input>
+
+#data
+<!doctype html><keygen><frameset>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <keygen>
+
+#data
+<!doctype html><wbr><frameset>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <wbr>
+
+#data
+<!doctype html><hr><frameset>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <hr>
+
+#data
+<!doctype html><textarea></textarea><frameset>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <textarea>
+
+#data
+<!doctype html><xmp></xmp><frameset>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <xmp>
+
+#data
+<!doctype html><iframe></iframe><frameset>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <iframe>
+
+#data
+<!doctype html><select></select><frameset>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <select>
+
+#data
+<!doctype html><svg></svg><frameset><frame>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <frameset>
+|     <frame>
+
+#data
+<!doctype html><math></math><frameset><frame>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <frameset>
+|     <frame>
+
+#data
+<!doctype html><svg><foreignObject><div> <frameset><frame>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <frameset>
+|     <frame>
+
+#data
+<!doctype html><svg>a</svg><frameset><frame>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       "a"
+
+#data
+<!doctype html><svg> </svg><frameset><frame>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <frameset>
+|     <frame>
+
+#data
+<html>aaa<frameset></frameset>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "aaa"
+
+#data
+<html> a <frameset></frameset>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "a "
+
+#data
+<!doctype html><div><frameset>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <frameset>
+
+#data
+<!doctype html><div><body><frameset>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <div>
+
+#data
+<!doctype html><p><math></p>a
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <math math>
+|     "a"
+
+#data
+<!doctype html><p><math><mn><span></p>a
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <math math>
+|         <math mn>
+|           <span>
+|             <p>
+|             "a"
+
+#data
+<!doctype html><math></html>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+
+#data
+<!doctype html><meta charset="ascii">
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <meta>
+|       charset="ascii"
+|   <body>
+
+#data
+<!doctype html><meta http-equiv="content-type" content="text/html;charset=ascii">
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <meta>
+|       content="text/html;charset=ascii"
+|       http-equiv="content-type"
+|   <body>
+
+#data
+<!doctype html><head><!--aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa--><meta charset="utf8">
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <!-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -->
+|     <meta>
+|       charset="utf8"
+|   <body>
+
+#data
+<!doctype html><html a=b><head></head><html c=d>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   a="b"
+|   c="d"
+|   <head>
+|   <body>
+
+#data
+<!doctype html><image/>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <img>
+
+#data
+<!doctype html>a<i>b<table>c<b>d</i>e</b>f
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     "a"
+|     <i>
+|       "bc"
+|       <b>
+|         "de"
+|       "f"
+|       <table>
+
+#data
+<!doctype html><table><i>a<b>b<div>c<a>d</i>e</b>f
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <i>
+|       "a"
+|       <b>
+|         "b"
+|     <b>
+|     <div>
+|       <b>
+|         <i>
+|           "c"
+|           <a>
+|             "d"
+|         <a>
+|           "e"
+|       <a>
+|         "f"
+|     <table>
+
+#data
+<!doctype html><i>a<b>b<div>c<a>d</i>e</b>f
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <i>
+|       "a"
+|       <b>
+|         "b"
+|     <b>
+|     <div>
+|       <b>
+|         <i>
+|           "c"
+|           <a>
+|             "d"
+|         <a>
+|           "e"
+|       <a>
+|         "f"
+
+#data
+<!doctype html><table><i>a<b>b<div>c</i>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <i>
+|       "a"
+|       <b>
+|         "b"
+|     <b>
+|       <div>
+|         <i>
+|           "c"
+|     <table>
+
+#data
+<!doctype html><table><i>a<b>b<div>c<a>d</i>e</b>f
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <i>
+|       "a"
+|       <b>
+|         "b"
+|     <b>
+|     <div>
+|       <b>
+|         <i>
+|           "c"
+|           <a>
+|             "d"
+|         <a>
+|           "e"
+|       <a>
+|         "f"
+|     <table>
+
+#data
+<!doctype html><table><i>a<div>b<tr>c<b>d</i>e
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <i>
+|       "a"
+|       <div>
+|         "b"
+|     <i>
+|       "c"
+|       <b>
+|         "d"
+|     <b>
+|       "e"
+|     <table>
+|       <tbody>
+|         <tr>
+
+#data
+<!doctype html><table><td><table><i>a<div>b<b>c</i>d
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             <i>
+|               "a"
+|             <div>
+|               <i>
+|                 "b"
+|                 <b>
+|                   "c"
+|               <b>
+|                 "d"
+|             <table>
+
+#data
+<!doctype html><body><bgsound>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <bgsound>
+
+#data
+<!doctype html><body><basefont>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <basefont>
+
+#data
+<!doctype html><a><b></a><basefont>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <a>
+|       <b>
+|     <basefont>
+
+#data
+<!doctype html><a><b></a><bgsound>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <a>
+|       <b>
+|     <bgsound>
+
+#data
+<!doctype html><figcaption><article></figcaption>a
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <figcaption>
+|       <article>
+|     "a"
+
+#data
+<!doctype html><summary><article></summary>a
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <summary>
+|       <article>
+|     "a"
+
+#data
+<!doctype html><p><a><plaintext>b
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <a>
+|     <plaintext>
+|       <a>
+|         "b"
+
+#data
+<!DOCTYPE html><div>a<a></div>b<p>c</p>d
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       "a"
+|       <a>
+|     <a>
+|       "b"
+|       <p>
+|         "c"
+|       "d"
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests2.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests2.dat
new file mode 100644
index 00000000..60d85922
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests2.dat
@@ -0,0 +1,763 @@
+#data
+<!DOCTYPE html>Test
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     "Test"
+
+#data
+<textarea>test</div>test
+#errors
+Line: 1 Col: 10 Unexpected start tag (textarea). Expected DOCTYPE.
+Line: 1 Col: 24 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <textarea>
+|       "test</div>test"
+
+#data
+<table><td>
+#errors
+Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+Line: 1 Col: 11 Unexpected table cell start tag (td) in the table body phase.
+Line: 1 Col: 11 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+
+#data
+<table><td>test</tbody></table>
+#errors
+Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+Line: 1 Col: 11 Unexpected table cell start tag (td) in the table body phase.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             "test"
+
+#data
+<frame>test
+#errors
+Line: 1 Col: 7 Unexpected start tag (frame). Expected DOCTYPE.
+Line: 1 Col: 7 Unexpected start tag frame. Ignored.
+#document
+| <html>
+|   <head>
+|   <body>
+|     "test"
+
+#data
+<!DOCTYPE html><frameset>test
+#errors
+Line: 1 Col: 29 Unepxected characters in the frameset phase. Characters ignored.
+Line: 1 Col: 29 Expected closing tag. Unexpected end of file.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <frameset>
+
+#data
+<!DOCTYPE html><frameset><!DOCTYPE html>
+#errors
+Line: 1 Col: 40 Unexpected DOCTYPE. Ignored.
+Line: 1 Col: 40 Expected closing tag. Unexpected end of file.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <frameset>
+
+#data
+<!DOCTYPE html><font><p><b>test</font>
+#errors
+Line: 1 Col: 38 End tag (font) violates step 1, paragraph 3 of the adoption agency algorithm.
+Line: 1 Col: 38 End tag (font) violates step 1, paragraph 3 of the adoption agency algorithm.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <font>
+|     <p>
+|       <font>
+|         <b>
+|           "test"
+
+#data
+<!DOCTYPE html><dt><div><dd>
+#errors
+Line: 1 Col: 28 Missing end tag (div, dt).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <dt>
+|       <div>
+|     <dd>
+
+#data
+<script></x
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+Line: 1 Col: 11 Unexpected end of file. Expected end tag (script).
+#document
+| <html>
+|   <head>
+|     <script>
+|       "</x"
+|   <body>
+
+#data
+<table><plaintext><td>
+#errors
+Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+Line: 1 Col: 18 Unexpected start tag (plaintext) in table context caused voodoo mode.
+Line: 1 Col: 22 Unexpected end of file. Expected table content.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <plaintext>
+|       "<td>"
+|     <table>
+
+#data
+<plaintext></plaintext>
+#errors
+Line: 1 Col: 11 Unexpected start tag (plaintext). Expected DOCTYPE.
+Line: 1 Col: 23 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <plaintext>
+|       "</plaintext>"
+
+#data
+<!DOCTYPE html><table><tr>TEST
+#errors
+Line: 1 Col: 30 Unexpected non-space characters in table context caused voodoo mode.
+Line: 1 Col: 30 Unexpected end of file. Expected table content.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     "TEST"
+|     <table>
+|       <tbody>
+|         <tr>
+
+#data
+<!DOCTYPE html><body t1=1><body t2=2><body t3=3 t4=4>
+#errors
+Line: 1 Col: 37 Unexpected start tag (body).
+Line: 1 Col: 53 Unexpected start tag (body).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     t1="1"
+|     t2="2"
+|     t3="3"
+|     t4="4"
+
+#data
+</b test
+#errors
+Line: 1 Col: 8 Unexpected end of file in attribute name.
+Line: 1 Col: 8 End tag contains unexpected attributes.
+Line: 1 Col: 8 Unexpected end tag (b). Expected DOCTYPE.
+Line: 1 Col: 8 Unexpected end tag (b) after the (implied) root element.
+#document
+| <html>
+|   <head>
+|   <body>
+
+#data
+<!DOCTYPE html></b test<b &=&amp>X
+#errors
+Line: 1 Col: 32 Named entity didn't end with ';'.
+Line: 1 Col: 33 End tag contains unexpected attributes.
+Line: 1 Col: 33 Unexpected end tag (b) after the (implied) root element.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     "X"
+
+#data
+<!doctypehtml><scrIPt type=text/x-foobar;baz>X</SCRipt
+#errors
+Line: 1 Col: 9 No space after literal string 'DOCTYPE'.
+Line: 1 Col: 54 Unexpected end of file in the tag name.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       type="text/x-foobar;baz"
+|       "X</SCRipt"
+|   <body>
+
+#data
+&
+#errors
+Line: 1 Col: 1 Unexpected non-space characters. Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <body>
+|     "&"
+
+#data
+&#
+#errors
+Line: 1 Col: 1 Numeric entity expected. Got end of file instead.
+Line: 1 Col: 1 Unexpected non-space characters. Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <body>
+|     "&#"
+
+#data
+&#X
+#errors
+Line: 1 Col: 3 Numeric entity expected but none found.
+Line: 1 Col: 3 Unexpected non-space characters. Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <body>
+|     "&#X"
+
+#data
+&#x
+#errors
+Line: 1 Col: 3 Numeric entity expected but none found.
+Line: 1 Col: 3 Unexpected non-space characters. Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <body>
+|     "&#x"
+
+#data
+&#45
+#errors
+Line: 1 Col: 4 Numeric entity didn't end with ';'.
+Line: 1 Col: 4 Unexpected non-space characters. Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <body>
+|     "-"
+
+#data
+&x-test
+#errors
+Line: 1 Col: 1 Named entity expected. Got none.
+Line: 1 Col: 1 Unexpected non-space characters. Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <body>
+|     "&x-test"
+
+#data
+<!doctypehtml><p><li>
+#errors
+Line: 1 Col: 9 No space after literal string 'DOCTYPE'.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|     <li>
+
+#data
+<!doctypehtml><p><dt>
+#errors
+Line: 1 Col: 9 No space after literal string 'DOCTYPE'.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|     <dt>
+
+#data
+<!doctypehtml><p><dd>
+#errors
+Line: 1 Col: 9 No space after literal string 'DOCTYPE'.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|     <dd>
+
+#data
+<!doctypehtml><p><form>
+#errors
+Line: 1 Col: 9 No space after literal string 'DOCTYPE'.
+Line: 1 Col: 23 Expected closing tag. Unexpected end of file.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|     <form>
+
+#data
+<!DOCTYPE html><p></P>X
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|     "X"
+
+#data
+&AMP
+#errors
+Line: 1 Col: 4 Named entity didn't end with ';'.
+Line: 1 Col: 4 Unexpected non-space characters. Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <body>
+|     "&"
+
+#data
+&AMp;
+#errors
+Line: 1 Col: 1 Named entity expected. Got none.
+Line: 1 Col: 1 Unexpected non-space characters. Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <body>
+|     "&AMp;"
+
+#data
+<!DOCTYPE html><html><head></head><body><thisISasillyTESTelementNameToMakeSureCrazyTagNamesArePARSEDcorrectLY>
+#errors
+Line: 1 Col: 110 Expected closing tag. Unexpected end of file.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <thisisasillytestelementnametomakesurecrazytagnamesareparsedcorrectly>
+
+#data
+<!DOCTYPE html>X</body>X
+#errors
+Line: 1 Col: 24 Unexpected non-space characters in the after body phase.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     "XX"
+
+#data
+<!DOCTYPE html><!-- X
+#errors
+Line: 1 Col: 21 Unexpected end of file in comment.
+#document
+| <!DOCTYPE html>
+| <!--  X -->
+| <html>
+|   <head>
+|   <body>
+
+#data
+<!DOCTYPE html><table><caption>test TEST</caption><td>test
+#errors
+Line: 1 Col: 54 Unexpected table cell start tag (td) in the table body phase.
+Line: 1 Col: 58 Expected closing tag. Unexpected end of file.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <caption>
+|         "test TEST"
+|       <tbody>
+|         <tr>
+|           <td>
+|             "test"
+
+#data
+<!DOCTYPE html><select><option><optgroup>
+#errors
+Line: 1 Col: 41 Expected closing tag. Unexpected end of file.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <select>
+|       <option>
+|       <optgroup>
+
+#data
+<!DOCTYPE html><select><optgroup><option></optgroup><option><select><option>
+#errors
+Line: 1 Col: 68 Unexpected select start tag in the select phase treated as select end tag.
+Line: 1 Col: 76 Expected closing tag. Unexpected end of file.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <select>
+|       <optgroup>
+|         <option>
+|       <option>
+|     <option>
+
+#data
+<!DOCTYPE html><select><optgroup><option><optgroup>
+#errors
+Line: 1 Col: 51 Expected closing tag. Unexpected end of file.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <select>
+|       <optgroup>
+|         <option>
+|       <optgroup>
+
+#data
+<!DOCTYPE html><datalist><option>foo</datalist>bar
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <datalist>
+|       <option>
+|         "foo"
+|     "bar"
+
+#data
+<!DOCTYPE html><font><input><input></font>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <font>
+|       <input>
+|       <input>
+
+#data
+<!DOCTYPE html><!-- XXX - XXX -->
+#errors
+#document
+| <!DOCTYPE html>
+| <!--  XXX - XXX  -->
+| <html>
+|   <head>
+|   <body>
+
+#data
+<!DOCTYPE html><!-- XXX - XXX
+#errors
+Line: 1 Col: 29 Unexpected end of file in comment (-)
+#document
+| <!DOCTYPE html>
+| <!--  XXX - XXX -->
+| <html>
+|   <head>
+|   <body>
+
+#data
+<!DOCTYPE html><!-- XXX - XXX - XXX -->
+#errors
+#document
+| <!DOCTYPE html>
+| <!--  XXX - XXX - XXX  -->
+| <html>
+|   <head>
+|   <body>
+
+#data
+<isindex test=x name=x>
+#errors
+Line: 1 Col: 23 Unexpected start tag (isindex). Expected DOCTYPE.
+Line: 1 Col: 23 Unexpected start tag isindex. Don't use it!
+#document
+| <html>
+|   <head>
+|   <body>
+|     <form>
+|       <hr>
+|       <label>
+|         "This is a searchable index. Enter search keywords: "
+|         <input>
+|           name="isindex"
+|           test="x"
+|       <hr>
+
+#data
+test
+test
+#errors
+Line: 2 Col: 4 Unexpected non-space characters. Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <body>
+|     "test
+test"
+
+#data
+<!DOCTYPE html><body><title>test</body></title>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <title>
+|       "test</body>"
+
+#data
+<!DOCTYPE html><body><title>X</title><meta name=z><link rel=foo><style>
+x { content:"</style" } </style>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <title>
+|       "X"
+|     <meta>
+|       name="z"
+|     <link>
+|       rel="foo"
+|     <style>
+|       "
+x { content:"</style" } "
+
+#data
+<!DOCTYPE html><select><optgroup></optgroup></select>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <select>
+|       <optgroup>
+
+#data
+ 
+ 
+#errors
+Line: 2 Col: 1 Unexpected End of file. Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <body>
+
+#data
+<!DOCTYPE html>  <html>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+
+#data
+<!DOCTYPE html><script>
+</script>  <title>x</title>  </head>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <script>
+|       "
+"
+|     "  "
+|     <title>
+|       "x"
+|     "  "
+|   <body>
+
+#data
+<!DOCTYPE html><html><body><html id=x>
+#errors
+Line: 1 Col: 38 html needs to be the first start tag.
+#document
+| <!DOCTYPE html>
+| <html>
+|   id="x"
+|   <head>
+|   <body>
+
+#data
+<!DOCTYPE html>X</body><html id="x">
+#errors
+Line: 1 Col: 36 Unexpected start tag token (html) in the after body phase.
+Line: 1 Col: 36 html needs to be the first start tag.
+#document
+| <!DOCTYPE html>
+| <html>
+|   id="x"
+|   <head>
+|   <body>
+|     "X"
+
+#data
+<!DOCTYPE html><head><html id=x>
+#errors
+Line: 1 Col: 32 html needs to be the first start tag.
+#document
+| <!DOCTYPE html>
+| <html>
+|   id="x"
+|   <head>
+|   <body>
+
+#data
+<!DOCTYPE html>X</html>X
+#errors
+Line: 1 Col: 24 Unexpected non-space characters in the after body phase.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     "XX"
+
+#data
+<!DOCTYPE html>X</html> 
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     "X "
+
+#data
+<!DOCTYPE html>X</html><p>X
+#errors
+Line: 1 Col: 26 Unexpected start tag (p).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     "X"
+|     <p>
+|       "X"
+
+#data
+<!DOCTYPE html>X<p/x/y/z>
+#errors
+Line: 1 Col: 19 Expected a > after the /.
+Line: 1 Col: 21 Solidus (/) incorrectly placed in tag.
+Line: 1 Col: 23 Solidus (/) incorrectly placed in tag.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     "X"
+|     <p>
+|       x=""
+|       y=""
+|       z=""
+
+#data
+<!DOCTYPE html><!--x--
+#errors
+Line: 1 Col: 22 Unexpected end of file in comment (--).
+#document
+| <!DOCTYPE html>
+| <!-- x -->
+| <html>
+|   <head>
+|   <body>
+
+#data
+<!DOCTYPE html><table><tr><td></p></table>
+#errors
+Line: 1 Col: 34 Unexpected end tag (p). Ignored.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             <p>
+
+#data
+<!DOCTYPE <!DOCTYPE HTML>><!--<!--x-->-->
+#errors
+Line: 1 Col: 20 Expected space or '>'. Got ''
+Line: 1 Col: 25 Erroneous DOCTYPE.
+Line: 1 Col: 35 Unexpected character in comment found.
+#document
+| <!DOCTYPE <!doctype>
+| <html>
+|   <head>
+|   <body>
+|     ">"
+|     <!-- <!--x -->
+|     "-->"
+
+#data
+<!doctype html><div><form></form><div></div></div>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       <form>
+|       <div>
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests20.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests20.dat
new file mode 100644
index 00000000..6bd82560
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests20.dat
@@ -0,0 +1,455 @@
+#data
+<!doctype html><p><button><button>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <button>
+|       <button>
+
+#data
+<!doctype html><p><button><address>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <button>
+|         <address>
+
+#data
+<!doctype html><p><button><blockquote>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <button>
+|         <blockquote>
+
+#data
+<!doctype html><p><button><menu>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <button>
+|         <menu>
+
+#data
+<!doctype html><p><button><p>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <button>
+|         <p>
+
+#data
+<!doctype html><p><button><ul>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <button>
+|         <ul>
+
+#data
+<!doctype html><p><button><h1>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <button>
+|         <h1>
+
+#data
+<!doctype html><p><button><h6>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <button>
+|         <h6>
+
+#data
+<!doctype html><p><button><listing>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <button>
+|         <listing>
+
+#data
+<!doctype html><p><button><pre>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <button>
+|         <pre>
+
+#data
+<!doctype html><p><button><form>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <button>
+|         <form>
+
+#data
+<!doctype html><p><button><li>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <button>
+|         <li>
+
+#data
+<!doctype html><p><button><dd>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <button>
+|         <dd>
+
+#data
+<!doctype html><p><button><dt>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <button>
+|         <dt>
+
+#data
+<!doctype html><p><button><plaintext>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <button>
+|         <plaintext>
+
+#data
+<!doctype html><p><button><table>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <button>
+|         <table>
+
+#data
+<!doctype html><p><button><hr>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <button>
+|         <hr>
+
+#data
+<!doctype html><p><button><xmp>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <button>
+|         <xmp>
+
+#data
+<!doctype html><p><button></p>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <button>
+|         <p>
+
+#data
+<!doctype html><address><button></address>a
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <address>
+|       <button>
+|     "a"
+
+#data
+<!doctype html><address><button></address>a
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <address>
+|       <button>
+|     "a"
+
+#data
+<p><table></p>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <p>
+|       <table>
+
+#data
+<!doctype html><svg>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+
+#data
+<!doctype html><p><figcaption>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|     <figcaption>
+
+#data
+<!doctype html><p><summary>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|     <summary>
+
+#data
+<!doctype html><form><table><form>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <form>
+|       <table>
+
+#data
+<!doctype html><table><form><form>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <form>
+
+#data
+<!doctype html><table><form></table><form>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <form>
+
+#data
+<!doctype html><svg><foreignObject><p>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       <svg foreignObject>
+|         <p>
+
+#data
+<!doctype html><svg><title>abc
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       <svg title>
+|         "abc"
+
+#data
+<option><span><option>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <option>
+|       <span>
+|         <option>
+
+#data
+<option><option>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <option>
+|     <option>
+
+#data
+<math><annotation-xml><div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       <math annotation-xml>
+|     <div>
+
+#data
+<math><annotation-xml encoding="application/svg+xml"><div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       <math annotation-xml>
+|         encoding="application/svg+xml"
+|     <div>
+
+#data
+<math><annotation-xml encoding="application/xhtml+xml"><div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       <math annotation-xml>
+|         encoding="application/xhtml+xml"
+|         <div>
+
+#data
+<math><annotation-xml encoding="aPPlication/xhtmL+xMl"><div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       <math annotation-xml>
+|         encoding="aPPlication/xhtmL+xMl"
+|         <div>
+
+#data
+<math><annotation-xml encoding="text/html"><div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       <math annotation-xml>
+|         encoding="text/html"
+|         <div>
+
+#data
+<math><annotation-xml encoding="Text/htmL"><div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       <math annotation-xml>
+|         encoding="Text/htmL"
+|         <div>
+
+#data
+<math><annotation-xml encoding=" text/html "><div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       <math annotation-xml>
+|         encoding=" text/html "
+|     <div>
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests21.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests21.dat
new file mode 100644
index 00000000..1260ec03
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests21.dat
@@ -0,0 +1,221 @@
+#data
+<svg><![CDATA[foo]]>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       "foo"
+
+#data
+<math><![CDATA[foo]]>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       "foo"
+
+#data
+<div><![CDATA[foo]]>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       <!-- [CDATA[foo]] -->
+
+#data
+<svg><![CDATA[foo
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       "foo"
+
+#data
+<svg><![CDATA[foo
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       "foo"
+
+#data
+<svg><![CDATA[
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+
+#data
+<svg><![CDATA[]]>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+
+#data
+<svg><![CDATA[]] >]]>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       "]] >"
+
+#data
+<svg><![CDATA[]] >]]>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       "]] >"
+
+#data
+<svg><![CDATA[]]
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       "]]"
+
+#data
+<svg><![CDATA[]
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       "]"
+
+#data
+<svg><![CDATA[]>a
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       "]>a"
+
+#data
+<svg><foreignObject><div><![CDATA[foo]]>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       <svg foreignObject>
+|         <div>
+|           <!-- [CDATA[foo]] -->
+
+#data
+<svg><![CDATA[<svg>]]>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       "<svg>"
+
+#data
+<svg><![CDATA[</svg>a]]>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       "</svg>a"
+
+#data
+<svg><![CDATA[<svg>a
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       "<svg>a"
+
+#data
+<svg><![CDATA[</svg>a
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       "</svg>a"
+
+#data
+<svg><![CDATA[<svg>]]><path>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       "<svg>"
+|       <svg path>
+
+#data
+<svg><![CDATA[<svg>]]></path>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       "<svg>"
+
+#data
+<svg><![CDATA[<svg>]]><!--path-->
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       "<svg>"
+|       <!-- path -->
+
+#data
+<svg><![CDATA[<svg>]]>path
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       "<svg>path"
+
+#data
+<svg><![CDATA[<!--svg-->]]>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       "<!--svg-->"
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests22.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests22.dat
new file mode 100644
index 00000000..aab27b2e
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests22.dat
@@ -0,0 +1,157 @@
+#data
+<a><b><big><em><strong><div>X</a>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <a>
+|       <b>
+|         <big>
+|           <em>
+|             <strong>
+|     <big>
+|       <em>
+|         <strong>
+|           <div>
+|             <a>
+|               "X"
+
+#data
+<a><b><div id=1><div id=2><div id=3><div id=4><div id=5><div id=6><div id=7><div id=8>A</a>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <a>
+|       <b>
+|     <b>
+|       <div>
+|         id="1"
+|         <a>
+|         <div>
+|           id="2"
+|           <a>
+|           <div>
+|             id="3"
+|             <a>
+|             <div>
+|               id="4"
+|               <a>
+|               <div>
+|                 id="5"
+|                 <a>
+|                 <div>
+|                   id="6"
+|                   <a>
+|                   <div>
+|                     id="7"
+|                     <a>
+|                     <div>
+|                       id="8"
+|                       <a>
+|                         "A"
+
+#data
+<a><b><div id=1><div id=2><div id=3><div id=4><div id=5><div id=6><div id=7><div id=8><div id=9>A</a>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <a>
+|       <b>
+|     <b>
+|       <div>
+|         id="1"
+|         <a>
+|         <div>
+|           id="2"
+|           <a>
+|           <div>
+|             id="3"
+|             <a>
+|             <div>
+|               id="4"
+|               <a>
+|               <div>
+|                 id="5"
+|                 <a>
+|                 <div>
+|                   id="6"
+|                   <a>
+|                   <div>
+|                     id="7"
+|                     <a>
+|                     <div>
+|                       id="8"
+|                       <a>
+|                         <div>
+|                           id="9"
+|                           "A"
+
+#data
+<a><b><div id=1><div id=2><div id=3><div id=4><div id=5><div id=6><div id=7><div id=8><div id=9><div id=10>A</a>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <a>
+|       <b>
+|     <b>
+|       <div>
+|         id="1"
+|         <a>
+|         <div>
+|           id="2"
+|           <a>
+|           <div>
+|             id="3"
+|             <a>
+|             <div>
+|               id="4"
+|               <a>
+|               <div>
+|                 id="5"
+|                 <a>
+|                 <div>
+|                   id="6"
+|                   <a>
+|                   <div>
+|                     id="7"
+|                     <a>
+|                     <div>
+|                       id="8"
+|                       <a>
+|                         <div>
+|                           id="9"
+|                           <div>
+|                             id="10"
+|                             "A"
+
+#data
+<cite><b><cite><i><cite><i><cite><i><div>X</b>TEST
+#errors
+Line: 1 Col: 6 Unexpected start tag (cite). Expected DOCTYPE.
+Line: 1 Col: 46 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
+Line: 1 Col: 50 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <cite>
+|       <b>
+|         <cite>
+|           <i>
+|             <cite>
+|               <i>
+|                 <cite>
+|                   <i>
+|       <i>
+|         <i>
+|           <div>
+|             <b>
+|               "X"
+|             "TEST"
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests23.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests23.dat
new file mode 100644
index 00000000..34d2a73f
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests23.dat
@@ -0,0 +1,155 @@
+#data
+<p><font size=4><font color=red><font size=4><font size=4><font size=4><font size=4><font size=4><font color=red><p>X
+#errors
+3: Start tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
+116: Unclosed elements.
+117: End of file seen and there were open elements.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <font>
+|         size="4"
+|         <font>
+|           color="red"
+|           <font>
+|             size="4"
+|             <font>
+|               size="4"
+|               <font>
+|                 size="4"
+|                 <font>
+|                   size="4"
+|                   <font>
+|                     size="4"
+|                     <font>
+|                       color="red"
+|     <p>
+|       <font>
+|         color="red"
+|         <font>
+|           size="4"
+|           <font>
+|             size="4"
+|             <font>
+|               size="4"
+|               <font>
+|                 color="red"
+|                 "X"
+
+#data
+<p><font size=4><font size=4><font size=4><font size=4><p>X
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <font>
+|         size="4"
+|         <font>
+|           size="4"
+|           <font>
+|             size="4"
+|             <font>
+|               size="4"
+|     <p>
+|       <font>
+|         size="4"
+|         <font>
+|           size="4"
+|           <font>
+|             size="4"
+|             "X"
+
+#data
+<p><font size=4><font size=4><font size=4><font size="5"><font size=4><p>X
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <font>
+|         size="4"
+|         <font>
+|           size="4"
+|           <font>
+|             size="4"
+|             <font>
+|               size="5"
+|               <font>
+|                 size="4"
+|     <p>
+|       <font>
+|         size="4"
+|         <font>
+|           size="4"
+|           <font>
+|             size="5"
+|             <font>
+|               size="4"
+|               "X"
+
+#data
+<p><font size=4 id=a><font size=4 id=b><font size=4><font size=4><p>X
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <font>
+|         id="a"
+|         size="4"
+|         <font>
+|           id="b"
+|           size="4"
+|           <font>
+|             size="4"
+|             <font>
+|               size="4"
+|     <p>
+|       <font>
+|         id="a"
+|         size="4"
+|         <font>
+|           id="b"
+|           size="4"
+|           <font>
+|             size="4"
+|             <font>
+|               size="4"
+|               "X"
+
+#data
+<p><b id=a><b id=a><b id=a><b><object><b id=a><b id=a>X</object><p>Y
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <b>
+|         id="a"
+|         <b>
+|           id="a"
+|           <b>
+|             id="a"
+|             <b>
+|               <object>
+|                 <b>
+|                   id="a"
+|                   <b>
+|                     id="a"
+|                     "X"
+|     <p>
+|       <b>
+|         id="a"
+|         <b>
+|           id="a"
+|           <b>
+|             id="a"
+|             <b>
+|               "Y"
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests24.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests24.dat
new file mode 100644
index 00000000..f6dc7eb4
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests24.dat
@@ -0,0 +1,79 @@
+#data
+<!DOCTYPE html>&NotEqualTilde;
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     "≂̸"
+
+#data
+<!DOCTYPE html>&NotEqualTilde;A
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     "≂̸A"
+
+#data
+<!DOCTYPE html>&ThickSpace;
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     "  "
+
+#data
+<!DOCTYPE html>&ThickSpace;A
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     "  A"
+
+#data
+<!DOCTYPE html>&NotSubset;
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     "⊂⃒"
+
+#data
+<!DOCTYPE html>&NotSubset;A
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     "⊂⃒A"
+
+#data
+<!DOCTYPE html>&Gopf;
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     "𝔾"
+
+#data
+<!DOCTYPE html>&Gopf;A
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     "𝔾A"
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests25.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests25.dat
new file mode 100644
index 00000000..00de7295
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests25.dat
@@ -0,0 +1,219 @@
+#data
+<!DOCTYPE html><body><foo>A
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <foo>
+|       "A"
+
+#data
+<!DOCTYPE html><body><area>A
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <area>
+|     "A"
+
+#data
+<!DOCTYPE html><body><base>A
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <base>
+|     "A"
+
+#data
+<!DOCTYPE html><body><basefont>A
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <basefont>
+|     "A"
+
+#data
+<!DOCTYPE html><body><bgsound>A
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <bgsound>
+|     "A"
+
+#data
+<!DOCTYPE html><body><br>A
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <br>
+|     "A"
+
+#data
+<!DOCTYPE html><body><col>A
+#errors
+26: Stray start tag “col”.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     "A"
+
+#data
+<!DOCTYPE html><body><command>A
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <command>
+|     "A"
+
+#data
+<!DOCTYPE html><body><embed>A
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <embed>
+|     "A"
+
+#data
+<!DOCTYPE html><body><frame>A
+#errors
+26: Stray start tag “frame”.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     "A"
+
+#data
+<!DOCTYPE html><body><hr>A
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <hr>
+|     "A"
+
+#data
+<!DOCTYPE html><body><img>A
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <img>
+|     "A"
+
+#data
+<!DOCTYPE html><body><input>A
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <input>
+|     "A"
+
+#data
+<!DOCTYPE html><body><keygen>A
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <keygen>
+|     "A"
+
+#data
+<!DOCTYPE html><body><link>A
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <link>
+|     "A"
+
+#data
+<!DOCTYPE html><body><meta>A
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <meta>
+|     "A"
+
+#data
+<!DOCTYPE html><body><param>A
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <param>
+|     "A"
+
+#data
+<!DOCTYPE html><body><source>A
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <source>
+|     "A"
+
+#data
+<!DOCTYPE html><body><track>A
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <track>
+|     "A"
+
+#data
+<!DOCTYPE html><body><wbr>A
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <wbr>
+|     "A"
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests26.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests26.dat
new file mode 100644
index 00000000..fae11ffd
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests26.dat
@@ -0,0 +1,313 @@
+#data
+<!DOCTYPE html><body><a href='#1'><nobr>1<nobr></a><br><a href='#2'><nobr>2<nobr></a><br><a href='#3'><nobr>3<nobr></a>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <a>
+|       href="#1"
+|       <nobr>
+|         "1"
+|       <nobr>
+|     <nobr>
+|       <br>
+|       <a>
+|         href="#2"
+|     <a>
+|       href="#2"
+|       <nobr>
+|         "2"
+|       <nobr>
+|     <nobr>
+|       <br>
+|       <a>
+|         href="#3"
+|     <a>
+|       href="#3"
+|       <nobr>
+|         "3"
+|       <nobr>
+
+#data
+<!DOCTYPE html><body><b><nobr>1<nobr></b><i><nobr>2<nobr></i>3
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <b>
+|       <nobr>
+|         "1"
+|       <nobr>
+|     <nobr>
+|       <i>
+|     <i>
+|       <nobr>
+|         "2"
+|       <nobr>
+|     <nobr>
+|       "3"
+
+#data
+<!DOCTYPE html><body><b><nobr>1<table><nobr></b><i><nobr>2<nobr></i>3
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <b>
+|       <nobr>
+|         "1"
+|         <nobr>
+|           <i>
+|         <i>
+|           <nobr>
+|             "2"
+|           <nobr>
+|         <nobr>
+|           "3"
+|         <table>
+
+#data
+<!DOCTYPE html><body><b><nobr>1<table><tr><td><nobr></b><i><nobr>2<nobr></i>3
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <b>
+|       <nobr>
+|         "1"
+|         <table>
+|           <tbody>
+|             <tr>
+|               <td>
+|                 <nobr>
+|                   <i>
+|                 <i>
+|                   <nobr>
+|                     "2"
+|                   <nobr>
+|                 <nobr>
+|                   "3"
+
+#data
+<!DOCTYPE html><body><b><nobr>1<div><nobr></b><i><nobr>2<nobr></i>3
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <b>
+|       <nobr>
+|         "1"
+|     <div>
+|       <b>
+|         <nobr>
+|         <nobr>
+|       <nobr>
+|         <i>
+|       <i>
+|         <nobr>
+|           "2"
+|         <nobr>
+|       <nobr>
+|         "3"
+
+#data
+<!DOCTYPE html><body><b><nobr>1<nobr></b><div><i><nobr>2<nobr></i>3
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <b>
+|       <nobr>
+|         "1"
+|       <nobr>
+|     <div>
+|       <nobr>
+|         <i>
+|       <i>
+|         <nobr>
+|           "2"
+|         <nobr>
+|       <nobr>
+|         "3"
+
+#data
+<!DOCTYPE html><body><b><nobr>1<nobr><ins></b><i><nobr>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <b>
+|       <nobr>
+|         "1"
+|       <nobr>
+|         <ins>
+|     <nobr>
+|       <i>
+|     <i>
+|       <nobr>
+
+#data
+<!DOCTYPE html><body><b><nobr>1<ins><nobr></b><i>2
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <b>
+|       <nobr>
+|         "1"
+|         <ins>
+|       <nobr>
+|     <nobr>
+|       <i>
+|         "2"
+
+#data
+<!DOCTYPE html><body><b>1<nobr></b><i><nobr>2</i>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <b>
+|       "1"
+|       <nobr>
+|     <nobr>
+|       <i>
+|     <i>
+|       <nobr>
+|         "2"
+
+#data
+<p><code x</code></p>
+
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <code>
+|         code=""
+|         x<=""
+|     <code>
+|       code=""
+|       x<=""
+|       "
+"
+
+#data
+<!DOCTYPE html><svg><foreignObject><p><i></p>a
+#errors
+45: End tag “p” seen, but there were open elements.
+41: Unclosed element “i”.
+46: End of file seen and there were open elements.
+35: Unclosed element “foreignObject”.
+20: Unclosed element “svg”.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       <svg foreignObject>
+|         <p>
+|           <i>
+|         <i>
+|           "a"
+
+#data
+<!DOCTYPE html><table><tr><td><svg><foreignObject><p><i></p>a
+#errors
+56: End tag “p” seen, but there were open elements.
+52: Unclosed element “i”.
+57: End of file seen and there were open elements.
+46: Unclosed element “foreignObject”.
+31: Unclosed element “svg”.
+22: Unclosed element “table”.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             <svg svg>
+|               <svg foreignObject>
+|                 <p>
+|                   <i>
+|                 <i>
+|                   "a"
+
+#data
+<!DOCTYPE html><math><mtext><p><i></p>a
+#errors
+38: End tag “p” seen, but there were open elements.
+34: Unclosed element “i”.
+39: End of file in a foreign namespace context.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       <math mtext>
+|         <p>
+|           <i>
+|         <i>
+|           "a"
+
+#data
+<!DOCTYPE html><table><tr><td><math><mtext><p><i></p>a
+#errors
+53: End tag “p” seen, but there were open elements.
+49: Unclosed element “i”.
+54: End of file in a foreign namespace context.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             <math math>
+|               <math mtext>
+|                 <p>
+|                   <i>
+|                 <i>
+|                   "a"
+
+#data
+<!DOCTYPE html><body><div><!/div>a
+#errors
+29: Bogus comment.
+34: End of file seen and there were open elements.
+26: Unclosed element “div”.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       <!-- /div -->
+|       "a"
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests3.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests3.dat
new file mode 100644
index 00000000..38dc501b
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests3.dat
@@ -0,0 +1,305 @@
+#data
+<head></head><style></style>
+#errors
+Line: 1 Col: 6 Unexpected start tag (head). Expected DOCTYPE.
+Line: 1 Col: 20 Unexpected start tag (style) that can be in head. Moved.
+#document
+| <html>
+|   <head>
+|     <style>
+|   <body>
+
+#data
+<head></head><script></script>
+#errors
+Line: 1 Col: 6 Unexpected start tag (head). Expected DOCTYPE.
+Line: 1 Col: 21 Unexpected start tag (script) that can be in head. Moved.
+#document
+| <html>
+|   <head>
+|     <script>
+|   <body>
+
+#data
+<head></head><!-- --><style></style><!-- --><script></script>
+#errors
+Line: 1 Col: 6 Unexpected start tag (head). Expected DOCTYPE.
+Line: 1 Col: 28 Unexpected start tag (style) that can be in head. Moved.
+#document
+| <html>
+|   <head>
+|     <style>
+|     <script>
+|   <!--   -->
+|   <!--   -->
+|   <body>
+
+#data
+<head></head><!-- -->x<style></style><!-- --><script></script>
+#errors
+Line: 1 Col: 6 Unexpected start tag (head). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <!--   -->
+|   <body>
+|     "x"
+|     <style>
+|     <!--   -->
+|     <script>
+
+#data
+<!DOCTYPE html><html><head></head><body><pre>
+</pre></body></html>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <pre>
+
+#data
+<!DOCTYPE html><html><head></head><body><pre>
+foo</pre></body></html>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <pre>
+|       "foo"
+
+#data
+<!DOCTYPE html><html><head></head><body><pre>
+
+foo</pre></body></html>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <pre>
+|       "
+foo"
+
+#data
+<!DOCTYPE html><html><head></head><body><pre>
+foo
+</pre></body></html>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <pre>
+|       "foo
+"
+
+#data
+<!DOCTYPE html><html><head></head><body><pre>x</pre><span>
+</span></body></html>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <pre>
+|       "x"
+|     <span>
+|       "
+"
+
+#data
+<!DOCTYPE html><html><head></head><body><pre>x
+y</pre></body></html>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <pre>
+|       "x
+y"
+
+#data
+<!DOCTYPE html><html><head></head><body><pre>x<div>
+y</pre></body></html>
+#errors
+Line: 2 Col: 7 End tag (pre) seen too early. Expected other end tag.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <pre>
+|       "x"
+|       <div>
+|         "
+y"
+
+#data
+<!DOCTYPE html><pre>&#x0a;&#x0a;A</pre>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <pre>
+|       "
+A"
+
+#data
+<!DOCTYPE html><HTML><META><HEAD></HEAD></HTML>
+#errors
+Line: 1 Col: 33 Unexpected start tag head in existing head. Ignored.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <meta>
+|   <body>
+
+#data
+<!DOCTYPE html><HTML><HEAD><head></HEAD></HTML>
+#errors
+Line: 1 Col: 33 Unexpected start tag head in existing head. Ignored.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+
+#data
+<textarea>foo<span>bar</span><i>baz
+#errors
+Line: 1 Col: 10 Unexpected start tag (textarea). Expected DOCTYPE.
+Line: 1 Col: 35 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <textarea>
+|       "foo<span>bar</span><i>baz"
+
+#data
+<title>foo<span>bar</em><i>baz
+#errors
+Line: 1 Col: 7 Unexpected start tag (title). Expected DOCTYPE.
+Line: 1 Col: 30 Unexpected end of file. Expected end tag (title).
+#document
+| <html>
+|   <head>
+|     <title>
+|       "foo<span>bar</em><i>baz"
+|   <body>
+
+#data
+<!DOCTYPE html><textarea>
+</textarea>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <textarea>
+
+#data
+<!DOCTYPE html><textarea>
+foo</textarea>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <textarea>
+|       "foo"
+
+#data
+<!DOCTYPE html><textarea>
+
+foo</textarea>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <textarea>
+|       "
+foo"
+
+#data
+<!DOCTYPE html><html><head></head><body><ul><li><div><p><li></ul></body></html>
+#errors
+Line: 1 Col: 60 Missing end tag (div, li).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <ul>
+|       <li>
+|         <div>
+|           <p>
+|       <li>
+
+#data
+<!doctype html><nobr><nobr><nobr>
+#errors
+Line: 1 Col: 27 Unexpected start tag (nobr) implies end tag (nobr).
+Line: 1 Col: 33 Unexpected start tag (nobr) implies end tag (nobr).
+Line: 1 Col: 33 Expected closing tag. Unexpected end of file.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <nobr>
+|     <nobr>
+|     <nobr>
+
+#data
+<!doctype html><nobr><nobr></nobr><nobr>
+#errors
+Line: 1 Col: 27 Unexpected start tag (nobr) implies end tag (nobr).
+Line: 1 Col: 40 Expected closing tag. Unexpected end of file.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <nobr>
+|     <nobr>
+|     <nobr>
+
+#data
+<!doctype html><html><body><p><table></table></body></html>
+#errors
+Not known
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|     <table>
+
+#data
+<p><table></table>
+#errors
+Not known
+#document
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <table>
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests4.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests4.dat
new file mode 100644
index 00000000..3c506326
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests4.dat
@@ -0,0 +1,59 @@
+#data
+direct div content
+#errors
+#document-fragment
+div
+#document
+| "direct div content"
+
+#data
+direct textarea content
+#errors
+#document-fragment
+textarea
+#document
+| "direct textarea content"
+
+#data
+textarea content with <em>pseudo</em> <foo>markup
+#errors
+#document-fragment
+textarea
+#document
+| "textarea content with <em>pseudo</em> <foo>markup"
+
+#data
+this is &#x0043;DATA inside a <style> element
+#errors
+#document-fragment
+style
+#document
+| "this is &#x0043;DATA inside a <style> element"
+
+#data
+</plaintext>
+#errors
+#document-fragment
+plaintext
+#document
+| "</plaintext>"
+
+#data
+setting html's innerHTML
+#errors
+Line: 1 Col: 24 Unexpected EOF in inner html mode.
+#document-fragment
+html
+#document
+| <head>
+| <body>
+|   "setting html's innerHTML"
+
+#data
+<title>setting head's innerHTML</title>
+#errors
+#document-fragment
+head
+#document
+| <title>
+|   "setting head's innerHTML"
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests5.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests5.dat
new file mode 100644
index 00000000..d7b5128a
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests5.dat
@@ -0,0 +1,191 @@
+#data
+<style> <!-- </style>x
+#errors
+Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
+Line: 1 Col: 22 Unexpected end of file. Expected end tag (style).
+#document
+| <html>
+|   <head>
+|     <style>
+|       " <!-- "
+|   <body>
+|     "x"
+
+#data
+<style> <!-- </style> --> </style>x
+#errors
+Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|     <style>
+|       " <!-- "
+|     " "
+|   <body>
+|     "--> x"
+
+#data
+<style> <!--> </style>x
+#errors
+Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|     <style>
+|       " <!--> "
+|   <body>
+|     "x"
+
+#data
+<style> <!---> </style>x
+#errors
+Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|     <style>
+|       " <!---> "
+|   <body>
+|     "x"
+
+#data
+<iframe> <!---> </iframe>x
+#errors
+Line: 1 Col: 8 Unexpected start tag (iframe). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <iframe>
+|       " <!---> "
+|     "x"
+
+#data
+<iframe> <!--- </iframe>->x</iframe> --> </iframe>x
+#errors
+Line: 1 Col: 8 Unexpected start tag (iframe). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <iframe>
+|       " <!--- "
+|     "->x --> x"
+
+#data
+<script> <!-- </script> --> </script>x
+#errors
+Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|     <script>
+|       " <!-- "
+|     " "
+|   <body>
+|     "--> x"
+
+#data
+<title> <!-- </title> --> </title>x
+#errors
+Line: 1 Col: 7 Unexpected start tag (title). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|     <title>
+|       " <!-- "
+|     " "
+|   <body>
+|     "--> x"
+
+#data
+<textarea> <!--- </textarea>->x</textarea> --> </textarea>x
+#errors
+Line: 1 Col: 10 Unexpected start tag (textarea). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <textarea>
+|       " <!--- "
+|     "->x --> x"
+
+#data
+<style> <!</-- </style>x
+#errors
+Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|     <style>
+|       " <!</-- "
+|   <body>
+|     "x"
+
+#data
+<p><xmp></xmp>
+#errors
+XXX: Unknown
+#document
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|     <xmp>
+
+#data
+<xmp> <!-- > --> </xmp>
+#errors
+Line: 1 Col: 5 Unexpected start tag (xmp). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <xmp>
+|       " <!-- > --> "
+
+#data
+<title>&amp;</title>
+#errors
+Line: 1 Col: 7 Unexpected start tag (title). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|     <title>
+|       "&"
+|   <body>
+
+#data
+<title><!--&amp;--></title>
+#errors
+Line: 1 Col: 7 Unexpected start tag (title). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|     <title>
+|       "<!--&-->"
+|   <body>
+
+#data
+<title><!--</title>
+#errors
+Line: 1 Col: 7 Unexpected start tag (title). Expected DOCTYPE.
+Line: 1 Col: 19 Unexpected end of file. Expected end tag (title).
+#document
+| <html>
+|   <head>
+|     <title>
+|       "<!--"
+|   <body>
+
+#data
+<noscript><!--</noscript>--></noscript>
+#errors
+Line: 1 Col: 10 Unexpected start tag (noscript). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|     <noscript>
+|       "<!--"
+|   <body>
+|     "-->"
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests6.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests6.dat
new file mode 100644
index 00000000..f28ece4f
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests6.dat
@@ -0,0 +1,663 @@
+#data
+<!doctype html></head> <head>
+#errors
+Line: 1 Col: 29 Unexpected start tag head. Ignored.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   " "
+|   <body>
+
+#data
+<!doctype html><form><div></form><div>
+#errors
+33: End tag "form" seen but there were unclosed elements.
+38: End of file seen and there were open elements.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <form>
+|       <div>
+|         <div>
+
+#data
+<!doctype html><title>&amp;</title>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <title>
+|       "&"
+|   <body>
+
+#data
+<!doctype html><title><!--&amp;--></title>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <title>
+|       "<!--&-->"
+|   <body>
+
+#data
+<!doctype>
+#errors
+Line: 1 Col: 9 No space after literal string 'DOCTYPE'.
+Line: 1 Col: 10 Unexpected > character. Expected DOCTYPE name.
+Line: 1 Col: 10 Erroneous DOCTYPE.
+#document
+| <!DOCTYPE >
+| <html>
+|   <head>
+|   <body>
+
+#data
+<!---x
+#errors
+Line: 1 Col: 6 Unexpected end of file in comment.
+Line: 1 Col: 6 Unexpected End of file. Expected DOCTYPE.
+#document
+| <!-- -x -->
+| <html>
+|   <head>
+|   <body>
+
+#data
+<body>
+<div>
+#errors
+Line: 1 Col: 6 Unexpected start tag (body).
+Line: 2 Col: 5 Expected closing tag. Unexpected end of file.
+#document-fragment
+div
+#document
+| "
+"
+| <div>
+
+#data
+<frameset></frameset>
+foo
+#errors
+Line: 1 Col: 10 Unexpected start tag (frameset). Expected DOCTYPE.
+Line: 2 Col: 3 Unexpected non-space characters in the after frameset phase. Ignored.
+#document
+| <html>
+|   <head>
+|   <frameset>
+|   "
+"
+
+#data
+<frameset></frameset>
+<noframes>
+#errors
+Line: 1 Col: 10 Unexpected start tag (frameset). Expected DOCTYPE.
+Line: 2 Col: 10 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <frameset>
+|   "
+"
+|   <noframes>
+
+#data
+<frameset></frameset>
+<div>
+#errors
+Line: 1 Col: 10 Unexpected start tag (frameset). Expected DOCTYPE.
+Line: 2 Col: 5 Unexpected start tag (div) in the after frameset phase. Ignored.
+#document
+| <html>
+|   <head>
+|   <frameset>
+|   "
+"
+
+#data
+<frameset></frameset>
+</html>
+#errors
+Line: 1 Col: 10 Unexpected start tag (frameset). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <frameset>
+|   "
+"
+
+#data
+<frameset></frameset>
+</div>
+#errors
+Line: 1 Col: 10 Unexpected start tag (frameset). Expected DOCTYPE.
+Line: 2 Col: 6 Unexpected end tag (div) in the after frameset phase. Ignored.
+#document
+| <html>
+|   <head>
+|   <frameset>
+|   "
+"
+
+#data
+<form><form>
+#errors
+Line: 1 Col: 6 Unexpected start tag (form). Expected DOCTYPE.
+Line: 1 Col: 12 Unexpected start tag (form).
+Line: 1 Col: 12 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <form>
+
+#data
+<button><button>
+#errors
+Line: 1 Col: 8 Unexpected start tag (button). Expected DOCTYPE.
+Line: 1 Col: 16 Unexpected start tag (button) implies end tag (button).
+Line: 1 Col: 16 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <button>
+|     <button>
+
+#data
+<table><tr><td></th>
+#errors
+Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+Line: 1 Col: 20 Unexpected end tag (th). Ignored.
+Line: 1 Col: 20 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+
+#data
+<table><caption><td>
+#errors
+Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+Line: 1 Col: 20 Unexpected end tag (td). Ignored.
+Line: 1 Col: 20 Unexpected table cell start tag (td) in the table body phase.
+Line: 1 Col: 20 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <caption>
+|       <tbody>
+|         <tr>
+|           <td>
+
+#data
+<table><caption><div>
+#errors
+Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+Line: 1 Col: 21 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <caption>
+|         <div>
+
+#data
+</caption><div>
+#errors
+Line: 1 Col: 10 Unexpected end tag (caption). Ignored.
+Line: 1 Col: 15 Expected closing tag. Unexpected end of file.
+#document-fragment
+caption
+#document
+| <div>
+
+#data
+<table><caption><div></caption>
+#errors
+Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+Line: 1 Col: 31 Unexpected end tag (caption). Missing end tag (div).
+Line: 1 Col: 31 Unexpected end of file. Expected table content.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <caption>
+|         <div>
+
+#data
+<table><caption></table>
+#errors
+Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+Line: 1 Col: 24 Unexpected end table tag in caption. Generates implied end caption.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <caption>
+
+#data
+</table><div>
+#errors
+Line: 1 Col: 8 Unexpected end table tag in caption. Generates implied end caption.
+Line: 1 Col: 8 Unexpected end tag (caption). Ignored.
+Line: 1 Col: 13 Expected closing tag. Unexpected end of file.
+#document-fragment
+caption
+#document
+| <div>
+
+#data
+<table><caption></body></col></colgroup></html></tbody></td></tfoot></th></thead></tr>
+#errors
+Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+Line: 1 Col: 23 Unexpected end tag (body). Ignored.
+Line: 1 Col: 29 Unexpected end tag (col). Ignored.
+Line: 1 Col: 40 Unexpected end tag (colgroup). Ignored.
+Line: 1 Col: 47 Unexpected end tag (html). Ignored.
+Line: 1 Col: 55 Unexpected end tag (tbody). Ignored.
+Line: 1 Col: 60 Unexpected end tag (td). Ignored.
+Line: 1 Col: 68 Unexpected end tag (tfoot). Ignored.
+Line: 1 Col: 73 Unexpected end tag (th). Ignored.
+Line: 1 Col: 81 Unexpected end tag (thead). Ignored.
+Line: 1 Col: 86 Unexpected end tag (tr). Ignored.
+Line: 1 Col: 86 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <caption>
+
+#data
+<table><caption><div></div>
+#errors
+Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+Line: 1 Col: 27 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <caption>
+|         <div>
+
+#data
+<table><tr><td></body></caption></col></colgroup></html>
+#errors
+Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+Line: 1 Col: 22 Unexpected end tag (body). Ignored.
+Line: 1 Col: 32 Unexpected end tag (caption). Ignored.
+Line: 1 Col: 38 Unexpected end tag (col). Ignored.
+Line: 1 Col: 49 Unexpected end tag (colgroup). Ignored.
+Line: 1 Col: 56 Unexpected end tag (html). Ignored.
+Line: 1 Col: 56 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+
+#data
+</table></tbody></tfoot></thead></tr><div>
+#errors
+Line: 1 Col: 8 Unexpected end tag (table). Ignored.
+Line: 1 Col: 16 Unexpected end tag (tbody). Ignored.
+Line: 1 Col: 24 Unexpected end tag (tfoot). Ignored.
+Line: 1 Col: 32 Unexpected end tag (thead). Ignored.
+Line: 1 Col: 37 Unexpected end tag (tr). Ignored.
+Line: 1 Col: 42 Expected closing tag. Unexpected end of file.
+#document-fragment
+td
+#document
+| <div>
+
+#data
+<table><colgroup>foo
+#errors
+Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+Line: 1 Col: 20 Unexpected non-space characters in table context caused voodoo mode.
+Line: 1 Col: 20 Unexpected end of file. Expected table content.
+#document
+| <html>
+|   <head>
+|   <body>
+|     "foo"
+|     <table>
+|       <colgroup>
+
+#data
+foo<col>
+#errors
+Line: 1 Col: 3 Unexpected end tag (colgroup). Ignored.
+#document-fragment
+colgroup
+#document
+| <col>
+
+#data
+<table><colgroup></col>
+#errors
+Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+Line: 1 Col: 23 This element (col) has no end tag.
+Line: 1 Col: 23 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <colgroup>
+
+#data
+<frameset><div>
+#errors
+Line: 1 Col: 10 Unexpected start tag (frameset). Expected DOCTYPE.
+Line: 1 Col: 15 Unexpected start tag token (div) in the frameset phase. Ignored.
+Line: 1 Col: 15 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <frameset>
+
+#data
+</frameset><frame>
+#errors
+Line: 1 Col: 11 Unexpected end tag token (frameset) in the frameset phase (innerHTML).
+#document-fragment
+frameset
+#document
+| <frame>
+
+#data
+<frameset></div>
+#errors
+Line: 1 Col: 10 Unexpected start tag (frameset). Expected DOCTYPE.
+Line: 1 Col: 16 Unexpected end tag token (div) in the frameset phase. Ignored.
+Line: 1 Col: 16 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <frameset>
+
+#data
+</body><div>
+#errors
+Line: 1 Col: 7 Unexpected end tag (body). Ignored.
+Line: 1 Col: 12 Expected closing tag. Unexpected end of file.
+#document-fragment
+body
+#document
+| <div>
+
+#data
+<table><tr><div>
+#errors
+Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+Line: 1 Col: 16 Unexpected start tag (div) in table context caused voodoo mode.
+Line: 1 Col: 16 Unexpected end of file. Expected table content.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|     <table>
+|       <tbody>
+|         <tr>
+
+#data
+</tr><td>
+#errors
+Line: 1 Col: 5 Unexpected end tag (tr). Ignored.
+#document-fragment
+tr
+#document
+| <td>
+
+#data
+</tbody></tfoot></thead><td>
+#errors
+Line: 1 Col: 8 Unexpected end tag (tbody). Ignored.
+Line: 1 Col: 16 Unexpected end tag (tfoot). Ignored.
+Line: 1 Col: 24 Unexpected end tag (thead). Ignored.
+#document-fragment
+tr
+#document
+| <td>
+
+#data
+<table><tr><div><td>
+#errors
+Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+Line: 1 Col: 16 Unexpected start tag (div) in table context caused voodoo mode.
+Line: 1 Col: 20 Unexpected implied end tag (div) in the table row phase.
+Line: 1 Col: 20 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+
+#data
+<caption><col><colgroup><tbody><tfoot><thead><tr>
+#errors
+Line: 1 Col: 9 Unexpected start tag (caption).
+Line: 1 Col: 14 Unexpected start tag (col).
+Line: 1 Col: 24 Unexpected start tag (colgroup).
+Line: 1 Col: 31 Unexpected start tag (tbody).
+Line: 1 Col: 38 Unexpected start tag (tfoot).
+Line: 1 Col: 45 Unexpected start tag (thead).
+Line: 1 Col: 49 Unexpected end of file. Expected table content.
+#document-fragment
+tbody
+#document
+| <tr>
+
+#data
+<table><tbody></thead>
+#errors
+Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+Line: 1 Col: 22 Unexpected end tag (thead) in the table body phase. Ignored.
+Line: 1 Col: 22 Unexpected end of file. Expected table content.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+
+#data
+</table><tr>
+#errors
+Line: 1 Col: 8 Unexpected end tag (table). Ignored.
+Line: 1 Col: 12 Unexpected end of file. Expected table content.
+#document-fragment
+tbody
+#document
+| <tr>
+
+#data
+<table><tbody></body></caption></col></colgroup></html></td></th></tr>
+#errors
+Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+Line: 1 Col: 21 Unexpected end tag (body) in the table body phase. Ignored.
+Line: 1 Col: 31 Unexpected end tag (caption) in the table body phase. Ignored.
+Line: 1 Col: 37 Unexpected end tag (col) in the table body phase. Ignored.
+Line: 1 Col: 48 Unexpected end tag (colgroup) in the table body phase. Ignored.
+Line: 1 Col: 55 Unexpected end tag (html) in the table body phase. Ignored.
+Line: 1 Col: 60 Unexpected end tag (td) in the table body phase. Ignored.
+Line: 1 Col: 65 Unexpected end tag (th) in the table body phase. Ignored.
+Line: 1 Col: 70 Unexpected end tag (tr) in the table body phase. Ignored.
+Line: 1 Col: 70 Unexpected end of file. Expected table content.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+
+#data
+<table><tbody></div>
+#errors
+Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+Line: 1 Col: 20 Unexpected end tag (div) in table context caused voodoo mode.
+Line: 1 Col: 20 End tag (div) seen too early. Expected other end tag.
+Line: 1 Col: 20 Unexpected end of file. Expected table content.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+
+#data
+<table><table>
+#errors
+Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+Line: 1 Col: 14 Unexpected start tag (table) implies end tag (table).
+Line: 1 Col: 14 Unexpected end of file. Expected table content.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|     <table>
+
+#data
+<table></body></caption></col></colgroup></html></tbody></td></tfoot></th></thead></tr>
+#errors
+Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+Line: 1 Col: 14 Unexpected end tag (body). Ignored.
+Line: 1 Col: 24 Unexpected end tag (caption). Ignored.
+Line: 1 Col: 30 Unexpected end tag (col). Ignored.
+Line: 1 Col: 41 Unexpected end tag (colgroup). Ignored.
+Line: 1 Col: 48 Unexpected end tag (html). Ignored.
+Line: 1 Col: 56 Unexpected end tag (tbody). Ignored.
+Line: 1 Col: 61 Unexpected end tag (td). Ignored.
+Line: 1 Col: 69 Unexpected end tag (tfoot). Ignored.
+Line: 1 Col: 74 Unexpected end tag (th). Ignored.
+Line: 1 Col: 82 Unexpected end tag (thead). Ignored.
+Line: 1 Col: 87 Unexpected end tag (tr). Ignored.
+Line: 1 Col: 87 Unexpected end of file. Expected table content.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+
+#data
+</table><tr>
+#errors
+Line: 1 Col: 8 Unexpected end tag (table). Ignored.
+Line: 1 Col: 12 Unexpected end of file. Expected table content.
+#document-fragment
+table
+#document
+| <tbody>
+|   <tr>
+
+#data
+<body></body></html>
+#errors
+Line: 1 Col: 20 Unexpected html end tag in inner html mode.
+Line: 1 Col: 20 Unexpected EOF in inner html mode.
+#document-fragment
+html
+#document
+| <head>
+| <body>
+
+#data
+<html><frameset></frameset></html> 
+#errors
+Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <frameset>
+|   " "
+
+#data
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"><html></html>
+#errors
+Line: 1 Col: 50 Erroneous DOCTYPE.
+Line: 1 Col: 63 Unexpected end tag (html) after the (implied) root element.
+#document
+| <!DOCTYPE html "-//W3C//DTD HTML 4.01//EN" "">
+| <html>
+|   <head>
+|   <body>
+
+#data
+<param><frameset></frameset>
+#errors
+Line: 1 Col: 7 Unexpected start tag (param). Expected DOCTYPE.
+Line: 1 Col: 17 Unexpected start tag (frameset).
+#document
+| <html>
+|   <head>
+|   <frameset>
+
+#data
+<source><frameset></frameset>
+#errors
+Line: 1 Col: 7 Unexpected start tag (source). Expected DOCTYPE.
+Line: 1 Col: 17 Unexpected start tag (frameset).
+#document
+| <html>
+|   <head>
+|   <frameset>
+
+#data
+<track><frameset></frameset>
+#errors
+Line: 1 Col: 7 Unexpected start tag (track). Expected DOCTYPE.
+Line: 1 Col: 17 Unexpected start tag (frameset).
+#document
+| <html>
+|   <head>
+|   <frameset>
+
+#data
+</html><frameset></frameset>
+#errors
+7: End tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
+17: Stray “frameset” start tag.
+17: “frameset” start tag seen.
+#document
+| <html>
+|   <head>
+|   <frameset>
+
+#data
+</body><frameset></frameset>
+#errors
+7: End tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
+17: Stray “frameset” start tag.
+17: “frameset” start tag seen.
+#document
+| <html>
+|   <head>
+|   <frameset>
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests7.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests7.dat
new file mode 100644
index 00000000..f5193c66
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests7.dat
@@ -0,0 +1,390 @@
+#data
+<!doctype html><body><title>X</title>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <title>
+|       "X"
+
+#data
+<!doctype html><table><title>X</title></table>
+#errors
+Line: 1 Col: 29 Unexpected start tag (title) in table context caused voodoo mode.
+Line: 1 Col: 38 Unexpected end tag (title) in table context caused voodoo mode.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <title>
+|       "X"
+|     <table>
+
+#data
+<!doctype html><head></head><title>X</title>
+#errors
+Line: 1 Col: 35 Unexpected start tag (title) that can be in head. Moved.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <title>
+|       "X"
+|   <body>
+
+#data
+<!doctype html></head><title>X</title>
+#errors
+Line: 1 Col: 29 Unexpected start tag (title) that can be in head. Moved.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <title>
+|       "X"
+|   <body>
+
+#data
+<!doctype html><table><meta></table>
+#errors
+Line: 1 Col: 28 Unexpected start tag (meta) in table context caused voodoo mode.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <meta>
+|     <table>
+
+#data
+<!doctype html><table>X<tr><td><table> <meta></table></table>
+#errors
+Line: 1 Col: 23 Unexpected non-space characters in table context caused voodoo mode.
+Line: 1 Col: 45 Unexpected start tag (meta) in table context caused voodoo mode.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     "X"
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             <meta>
+|             <table>
+|               " "
+
+#data
+<!doctype html><html> <head>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+
+#data
+<!doctype html> <head>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+
+#data
+<!doctype html><table><style> <tr>x </style> </table>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <style>
+|         " <tr>x "
+|       " "
+
+#data
+<!doctype html><table><TBODY><script> <tr>x </script> </table>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <script>
+|           " <tr>x "
+|         " "
+
+#data
+<!doctype html><p><applet><p>X</p></applet>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <applet>
+|         <p>
+|           "X"
+
+#data
+<!doctype html><listing>
+X</listing>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <listing>
+|       "X"
+
+#data
+<!doctype html><select><input>X
+#errors
+Line: 1 Col: 30 Unexpected input start tag in the select phase.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <select>
+|     <input>
+|     "X"
+
+#data
+<!doctype html><select><select>X
+#errors
+Line: 1 Col: 31 Unexpected select start tag in the select phase treated as select end tag.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <select>
+|     "X"
+
+#data
+<!doctype html><table><input type=hidDEN></table>
+#errors
+Line: 1 Col: 41 Unexpected input with type hidden in table context.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <input>
+|         type="hidDEN"
+
+#data
+<!doctype html><table>X<input type=hidDEN></table>
+#errors
+Line: 1 Col: 23 Unexpected non-space characters in table context caused voodoo mode.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     "X"
+|     <table>
+|       <input>
+|         type="hidDEN"
+
+#data
+<!doctype html><table>  <input type=hidDEN></table>
+#errors
+Line: 1 Col: 43 Unexpected input with type hidden in table context.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       "  "
+|       <input>
+|         type="hidDEN"
+
+#data
+<!doctype html><table>  <input type='hidDEN'></table>
+#errors
+Line: 1 Col: 45 Unexpected input with type hidden in table context.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       "  "
+|       <input>
+|         type="hidDEN"
+
+#data
+<!doctype html><table><input type=" hidden"><input type=hidDEN></table>
+#errors
+Line: 1 Col: 44 Unexpected start tag (input) in table context caused voodoo mode.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <input>
+|       type=" hidden"
+|     <table>
+|       <input>
+|         type="hidDEN"
+
+#data
+<!doctype html><table><select>X<tr>
+#errors
+Line: 1 Col: 30 Unexpected start tag (select) in table context caused voodoo mode.
+Line: 1 Col: 35 Unexpected table element start tag (trs) in the select in table phase.
+Line: 1 Col: 35 Unexpected end of file. Expected table content.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <select>
+|       "X"
+|     <table>
+|       <tbody>
+|         <tr>
+
+#data
+<!doctype html><select>X</select>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <select>
+|       "X"
+
+#data
+<!DOCTYPE hTmL><html></html>
+#errors
+Line: 1 Col: 28 Unexpected end tag (html) after the (implied) root element.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+
+#data
+<!DOCTYPE HTML><html></html>
+#errors
+Line: 1 Col: 28 Unexpected end tag (html) after the (implied) root element.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+
+#data
+<body>X</body></body>
+#errors
+Line: 1 Col: 21 Unexpected end tag token (body) in the after body phase.
+Line: 1 Col: 21 Unexpected EOF in inner html mode.
+#document-fragment
+html
+#document
+| <head>
+| <body>
+|   "X"
+
+#data
+<div><p>a</x> b
+#errors
+Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
+Line: 1 Col: 13 Unexpected end tag (x). Ignored.
+Line: 1 Col: 15 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       <p>
+|         "a b"
+
+#data
+<table><tr><td><code></code> </table>
+#errors
+Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             <code>
+|             " "
+
+#data
+<table><b><tr><td>aaa</td></tr>bbb</table>ccc
+#errors
+XXX: Fix me
+#document
+| <html>
+|   <head>
+|   <body>
+|     <b>
+|     <b>
+|       "bbb"
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             "aaa"
+|     <b>
+|       "ccc"
+
+#data
+A<table><tr> B</tr> B</table>
+#errors
+XXX: Fix me
+#document
+| <html>
+|   <head>
+|   <body>
+|     "A B B"
+|     <table>
+|       <tbody>
+|         <tr>
+
+#data
+A<table><tr> B</tr> </em>C</table>
+#errors
+XXX: Fix me
+#document
+| <html>
+|   <head>
+|   <body>
+|     "A BC"
+|     <table>
+|       <tbody>
+|         <tr>
+|         " "
+
+#data
+<select><keygen>
+#errors
+Not known
+#document
+| <html>
+|   <head>
+|   <body>
+|     <select>
+|     <keygen>
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests8.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests8.dat
new file mode 100644
index 00000000..90e6c919
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests8.dat
@@ -0,0 +1,148 @@
+#data
+<div>
+<div></div>
+</span>x
+#errors
+Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
+Line: 3 Col: 7 Unexpected end tag (span). Ignored.
+Line: 3 Col: 8 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       "
+"
+|       <div>
+|       "
+x"
+
+#data
+<div>x<div></div>
+</span>x
+#errors
+Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
+Line: 2 Col: 7 Unexpected end tag (span). Ignored.
+Line: 2 Col: 8 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       "x"
+|       <div>
+|       "
+x"
+
+#data
+<div>x<div></div>x</span>x
+#errors
+Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
+Line: 1 Col: 25 Unexpected end tag (span). Ignored.
+Line: 1 Col: 26 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       "x"
+|       <div>
+|       "xx"
+
+#data
+<div>x<div></div>y</span>z
+#errors
+Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
+Line: 1 Col: 25 Unexpected end tag (span). Ignored.
+Line: 1 Col: 26 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       "x"
+|       <div>
+|       "yz"
+
+#data
+<table><div>x<div></div>x</span>x
+#errors
+Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
+Line: 1 Col: 12 Unexpected start tag (div) in table context caused voodoo mode.
+Line: 1 Col: 18 Unexpected start tag (div) in table context caused voodoo mode.
+Line: 1 Col: 24 Unexpected end tag (div) in table context caused voodoo mode.
+Line: 1 Col: 32 Unexpected end tag (span) in table context caused voodoo mode.
+Line: 1 Col: 32 Unexpected end tag (span). Ignored.
+Line: 1 Col: 33 Unexpected end of file. Expected table content.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       "x"
+|       <div>
+|       "xx"
+|     <table>
+
+#data
+x<table>x
+#errors
+Line: 1 Col: 1 Unexpected non-space characters. Expected DOCTYPE.
+Line: 1 Col: 9 Unexpected non-space characters in table context caused voodoo mode.
+Line: 1 Col: 9 Unexpected end of file. Expected table content.
+#document
+| <html>
+|   <head>
+|   <body>
+|     "xx"
+|     <table>
+
+#data
+x<table><table>x
+#errors
+Line: 1 Col: 1 Unexpected non-space characters. Expected DOCTYPE.
+Line: 1 Col: 15 Unexpected start tag (table) implies end tag (table).
+Line: 1 Col: 16 Unexpected non-space characters in table context caused voodoo mode.
+Line: 1 Col: 16 Unexpected end of file. Expected table content.
+#document
+| <html>
+|   <head>
+|   <body>
+|     "x"
+|     <table>
+|     "x"
+|     <table>
+
+#data
+<b>a<div></div><div></b>y
+#errors
+Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
+Line: 1 Col: 24 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
+Line: 1 Col: 25 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <b>
+|       "a"
+|       <div>
+|     <div>
+|       <b>
+|       "y"
+
+#data
+<a><div><p></a>
+#errors
+Line: 1 Col: 3 Unexpected start tag (a). Expected DOCTYPE.
+Line: 1 Col: 15 End tag (a) violates step 1, paragraph 3 of the adoption agency algorithm.
+Line: 1 Col: 15 End tag (a) violates step 1, paragraph 3 of the adoption agency algorithm.
+Line: 1 Col: 15 Expected closing tag. Unexpected end of file.
+#document
+| <html>
+|   <head>
+|   <body>
+|     <a>
+|     <div>
+|       <a>
+|       <p>
+|         <a>
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests9.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests9.dat
new file mode 100644
index 00000000..554e27ae
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests9.dat
@@ -0,0 +1,457 @@
+#data
+<!DOCTYPE html><math></math>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+
+#data
+<!DOCTYPE html><body><math></math>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+
+#data
+<!DOCTYPE html><math><mi>
+#errors
+25: End of file in a foreign namespace context.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       <math mi>
+
+#data
+<!DOCTYPE html><math><annotation-xml><svg><u>
+#errors
+45: HTML start tag “u” in a foreign namespace context.
+45: End of file seen and there were open elements.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       <math annotation-xml>
+|         <svg svg>
+|     <u>
+
+#data
+<!DOCTYPE html><body><select><math></math></select>
+#errors
+Line: 1 Col: 35 Unexpected start tag token (math) in the select phase. Ignored.
+Line: 1 Col: 42 Unexpected end tag (math) in the select phase. Ignored.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <select>
+
+#data
+<!DOCTYPE html><body><select><option><math></math></option></select>
+#errors
+Line: 1 Col: 43 Unexpected start tag token (math) in the select phase. Ignored.
+Line: 1 Col: 50 Unexpected end tag (math) in the select phase. Ignored.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <select>
+|       <option>
+
+#data
+<!DOCTYPE html><body><table><math></math></table>
+#errors
+Line: 1 Col: 34 Unexpected start tag (math) in table context caused voodoo mode.
+Line: 1 Col: 41 Unexpected end tag (math) in table context caused voodoo mode.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|     <table>
+
+#data
+<!DOCTYPE html><body><table><math><mi>foo</mi></math></table>
+#errors
+Line: 1 Col: 34 Unexpected start tag (math) in table context caused voodoo mode.
+Line: 1 Col: 46 Unexpected end tag (mi) in table context caused voodoo mode.
+Line: 1 Col: 53 Unexpected end tag (math) in table context caused voodoo mode.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       <math mi>
+|         "foo"
+|     <table>
+
+#data
+<!DOCTYPE html><body><table><math><mi>foo</mi><mi>bar</mi></math></table>
+#errors
+Line: 1 Col: 34 Unexpected start tag (math) in table context caused voodoo mode.
+Line: 1 Col: 46 Unexpected end tag (mi) in table context caused voodoo mode.
+Line: 1 Col: 58 Unexpected end tag (mi) in table context caused voodoo mode.
+Line: 1 Col: 65 Unexpected end tag (math) in table context caused voodoo mode.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       <math mi>
+|         "foo"
+|       <math mi>
+|         "bar"
+|     <table>
+
+#data
+<!DOCTYPE html><body><table><tbody><math><mi>foo</mi><mi>bar</mi></math></tbody></table>
+#errors
+Line: 1 Col: 41 Unexpected start tag (math) in table context caused voodoo mode.
+Line: 1 Col: 53 Unexpected end tag (mi) in table context caused voodoo mode.
+Line: 1 Col: 65 Unexpected end tag (mi) in table context caused voodoo mode.
+Line: 1 Col: 72 Unexpected end tag (math) in table context caused voodoo mode.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       <math mi>
+|         "foo"
+|       <math mi>
+|         "bar"
+|     <table>
+|       <tbody>
+
+#data
+<!DOCTYPE html><body><table><tbody><tr><math><mi>foo</mi><mi>bar</mi></math></tr></tbody></table>
+#errors
+Line: 1 Col: 45 Unexpected start tag (math) in table context caused voodoo mode.
+Line: 1 Col: 57 Unexpected end tag (mi) in table context caused voodoo mode.
+Line: 1 Col: 69 Unexpected end tag (mi) in table context caused voodoo mode.
+Line: 1 Col: 76 Unexpected end tag (math) in table context caused voodoo mode.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       <math mi>
+|         "foo"
+|       <math mi>
+|         "bar"
+|     <table>
+|       <tbody>
+|         <tr>
+
+#data
+<!DOCTYPE html><body><table><tbody><tr><td><math><mi>foo</mi><mi>bar</mi></math></td></tr></tbody></table>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             <math math>
+|               <math mi>
+|                 "foo"
+|               <math mi>
+|                 "bar"
+
+#data
+<!DOCTYPE html><body><table><tbody><tr><td><math><mi>foo</mi><mi>bar</mi></math><p>baz</td></tr></tbody></table>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             <math math>
+|               <math mi>
+|                 "foo"
+|               <math mi>
+|                 "bar"
+|             <p>
+|               "baz"
+
+#data
+<!DOCTYPE html><body><table><caption><math><mi>foo</mi><mi>bar</mi></math><p>baz</caption></table>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <caption>
+|         <math math>
+|           <math mi>
+|             "foo"
+|           <math mi>
+|             "bar"
+|         <p>
+|           "baz"
+
+#data
+<!DOCTYPE html><body><table><caption><math><mi>foo</mi><mi>bar</mi><p>baz</table><p>quux
+#errors
+Line: 1 Col: 70 HTML start tag "p" in a foreign namespace context.
+Line: 1 Col: 81 Unexpected end table tag in caption. Generates implied end caption.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <caption>
+|         <math math>
+|           <math mi>
+|             "foo"
+|           <math mi>
+|             "bar"
+|         <p>
+|           "baz"
+|     <p>
+|       "quux"
+
+#data
+<!DOCTYPE html><body><table><caption><math><mi>foo</mi><mi>bar</mi>baz</table><p>quux
+#errors
+Line: 1 Col: 78 Unexpected end table tag in caption. Generates implied end caption.
+Line: 1 Col: 78 Unexpected end tag (caption). Missing end tag (math).
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <caption>
+|         <math math>
+|           <math mi>
+|             "foo"
+|           <math mi>
+|             "bar"
+|           "baz"
+|     <p>
+|       "quux"
+
+#data
+<!DOCTYPE html><body><table><colgroup><math><mi>foo</mi><mi>bar</mi><p>baz</table><p>quux
+#errors
+Line: 1 Col: 44 Unexpected start tag (math) in table context caused voodoo mode.
+Line: 1 Col: 56 Unexpected end tag (mi) in table context caused voodoo mode.
+Line: 1 Col: 68 Unexpected end tag (mi) in table context caused voodoo mode.
+Line: 1 Col: 71 HTML start tag "p" in a foreign namespace context.
+Line: 1 Col: 71 Unexpected start tag (p) in table context caused voodoo mode.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       <math mi>
+|         "foo"
+|       <math mi>
+|         "bar"
+|     <p>
+|       "baz"
+|     <table>
+|       <colgroup>
+|     <p>
+|       "quux"
+
+#data
+<!DOCTYPE html><body><table><tr><td><select><math><mi>foo</mi><mi>bar</mi><p>baz</table><p>quux
+#errors
+Line: 1 Col: 50 Unexpected start tag token (math) in the select phase. Ignored.
+Line: 1 Col: 54 Unexpected start tag token (mi) in the select phase. Ignored.
+Line: 1 Col: 62 Unexpected end tag (mi) in the select phase. Ignored.
+Line: 1 Col: 66 Unexpected start tag token (mi) in the select phase. Ignored.
+Line: 1 Col: 74 Unexpected end tag (mi) in the select phase. Ignored.
+Line: 1 Col: 77 Unexpected start tag token (p) in the select phase. Ignored.
+Line: 1 Col: 88 Unexpected table element end tag (tables) in the select in table phase.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             <select>
+|               "foobarbaz"
+|     <p>
+|       "quux"
+
+#data
+<!DOCTYPE html><body><table><select><math><mi>foo</mi><mi>bar</mi><p>baz</table><p>quux
+#errors
+Line: 1 Col: 36 Unexpected start tag (select) in table context caused voodoo mode.
+Line: 1 Col: 42 Unexpected start tag token (math) in the select phase. Ignored.
+Line: 1 Col: 46 Unexpected start tag token (mi) in the select phase. Ignored.
+Line: 1 Col: 54 Unexpected end tag (mi) in the select phase. Ignored.
+Line: 1 Col: 58 Unexpected start tag token (mi) in the select phase. Ignored.
+Line: 1 Col: 66 Unexpected end tag (mi) in the select phase. Ignored.
+Line: 1 Col: 69 Unexpected start tag token (p) in the select phase. Ignored.
+Line: 1 Col: 80 Unexpected table element end tag (tables) in the select in table phase.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <select>
+|       "foobarbaz"
+|     <table>
+|     <p>
+|       "quux"
+
+#data
+<!DOCTYPE html><body></body></html><math><mi>foo</mi><mi>bar</mi><p>baz
+#errors
+Line: 1 Col: 41 Unexpected start tag (math).
+Line: 1 Col: 68 HTML start tag "p" in a foreign namespace context.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       <math mi>
+|         "foo"
+|       <math mi>
+|         "bar"
+|     <p>
+|       "baz"
+
+#data
+<!DOCTYPE html><body></body><math><mi>foo</mi><mi>bar</mi><p>baz
+#errors
+Line: 1 Col: 34 Unexpected start tag token (math) in the after body phase.
+Line: 1 Col: 61 HTML start tag "p" in a foreign namespace context.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       <math mi>
+|         "foo"
+|       <math mi>
+|         "bar"
+|     <p>
+|       "baz"
+
+#data
+<!DOCTYPE html><frameset><math><mi></mi><mi></mi><p><span>
+#errors
+Line: 1 Col: 31 Unexpected start tag token (math) in the frameset phase. Ignored.
+Line: 1 Col: 35 Unexpected start tag token (mi) in the frameset phase. Ignored.
+Line: 1 Col: 40 Unexpected end tag token (mi) in the frameset phase. Ignored.
+Line: 1 Col: 44 Unexpected start tag token (mi) in the frameset phase. Ignored.
+Line: 1 Col: 49 Unexpected end tag token (mi) in the frameset phase. Ignored.
+Line: 1 Col: 52 Unexpected start tag token (p) in the frameset phase. Ignored.
+Line: 1 Col: 58 Unexpected start tag token (span) in the frameset phase. Ignored.
+Line: 1 Col: 58 Expected closing tag. Unexpected end of file.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <frameset>
+
+#data
+<!DOCTYPE html><frameset></frameset><math><mi></mi><mi></mi><p><span>
+#errors
+Line: 1 Col: 42 Unexpected start tag (math) in the after frameset phase. Ignored.
+Line: 1 Col: 46 Unexpected start tag (mi) in the after frameset phase. Ignored.
+Line: 1 Col: 51 Unexpected end tag (mi) in the after frameset phase. Ignored.
+Line: 1 Col: 55 Unexpected start tag (mi) in the after frameset phase. Ignored.
+Line: 1 Col: 60 Unexpected end tag (mi) in the after frameset phase. Ignored.
+Line: 1 Col: 63 Unexpected start tag (p) in the after frameset phase. Ignored.
+Line: 1 Col: 69 Unexpected start tag (span) in the after frameset phase. Ignored.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <frameset>
+
+#data
+<!DOCTYPE html><body xlink:href=foo><math xlink:href=foo></math>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     xlink:href="foo"
+|     <math math>
+|       xlink href="foo"
+
+#data
+<!DOCTYPE html><body xlink:href=foo xml:lang=en><math><mi xml:lang=en xlink:href=foo></mi></math>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     xlink:href="foo"
+|     xml:lang="en"
+|     <math math>
+|       <math mi>
+|         xlink href="foo"
+|         xml lang="en"
+
+#data
+<!DOCTYPE html><body xlink:href=foo xml:lang=en><math><mi xml:lang=en xlink:href=foo /></math>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     xlink:href="foo"
+|     xml:lang="en"
+|     <math math>
+|       <math mi>
+|         xlink href="foo"
+|         xml lang="en"
+
+#data
+<!DOCTYPE html><body xlink:href=foo xml:lang=en><math><mi xml:lang=en xlink:href=foo />bar</math>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     xlink:href="foo"
+|     xml:lang="en"
+|     <math math>
+|       <math mi>
+|         xlink href="foo"
+|         xml lang="en"
+|       "bar"
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests_innerHTML_1.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests_innerHTML_1.dat
new file mode 100644
index 00000000..6c78661e
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests_innerHTML_1.dat
@@ -0,0 +1,741 @@
+#data
+<body><span>
+#errors
+#document-fragment
+body
+#document
+| <span>
+
+#data
+<span><body>
+#errors
+#document-fragment
+body
+#document
+| <span>
+
+#data
+<span><body>
+#errors
+#document-fragment
+div
+#document
+| <span>
+
+#data
+<body><span>
+#errors
+#document-fragment
+html
+#document
+| <head>
+| <body>
+|   <span>
+
+#data
+<frameset><span>
+#errors
+#document-fragment
+body
+#document
+| <span>
+
+#data
+<span><frameset>
+#errors
+#document-fragment
+body
+#document
+| <span>
+
+#data
+<span><frameset>
+#errors
+#document-fragment
+div
+#document
+| <span>
+
+#data
+<frameset><span>
+#errors
+#document-fragment
+html
+#document
+| <head>
+| <frameset>
+
+#data
+<table><tr>
+#errors
+#document-fragment
+table
+#document
+| <tbody>
+|   <tr>
+
+#data
+</table><tr>
+#errors
+#document-fragment
+table
+#document
+| <tbody>
+|   <tr>
+
+#data
+<a>
+#errors
+#document-fragment
+table
+#document
+| <a>
+
+#data
+<a>
+#errors
+#document-fragment
+table
+#document
+| <a>
+
+#data
+<a><caption>a
+#errors
+#document-fragment
+table
+#document
+| <a>
+| <caption>
+|   "a"
+
+#data
+<a><colgroup><col>
+#errors
+#document-fragment
+table
+#document
+| <a>
+| <colgroup>
+|   <col>
+
+#data
+<a><tbody><tr>
+#errors
+#document-fragment
+table
+#document
+| <a>
+| <tbody>
+|   <tr>
+
+#data
+<a><tfoot><tr>
+#errors
+#document-fragment
+table
+#document
+| <a>
+| <tfoot>
+|   <tr>
+
+#data
+<a><thead><tr>
+#errors
+#document-fragment
+table
+#document
+| <a>
+| <thead>
+|   <tr>
+
+#data
+<a><tr>
+#errors
+#document-fragment
+table
+#document
+| <a>
+| <tbody>
+|   <tr>
+
+#data
+<a><th>
+#errors
+#document-fragment
+table
+#document
+| <a>
+| <tbody>
+|   <tr>
+|     <th>
+
+#data
+<a><td>
+#errors
+#document-fragment
+table
+#document
+| <a>
+| <tbody>
+|   <tr>
+|     <td>
+
+#data
+<table></table><tbody>
+#errors
+#document-fragment
+caption
+#document
+| <table>
+
+#data
+</table><span>
+#errors
+#document-fragment
+caption
+#document
+| <span>
+
+#data
+<span></table>
+#errors
+#document-fragment
+caption
+#document
+| <span>
+
+#data
+</caption><span>
+#errors
+#document-fragment
+caption
+#document
+| <span>
+
+#data
+<span></caption><span>
+#errors
+#document-fragment
+caption
+#document
+| <span>
+|   <span>
+
+#data
+<span><caption><span>
+#errors
+#document-fragment
+caption
+#document
+| <span>
+|   <span>
+
+#data
+<span><col><span>
+#errors
+#document-fragment
+caption
+#document
+| <span>
+|   <span>
+
+#data
+<span><colgroup><span>
+#errors
+#document-fragment
+caption
+#document
+| <span>
+|   <span>
+
+#data
+<span><html><span>
+#errors
+#document-fragment
+caption
+#document
+| <span>
+|   <span>
+
+#data
+<span><tbody><span>
+#errors
+#document-fragment
+caption
+#document
+| <span>
+|   <span>
+
+#data
+<span><td><span>
+#errors
+#document-fragment
+caption
+#document
+| <span>
+|   <span>
+
+#data
+<span><tfoot><span>
+#errors
+#document-fragment
+caption
+#document
+| <span>
+|   <span>
+
+#data
+<span><thead><span>
+#errors
+#document-fragment
+caption
+#document
+| <span>
+|   <span>
+
+#data
+<span><th><span>
+#errors
+#document-fragment
+caption
+#document
+| <span>
+|   <span>
+
+#data
+<span><tr><span>
+#errors
+#document-fragment
+caption
+#document
+| <span>
+|   <span>
+
+#data
+<span></table><span>
+#errors
+#document-fragment
+caption
+#document
+| <span>
+|   <span>
+
+#data
+</colgroup><col>
+#errors
+#document-fragment
+colgroup
+#document
+| <col>
+
+#data
+<a><col>
+#errors
+#document-fragment
+colgroup
+#document
+| <col>
+
+#data
+<caption><a>
+#errors
+#document-fragment
+tbody
+#document
+| <a>
+
+#data
+<col><a>
+#errors
+#document-fragment
+tbody
+#document
+| <a>
+
+#data
+<colgroup><a>
+#errors
+#document-fragment
+tbody
+#document
+| <a>
+
+#data
+<tbody><a>
+#errors
+#document-fragment
+tbody
+#document
+| <a>
+
+#data
+<tfoot><a>
+#errors
+#document-fragment
+tbody
+#document
+| <a>
+
+#data
+<thead><a>
+#errors
+#document-fragment
+tbody
+#document
+| <a>
+
+#data
+</table><a>
+#errors
+#document-fragment
+tbody
+#document
+| <a>
+
+#data
+<a><tr>
+#errors
+#document-fragment
+tbody
+#document
+| <a>
+| <tr>
+
+#data
+<a><td>
+#errors
+#document-fragment
+tbody
+#document
+| <a>
+| <tr>
+|   <td>
+
+#data
+<a><td>
+#errors
+#document-fragment
+tbody
+#document
+| <a>
+| <tr>
+|   <td>
+
+#data
+<a><td>
+#errors
+#document-fragment
+tbody
+#document
+| <a>
+| <tr>
+|   <td>
+
+#data
+<td><table><tbody><a><tr>
+#errors
+#document-fragment
+tbody
+#document
+| <tr>
+|   <td>
+|     <a>
+|     <table>
+|       <tbody>
+|         <tr>
+
+#data
+</tr><td>
+#errors
+#document-fragment
+tr
+#document
+| <td>
+
+#data
+<td><table><a><tr></tr><tr>
+#errors
+#document-fragment
+tr
+#document
+| <td>
+|   <a>
+|   <table>
+|     <tbody>
+|       <tr>
+|       <tr>
+
+#data
+<caption><td>
+#errors
+#document-fragment
+tr
+#document
+| <td>
+
+#data
+<col><td>
+#errors
+#document-fragment
+tr
+#document
+| <td>
+
+#data
+<colgroup><td>
+#errors
+#document-fragment
+tr
+#document
+| <td>
+
+#data
+<tbody><td>
+#errors
+#document-fragment
+tr
+#document
+| <td>
+
+#data
+<tfoot><td>
+#errors
+#document-fragment
+tr
+#document
+| <td>
+
+#data
+<thead><td>
+#errors
+#document-fragment
+tr
+#document
+| <td>
+
+#data
+<tr><td>
+#errors
+#document-fragment
+tr
+#document
+| <td>
+
+#data
+</table><td>
+#errors
+#document-fragment
+tr
+#document
+| <td>
+
+#data
+<td><table></table><td>
+#errors
+#document-fragment
+tr
+#document
+| <td>
+|   <table>
+| <td>
+
+#data
+<td><table></table><td>
+#errors
+#document-fragment
+tr
+#document
+| <td>
+|   <table>
+| <td>
+
+#data
+<caption><a>
+#errors
+#document-fragment
+td
+#document
+| <a>
+
+#data
+<col><a>
+#errors
+#document-fragment
+td
+#document
+| <a>
+
+#data
+<colgroup><a>
+#errors
+#document-fragment
+td
+#document
+| <a>
+
+#data
+<tbody><a>
+#errors
+#document-fragment
+td
+#document
+| <a>
+
+#data
+<tfoot><a>
+#errors
+#document-fragment
+td
+#document
+| <a>
+
+#data
+<th><a>
+#errors
+#document-fragment
+td
+#document
+| <a>
+
+#data
+<thead><a>
+#errors
+#document-fragment
+td
+#document
+| <a>
+
+#data
+<tr><a>
+#errors
+#document-fragment
+td
+#document
+| <a>
+
+#data
+</table><a>
+#errors
+#document-fragment
+td
+#document
+| <a>
+
+#data
+</tbody><a>
+#errors
+#document-fragment
+td
+#document
+| <a>
+
+#data
+</td><a>
+#errors
+#document-fragment
+td
+#document
+| <a>
+
+#data
+</tfoot><a>
+#errors
+#document-fragment
+td
+#document
+| <a>
+
+#data
+</thead><a>
+#errors
+#document-fragment
+td
+#document
+| <a>
+
+#data
+</th><a>
+#errors
+#document-fragment
+td
+#document
+| <a>
+
+#data
+</tr><a>
+#errors
+#document-fragment
+td
+#document
+| <a>
+
+#data
+<table><td><td>
+#errors
+#document-fragment
+td
+#document
+| <table>
+|   <tbody>
+|     <tr>
+|       <td>
+|       <td>
+
+#data
+</select><option>
+#errors
+#document-fragment
+select
+#document
+| <option>
+
+#data
+<input><option>
+#errors
+#document-fragment
+select
+#document
+| <option>
+
+#data
+<keygen><option>
+#errors
+#document-fragment
+select
+#document
+| <option>
+
+#data
+<textarea><option>
+#errors
+#document-fragment
+select
+#document
+| <option>
+
+#data
+</html><!--abc-->
+#errors
+#document-fragment
+html
+#document
+| <head>
+| <body>
+| <!-- abc -->
+
+#data
+</frameset><frame>
+#errors
+#document-fragment
+frameset
+#document
+| <frame>
+
+#data
+#errors
+#document-fragment
+html
+#document
+| <head>
+| <body>
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tricky01.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tricky01.dat
new file mode 100644
index 00000000..08419924
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tricky01.dat
@@ -0,0 +1,261 @@
+#data
+<b><p>Bold </b> Not bold</p>
+Also not bold.
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <b>
+|     <p>
+|       <b>
+|         "Bold "
+|       " Not bold"
+|     "
+Also not bold."
+
+#data
+<html>
+<font color=red><i>Italic and Red<p>Italic and Red </font> Just italic.</p> Italic only.</i> Plain
+<p>I should not be red. <font color=red>Red. <i>Italic and red.</p>
+<p>Italic and red. </i> Red.</font> I should not be red.</p>
+<b>Bold <i>Bold and italic</b> Only Italic </i> Plain
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <font>
+|       color="red"
+|       <i>
+|         "Italic and Red"
+|     <i>
+|       <p>
+|         <font>
+|           color="red"
+|           "Italic and Red "
+|         " Just italic."
+|       " Italic only."
+|     " Plain
+"
+|     <p>
+|       "I should not be red. "
+|       <font>
+|         color="red"
+|         "Red. "
+|         <i>
+|           "Italic and red."
+|     <font>
+|       color="red"
+|       <i>
+|         "
+"
+|     <p>
+|       <font>
+|         color="red"
+|         <i>
+|           "Italic and red. "
+|         " Red."
+|       " I should not be red."
+|     "
+"
+|     <b>
+|       "Bold "
+|       <i>
+|         "Bold and italic"
+|     <i>
+|       " Only Italic "
+|     " Plain"
+
+#data
+<html><body>
+<p><font size="7">First paragraph.</p>
+<p>Second paragraph.</p></font>
+<b><p><i>Bold and Italic</b> Italic</p>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "
+"
+|     <p>
+|       <font>
+|         size="7"
+|         "First paragraph."
+|     <font>
+|       size="7"
+|       "
+"
+|       <p>
+|         "Second paragraph."
+|     "
+"
+|     <b>
+|     <p>
+|       <b>
+|         <i>
+|           "Bold and Italic"
+|       <i>
+|         " Italic"
+
+#data
+<html>
+<dl>
+<dt><b>Boo
+<dd>Goo?
+</dl>
+</html>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <dl>
+|       "
+"
+|       <dt>
+|         <b>
+|           "Boo
+"
+|       <dd>
+|         <b>
+|           "Goo?
+"
+|     <b>
+|       "
+"
+
+#data
+<html><body>
+<label><a><div>Hello<div>World</div></a></label>  
+</body></html>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "
+"
+|     <label>
+|       <a>
+|       <div>
+|         <a>
+|           "Hello"
+|           <div>
+|             "World"
+|         "  
+"
+
+#data
+<table><center> <font>a</center> <img> <tr><td> </td> </tr> </table>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <center>
+|       " "
+|       <font>
+|         "a"
+|     <font>
+|       <img>
+|       " "
+|     <table>
+|       " "
+|       <tbody>
+|         <tr>
+|           <td>
+|             " "
+|           " "
+|         " "
+
+#data
+<table><tr><p><a><p>You should see this text.
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       <a>
+|     <p>
+|       <a>
+|         "You should see this text."
+|     <table>
+|       <tbody>
+|         <tr>
+
+#data
+<TABLE>
+<TR>
+<CENTER><CENTER><TD></TD></TR><TR>
+<FONT>
+<TABLE><tr></tr></TABLE>
+</P>
+<a></font><font></a>
+This page contains an insanely badly-nested tag sequence.
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <center>
+|       <center>
+|     <font>
+|       "
+"
+|     <table>
+|       "
+"
+|       <tbody>
+|         <tr>
+|           "
+"
+|           <td>
+|         <tr>
+|           "
+"
+|     <table>
+|       <tbody>
+|         <tr>
+|     <font>
+|       "
+"
+|       <p>
+|       "
+"
+|       <a>
+|     <a>
+|       <font>
+|     <font>
+|       "
+This page contains an insanely badly-nested tag sequence."
+
+#data
+<html>
+<body>
+<b><nobr><div>This text is in a div inside a nobr</nobr>More text that should not be in the nobr, i.e., the
+nobr should have closed the div inside it implicitly. </b><pre>A pre tag outside everything else.</pre>
+</body>
+</html>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "
+"
+|     <b>
+|       <nobr>
+|     <div>
+|       <b>
+|         <nobr>
+|           "This text is in a div inside a nobr"
+|         "More text that should not be in the nobr, i.e., the
+nobr should have closed the div inside it implicitly. "
+|       <pre>
+|         "A pre tag outside everything else."
+|       "
+
+"
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/webkit01.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/webkit01.dat
new file mode 100644
index 00000000..9d425e99
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/webkit01.dat
@@ -0,0 +1,610 @@
+#data
+Test
+#errors
+Line: 1 Col: 4 Unexpected non-space characters. Expected DOCTYPE.
+#document
+| <html>
+|   <head>
+|   <body>
+|     "Test"
+
+#data
+<div></div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+
+#data
+<div>Test</div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       "Test"
+
+#data
+<di
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+
+#data
+<div>Hello</div>
+<script>
+console.log("PASS");
+</script>
+<div>Bye</div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       "Hello"
+|     "
+"
+|     <script>
+|       "
+console.log("PASS");
+"
+|     "
+"
+|     <div>
+|       "Bye"
+
+#data
+<div foo="bar">Hello</div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       foo="bar"
+|       "Hello"
+
+#data
+<div>Hello</div>
+<script>
+console.log("FOO<span>BAR</span>BAZ");
+</script>
+<div>Bye</div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       "Hello"
+|     "
+"
+|     <script>
+|       "
+console.log("FOO<span>BAR</span>BAZ");
+"
+|     "
+"
+|     <div>
+|       "Bye"
+
+#data
+<foo bar="baz"></foo><potato quack="duck"></potato>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <foo>
+|       bar="baz"
+|     <potato>
+|       quack="duck"
+
+#data
+<foo bar="baz"><potato quack="duck"></potato></foo>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <foo>
+|       bar="baz"
+|       <potato>
+|         quack="duck"
+
+#data
+<foo></foo bar="baz"><potato></potato quack="duck">
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <foo>
+|     <potato>
+
+#data
+</ tttt>
+#errors
+#document
+| <!--  tttt -->
+| <html>
+|   <head>
+|   <body>
+
+#data
+<div FOO ><img><img></div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       foo=""
+|       <img>
+|       <img>
+
+#data
+<p>Test</p<p>Test2</p>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       "TestTest2"
+
+#data
+<rdar://problem/6869687>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <rdar:>
+|       6869687=""
+|       problem=""
+
+#data
+<A>test< /A>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <a>
+|       "test< /A>"
+
+#data
+&lt;
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "<"
+
+#data
+<body foo='bar'><body foo='baz' yo='mama'>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     foo="bar"
+|     yo="mama"
+
+#data
+<body></br foo="bar"></body>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <br>
+
+#data
+<bdy><br foo="bar"></body>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <bdy>
+|       <br>
+|         foo="bar"
+
+#data
+<body></body></br foo="bar">
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <br>
+
+#data
+<bdy></body><br foo="bar">
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <bdy>
+|       <br>
+|         foo="bar"
+
+#data
+<html><body></body></html><!-- Hi there -->
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+| <!--  Hi there  -->
+
+#data
+<html><body></body></html>x<!-- Hi there -->
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "x"
+|     <!--  Hi there  -->
+
+#data
+<html><body></body></html>x<!-- Hi there --></html><!-- Again -->
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "x"
+|     <!--  Hi there  -->
+| <!--  Again  -->
+
+#data
+<html><body></body></html>x<!-- Hi there --></body></html><!-- Again -->
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "x"
+|     <!--  Hi there  -->
+| <!--  Again  -->
+
+#data
+<html><body><ruby><div><rp>xx</rp></div></ruby></body></html>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <ruby>
+|       <div>
+|         <rp>
+|           "xx"
+
+#data
+<html><body><ruby><div><rt>xx</rt></div></ruby></body></html>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <ruby>
+|       <div>
+|         <rt>
+|           "xx"
+
+#data
+<html><frameset><!--1--><noframes>A</noframes><!--2--></frameset><!--3--><noframes>B</noframes><!--4--></html><!--5--><noframes>C</noframes><!--6-->
+#errors
+#document
+| <html>
+|   <head>
+|   <frameset>
+|     <!-- 1 -->
+|     <noframes>
+|       "A"
+|     <!-- 2 -->
+|   <!-- 3 -->
+|   <noframes>
+|     "B"
+|   <!-- 4 -->
+|   <noframes>
+|     "C"
+| <!-- 5 -->
+| <!-- 6 -->
+
+#data
+<select><option>A<select><option>B<select><option>C<select><option>D<select><option>E<select><option>F<select><option>G<select>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <select>
+|       <option>
+|         "A"
+|     <option>
+|       "B"
+|       <select>
+|         <option>
+|           "C"
+|     <option>
+|       "D"
+|       <select>
+|         <option>
+|           "E"
+|     <option>
+|       "F"
+|       <select>
+|         <option>
+|           "G"
+
+#data
+<dd><dd><dt><dt><dd><li><li>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <dd>
+|     <dd>
+|     <dt>
+|     <dt>
+|     <dd>
+|       <li>
+|       <li>
+
+#data
+<div><b></div><div><nobr>a<nobr>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       <b>
+|     <div>
+|       <b>
+|         <nobr>
+|           "a"
+|         <nobr>
+
+#data
+<head></head>
+<body></body>
+#errors
+#document
+| <html>
+|   <head>
+|   "
+"
+|   <body>
+
+#data
+<head></head> <style></style>ddd
+#errors
+#document
+| <html>
+|   <head>
+|     <style>
+|   " "
+|   <body>
+|     "ddd"
+
+#data
+<kbd><table></kbd><col><select><tr>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <kbd>
+|       <select>
+|       <table>
+|         <colgroup>
+|           <col>
+|         <tbody>
+|           <tr>
+
+#data
+<kbd><table></kbd><col><select><tr></table><div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <kbd>
+|       <select>
+|       <table>
+|         <colgroup>
+|           <col>
+|         <tbody>
+|           <tr>
+|       <div>
+
+#data
+<a><li><style></style><title></title></a>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <a>
+|     <li>
+|       <a>
+|         <style>
+|         <title>
+
+#data
+<font></p><p><meta><title></title></font>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <font>
+|       <p>
+|     <p>
+|       <font>
+|         <meta>
+|         <title>
+
+#data
+<a><center><title></title><a>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <a>
+|     <center>
+|       <a>
+|         <title>
+|       <a>
+
+#data
+<svg><title><div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       <svg title>
+|         <div>
+
+#data
+<svg><title><rect><div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       <svg title>
+|         <rect>
+|           <div>
+
+#data
+<svg><title><svg><div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       <svg title>
+|         <svg svg>
+|         <div>
+
+#data
+<img <="" FAIL>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <img>
+|       <=""
+|       fail=""
+
+#data
+<ul><li><div id='foo'/>A</li><li>B<div>C</div></li></ul>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <ul>
+|       <li>
+|         <div>
+|           id="foo"
+|           "A"
+|       <li>
+|         "B"
+|         <div>
+|           "C"
+
+#data
+<svg><em><desc></em>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|     <em>
+|       <desc>
+
+#data
+<table><tr><td><svg><desc><td></desc><circle>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             <svg svg>
+|               <svg desc>
+|           <td>
+|             <circle>
+
+#data
+<svg><tfoot></mi><td>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       <svg tfoot>
+|         <svg td>
+
+#data
+<math><mrow><mrow><mn>1</mn></mrow><mi>a</mi></mrow></math>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       <math mrow>
+|         <math mrow>
+|           <math mn>
+|             "1"
+|         <math mi>
+|           "a"
+
+#data
+<!doctype html><input type="hidden"><frameset>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <frameset>
+
+#data
+<!doctype html><input type="button"><frameset>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <input>
+|       type="button"
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/webkit02.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/webkit02.dat
new file mode 100644
index 00000000..905783d3
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/webkit02.dat
@@ -0,0 +1,159 @@
+#data
+<foo bar=qux/>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <foo>
+|       bar="qux/"
+
+#data
+<p id="status"><noscript><strong>A</strong></noscript><span>B</span></p>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       id="status"
+|       <noscript>
+|         "<strong>A</strong>"
+|       <span>
+|         "B"
+
+#data
+<div><sarcasm><div></div></sarcasm></div>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <div>
+|       <sarcasm>
+|         <div>
+
+#data
+<html><body><img src="" border="0" alt="><div>A</div></body></html>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+
+#data
+<table><td></tbody>A
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "A"
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+
+#data
+<table><td></thead>A
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             "A"
+
+#data
+<table><td></tfoot>A
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             "A"
+
+#data
+<table><thead><td></tbody>A
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <thead>
+|         <tr>
+|           <td>
+|             "A"
+
+#data
+<legend>test</legend>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <legend>
+|       "test"
+
+#data
+<table><input>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <input>
+|     <table>
+
+#data
+<b><em><dcell><postfield><postfield><postfield><postfield><missing_glyph><missing_glyph><missing_glyph><missing_glyph><hkern><aside></b></em>
+#errors
+#document-fragment
+div
+#document
+| <b>
+|   <em>
+|     <dcell>
+|       <postfield>
+|         <postfield>
+|           <postfield>
+|             <postfield>
+|               <missing_glyph>
+|                 <missing_glyph>
+|                   <missing_glyph>
+|                     <missing_glyph>
+|                       <hkern>
+| <aside>
+|   <em>
+|     <b>
+
+#data
+<isindex action="x">
+#errors
+#document-fragment
+table
+#document
+| <form>
+|   action="x"
+| <hr>
+| <label>
+|   "This is a searchable index. Enter search keywords: "
+|   <input>
+|     name="isindex"
+| <hr>
+
+#data
+<option><XH<optgroup></optgroup>
+#errors
+#document-fragment
+select
+#document
+| <option>
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/token.go b/Godeps/_workspace/src/golang.org/x/net/html/token.go
new file mode 100644
index 00000000..893e272a
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/token.go
@@ -0,0 +1,1219 @@
+// Copyright 2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package html
+
+import (
+	"bytes"
+	"errors"
+	"io"
+	"strconv"
+	"strings"
+
+	"golang.org/x/net/html/atom"
+)
+
+// A TokenType is the type of a Token.
+type TokenType uint32
+
+const (
+	// ErrorToken means that an error occurred during tokenization.
+	ErrorToken TokenType = iota
+	// TextToken means a text node.
+	TextToken
+	// A StartTagToken looks like <a>.
+	StartTagToken
+	// An EndTagToken looks like </a>.
+	EndTagToken
+	// A SelfClosingTagToken tag looks like <br/>.
+	SelfClosingTagToken
+	// A CommentToken looks like <!--x-->.
+	CommentToken
+	// A DoctypeToken looks like <!DOCTYPE x>
+	DoctypeToken
+)
+
+// ErrBufferExceeded means that the buffering limit was exceeded.
+var ErrBufferExceeded = errors.New("max buffer exceeded")
+
+// String returns a string representation of the TokenType.
+func (t TokenType) String() string {
+	switch t {
+	case ErrorToken:
+		return "Error"
+	case TextToken:
+		return "Text"
+	case StartTagToken:
+		return "StartTag"
+	case EndTagToken:
+		return "EndTag"
+	case SelfClosingTagToken:
+		return "SelfClosingTag"
+	case CommentToken:
+		return "Comment"
+	case DoctypeToken:
+		return "Doctype"
+	}
+	return "Invalid(" + strconv.Itoa(int(t)) + ")"
+}
+
+// An Attribute is an attribute namespace-key-value triple. Namespace is
+// non-empty for foreign attributes like xlink, Key is alphabetic (and hence
+// does not contain escapable characters like '&', '<' or '>'), and Val is
+// unescaped (it looks like "a<b" rather than "a&lt;b").
+//
+// Namespace is only used by the parser, not the tokenizer.
+type Attribute struct {
+	Namespace, Key, Val string
+}
+
+// A Token consists of a TokenType and some Data (tag name for start and end
+// tags, content for text, comments and doctypes). A tag Token may also contain
+// a slice of Attributes. Data is unescaped for all Tokens (it looks like "a<b"
+// rather than "a&lt;b"). For tag Tokens, DataAtom is the atom for Data, or
+// zero if Data is not a known tag name.
+type Token struct {
+	Type     TokenType
+	DataAtom atom.Atom
+	Data     string
+	Attr     []Attribute
+}
+
+// tagString returns a string representation of a tag Token's Data and Attr.
+func (t Token) tagString() string {
+	if len(t.Attr) == 0 {
+		return t.Data
+	}
+	buf := bytes.NewBufferString(t.Data)
+	for _, a := range t.Attr {
+		buf.WriteByte(' ')
+		buf.WriteString(a.Key)
+		buf.WriteString(`="`)
+		escape(buf, a.Val)
+		buf.WriteByte('"')
+	}
+	return buf.String()
+}
+
+// String returns a string representation of the Token.
+func (t Token) String() string {
+	switch t.Type {
+	case ErrorToken:
+		return ""
+	case TextToken:
+		return EscapeString(t.Data)
+	case StartTagToken:
+		return "<" + t.tagString() + ">"
+	case EndTagToken:
+		return "</" + t.tagString() + ">"
+	case SelfClosingTagToken:
+		return "<" + t.tagString() + "/>"
+	case CommentToken:
+		return "<!--" + t.Data + "-->"
+	case DoctypeToken:
+		return "<!DOCTYPE " + t.Data + ">"
+	}
+	return "Invalid(" + strconv.Itoa(int(t.Type)) + ")"
+}
+
+// span is a range of bytes in a Tokenizer's buffer. The start is inclusive,
+// the end is exclusive.
+type span struct {
+	start, end int
+}
+
+// A Tokenizer returns a stream of HTML Tokens.
+type Tokenizer struct {
+	// r is the source of the HTML text.
+	r io.Reader
+	// tt is the TokenType of the current token.
+	tt TokenType
+	// err is the first error encountered during tokenization. It is possible
+	// for tt != Error && err != nil to hold: this means that Next returned a
+	// valid token but the subsequent Next call will return an error token.
+	// For example, if the HTML text input was just "plain", then the first
+	// Next call would set z.err to io.EOF but return a TextToken, and all
+	// subsequent Next calls would return an ErrorToken.
+	// err is never reset. Once it becomes non-nil, it stays non-nil.
+	err error
+	// readErr is the error returned by the io.Reader r. It is separate from
+	// err because it is valid for an io.Reader to return (n int, err1 error)
+	// such that n > 0 && err1 != nil, and callers should always process the
+	// n > 0 bytes before considering the error err1.
+	readErr error
+	// buf[raw.start:raw.end] holds the raw bytes of the current token.
+	// buf[raw.end:] is buffered input that will yield future tokens.
+	raw span
+	buf []byte
+	// maxBuf limits the data buffered in buf. A value of 0 means unlimited.
+	maxBuf int
+	// buf[data.start:data.end] holds the raw bytes of the current token's data:
+	// a text token's text, a tag token's tag name, etc.
+	data span
+	// pendingAttr is the attribute key and value currently being tokenized.
+	// When complete, pendingAttr is pushed onto attr. nAttrReturned is
+	// incremented on each call to TagAttr.
+	pendingAttr   [2]span
+	attr          [][2]span
+	nAttrReturned int
+	// rawTag is the "script" in "</script>" that closes the next token. If
+	// non-empty, the subsequent call to Next will return a raw or RCDATA text
+	// token: one that treats "<p>" as text instead of an element.
+	// rawTag's contents are lower-cased.
+	rawTag string
+	// textIsRaw is whether the current text token's data is not escaped.
+	textIsRaw bool
+	// convertNUL is whether NUL bytes in the current token's data should
+	// be converted into \ufffd replacement characters.
+	convertNUL bool
+	// allowCDATA is whether CDATA sections are allowed in the current context.
+	allowCDATA bool
+}
+
+// AllowCDATA sets whether or not the tokenizer recognizes <![CDATA[foo]]> as
+// the text "foo". The default value is false, which means to recognize it as
+// a bogus comment "<!-- [CDATA[foo]] -->" instead.
+//
+// Strictly speaking, an HTML5 compliant tokenizer should allow CDATA if and
+// only if tokenizing foreign content, such as MathML and SVG. However,
+// tracking foreign-contentness is difficult to do purely in the tokenizer,
+// as opposed to the parser, due to HTML integration points: an <svg> element
+// can contain a <foreignObject> that is foreign-to-SVG but not foreign-to-
+// HTML. For strict compliance with the HTML5 tokenization algorithm, it is the
+// responsibility of the user of a tokenizer to call AllowCDATA as appropriate.
+// In practice, if using the tokenizer without caring whether MathML or SVG
+// CDATA is text or comments, such as tokenizing HTML to find all the anchor
+// text, it is acceptable to ignore this responsibility.
+func (z *Tokenizer) AllowCDATA(allowCDATA bool) {
+	z.allowCDATA = allowCDATA
+}
+
+// NextIsNotRawText instructs the tokenizer that the next token should not be
+// considered as 'raw text'. Some elements, such as script and title elements,
+// normally require the next token after the opening tag to be 'raw text' that
+// has no child elements. For example, tokenizing "<title>a<b>c</b>d</title>"
+// yields a start tag token for "<title>", a text token for "a<b>c</b>d", and
+// an end tag token for "</title>". There are no distinct start tag or end tag
+// tokens for the "<b>" and "</b>".
+//
+// This tokenizer implementation will generally look for raw text at the right
+// times. Strictly speaking, an HTML5 compliant tokenizer should not look for
+// raw text if in foreign content: <title> generally needs raw text, but a
+// <title> inside an <svg> does not. Another example is that a <textarea>
+// generally needs raw text, but a <textarea> is not allowed as an immediate
+// child of a <select>; in normal parsing, a <textarea> implies </select>, but
+// one cannot close the implicit element when parsing a <select>'s InnerHTML.
+// Similarly to AllowCDATA, tracking the correct moment to override raw-text-
+// ness is difficult to do purely in the tokenizer, as opposed to the parser.
+// For strict compliance with the HTML5 tokenization algorithm, it is the
+// responsibility of the user of a tokenizer to call NextIsNotRawText as
+// appropriate. In practice, like AllowCDATA, it is acceptable to ignore this
+// responsibility for basic usage.
+//
+// Note that this 'raw text' concept is different from the one offered by the
+// Tokenizer.Raw method.
+func (z *Tokenizer) NextIsNotRawText() {
+	z.rawTag = ""
+}
+
+// Err returns the error associated with the most recent ErrorToken token.
+// This is typically io.EOF, meaning the end of tokenization.
+func (z *Tokenizer) Err() error {
+	if z.tt != ErrorToken {
+		return nil
+	}
+	return z.err
+}
+
+// readByte returns the next byte from the input stream, doing a buffered read
+// from z.r into z.buf if necessary. z.buf[z.raw.start:z.raw.end] remains a contiguous byte
+// slice that holds all the bytes read so far for the current token.
+// It sets z.err if the underlying reader returns an error.
+// Pre-condition: z.err == nil.
+func (z *Tokenizer) readByte() byte {
+	if z.raw.end >= len(z.buf) {
+		// Our buffer is exhausted and we have to read from z.r. Check if the
+		// previous read resulted in an error.
+		if z.readErr != nil {
+			z.err = z.readErr
+			return 0
+		}
+		// We copy z.buf[z.raw.start:z.raw.end] to the beginning of z.buf. If the length
+		// z.raw.end - z.raw.start is more than half the capacity of z.buf, then we
+		// allocate a new buffer before the copy.
+		c := cap(z.buf)
+		d := z.raw.end - z.raw.start
+		var buf1 []byte
+		if 2*d > c {
+			buf1 = make([]byte, d, 2*c)
+		} else {
+			buf1 = z.buf[:d]
+		}
+		copy(buf1, z.buf[z.raw.start:z.raw.end])
+		if x := z.raw.start; x != 0 {
+			// Adjust the data/attr spans to refer to the same contents after the copy.
+			z.data.start -= x
+			z.data.end -= x
+			z.pendingAttr[0].start -= x
+			z.pendingAttr[0].end -= x
+			z.pendingAttr[1].start -= x
+			z.pendingAttr[1].end -= x
+			for i := range z.attr {
+				z.attr[i][0].start -= x
+				z.attr[i][0].end -= x
+				z.attr[i][1].start -= x
+				z.attr[i][1].end -= x
+			}
+		}
+		z.raw.start, z.raw.end, z.buf = 0, d, buf1[:d]
+		// Now that we have copied the live bytes to the start of the buffer,
+		// we read from z.r into the remainder.
+		var n int
+		n, z.readErr = readAtLeastOneByte(z.r, buf1[d:cap(buf1)])
+		if n == 0 {
+			z.err = z.readErr
+			return 0
+		}
+		z.buf = buf1[:d+n]
+	}
+	x := z.buf[z.raw.end]
+	z.raw.end++
+	if z.maxBuf > 0 && z.raw.end-z.raw.start >= z.maxBuf {
+		z.err = ErrBufferExceeded
+		return 0
+	}
+	return x
+}
+
+// Buffered returns a slice containing data buffered but not yet tokenized.
+func (z *Tokenizer) Buffered() []byte {
+	return z.buf[z.raw.end:]
+}
+
+// readAtLeastOneByte wraps an io.Reader so that reading cannot return (0, nil).
+// It returns io.ErrNoProgress if the underlying r.Read method returns (0, nil)
+// too many times in succession.
+func readAtLeastOneByte(r io.Reader, b []byte) (int, error) {
+	for i := 0; i < 100; i++ {
+		n, err := r.Read(b)
+		if n != 0 || err != nil {
+			return n, err
+		}
+	}
+	return 0, io.ErrNoProgress
+}
+
+// skipWhiteSpace skips past any white space.
+func (z *Tokenizer) skipWhiteSpace() {
+	if z.err != nil {
+		return
+	}
+	for {
+		c := z.readByte()
+		if z.err != nil {
+			return
+		}
+		switch c {
+		case ' ', '\n', '\r', '\t', '\f':
+			// No-op.
+		default:
+			z.raw.end--
+			return
+		}
+	}
+}
+
+// readRawOrRCDATA reads until the next "</foo>", where "foo" is z.rawTag and
+// is typically something like "script" or "textarea".
+func (z *Tokenizer) readRawOrRCDATA() {
+	if z.rawTag == "script" {
+		z.readScript()
+		z.textIsRaw = true
+		z.rawTag = ""
+		return
+	}
+loop:
+	for {
+		c := z.readByte()
+		if z.err != nil {
+			break loop
+		}
+		if c != '<' {
+			continue loop
+		}
+		c = z.readByte()
+		if z.err != nil {
+			break loop
+		}
+		if c != '/' {
+			continue loop
+		}
+		if z.readRawEndTag() || z.err != nil {
+			break loop
+		}
+	}
+	z.data.end = z.raw.end
+	// A textarea's or title's RCDATA can contain escaped entities.
+	z.textIsRaw = z.rawTag != "textarea" && z.rawTag != "title"
+	z.rawTag = ""
+}
+
+// readRawEndTag attempts to read a tag like "</foo>", where "foo" is z.rawTag.
+// If it succeeds, it backs up the input position to reconsume the tag and
+// returns true. Otherwise it returns false. The opening "</" has already been
+// consumed.
+func (z *Tokenizer) readRawEndTag() bool {
+	for i := 0; i < len(z.rawTag); i++ {
+		c := z.readByte()
+		if z.err != nil {
+			return false
+		}
+		if c != z.rawTag[i] && c != z.rawTag[i]-('a'-'A') {
+			z.raw.end--
+			return false
+		}
+	}
+	c := z.readByte()
+	if z.err != nil {
+		return false
+	}
+	switch c {
+	case ' ', '\n', '\r', '\t', '\f', '/', '>':
+		// The 3 is 2 for the leading "</" plus 1 for the trailing character c.
+		z.raw.end -= 3 + len(z.rawTag)
+		return true
+	}
+	z.raw.end--
+	return false
+}
+
+// readScript reads until the next </script> tag, following the byzantine
+// rules for escaping/hiding the closing tag.
+func (z *Tokenizer) readScript() {
+	defer func() {
+		z.data.end = z.raw.end
+	}()
+	var c byte
+
+scriptData:
+	c = z.readByte()
+	if z.err != nil {
+		return
+	}
+	if c == '<' {
+		goto scriptDataLessThanSign
+	}
+	goto scriptData
+
+scriptDataLessThanSign:
+	c = z.readByte()
+	if z.err != nil {
+		return
+	}
+	switch c {
+	case '/':
+		goto scriptDataEndTagOpen
+	case '!':
+		goto scriptDataEscapeStart
+	}
+	z.raw.end--
+	goto scriptData
+
+scriptDataEndTagOpen:
+	if z.readRawEndTag() || z.err != nil {
+		return
+	}
+	goto scriptData
+
+scriptDataEscapeStart:
+	c = z.readByte()
+	if z.err != nil {
+		return
+	}
+	if c == '-' {
+		goto scriptDataEscapeStartDash
+	}
+	z.raw.end--
+	goto scriptData
+
+scriptDataEscapeStartDash:
+	c = z.readByte()
+	if z.err != nil {
+		return
+	}
+	if c == '-' {
+		goto scriptDataEscapedDashDash
+	}
+	z.raw.end--
+	goto scriptData
+
+scriptDataEscaped:
+	c = z.readByte()
+	if z.err != nil {
+		return
+	}
+	switch c {
+	case '-':
+		goto scriptDataEscapedDash
+	case '<':
+		goto scriptDataEscapedLessThanSign
+	}
+	goto scriptDataEscaped
+
+scriptDataEscapedDash:
+	c = z.readByte()
+	if z.err != nil {
+		return
+	}
+	switch c {
+	case '-':
+		goto scriptDataEscapedDashDash
+	case '<':
+		goto scriptDataEscapedLessThanSign
+	}
+	goto scriptDataEscaped
+
+scriptDataEscapedDashDash:
+	c = z.readByte()
+	if z.err != nil {
+		return
+	}
+	switch c {
+	case '-':
+		goto scriptDataEscapedDashDash
+	case '<':
+		goto scriptDataEscapedLessThanSign
+	case '>':
+		goto scriptData
+	}
+	goto scriptDataEscaped
+
+scriptDataEscapedLessThanSign:
+	c = z.readByte()
+	if z.err != nil {
+		return
+	}
+	if c == '/' {
+		goto scriptDataEscapedEndTagOpen
+	}
+	if 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' {
+		goto scriptDataDoubleEscapeStart
+	}
+	z.raw.end--
+	goto scriptData
+
+scriptDataEscapedEndTagOpen:
+	if z.readRawEndTag() || z.err != nil {
+		return
+	}
+	goto scriptDataEscaped
+
+scriptDataDoubleEscapeStart:
+	z.raw.end--
+	for i := 0; i < len("script"); i++ {
+		c = z.readByte()
+		if z.err != nil {
+			return
+		}
+		if c != "script"[i] && c != "SCRIPT"[i] {
+			z.raw.end--
+			goto scriptDataEscaped
+		}
+	}
+	c = z.readByte()
+	if z.err != nil {
+		return
+	}
+	switch c {
+	case ' ', '\n', '\r', '\t', '\f', '/', '>':
+		goto scriptDataDoubleEscaped
+	}
+	z.raw.end--
+	goto scriptDataEscaped
+
+scriptDataDoubleEscaped:
+	c = z.readByte()
+	if z.err != nil {
+		return
+	}
+	switch c {
+	case '-':
+		goto scriptDataDoubleEscapedDash
+	case '<':
+		goto scriptDataDoubleEscapedLessThanSign
+	}
+	goto scriptDataDoubleEscaped
+
+scriptDataDoubleEscapedDash:
+	c = z.readByte()
+	if z.err != nil {
+		return
+	}
+	switch c {
+	case '-':
+		goto scriptDataDoubleEscapedDashDash
+	case '<':
+		goto scriptDataDoubleEscapedLessThanSign
+	}
+	goto scriptDataDoubleEscaped
+
+scriptDataDoubleEscapedDashDash:
+	c = z.readByte()
+	if z.err != nil {
+		return
+	}
+	switch c {
+	case '-':
+		goto scriptDataDoubleEscapedDashDash
+	case '<':
+		goto scriptDataDoubleEscapedLessThanSign
+	case '>':
+		goto scriptData
+	}
+	goto scriptDataDoubleEscaped
+
+scriptDataDoubleEscapedLessThanSign:
+	c = z.readByte()
+	if z.err != nil {
+		return
+	}
+	if c == '/' {
+		goto scriptDataDoubleEscapeEnd
+	}
+	z.raw.end--
+	goto scriptDataDoubleEscaped
+
+scriptDataDoubleEscapeEnd:
+	if z.readRawEndTag() {
+		z.raw.end += len("</script>")
+		goto scriptDataEscaped
+	}
+	if z.err != nil {
+		return
+	}
+	goto scriptDataDoubleEscaped
+}
+
+// readComment reads the next comment token starting with "<!--". The opening
+// "<!--" has already been consumed.
+func (z *Tokenizer) readComment() {
+	z.data.start = z.raw.end
+	defer func() {
+		if z.data.end < z.data.start {
+			// It's a comment with no data, like <!-->.
+			z.data.end = z.data.start
+		}
+	}()
+	for dashCount := 2; ; {
+		c := z.readByte()
+		if z.err != nil {
+			// Ignore up to two dashes at EOF.
+			if dashCount > 2 {
+				dashCount = 2
+			}
+			z.data.end = z.raw.end - dashCount
+			return
+		}
+		switch c {
+		case '-':
+			dashCount++
+			continue
+		case '>':
+			if dashCount >= 2 {
+				z.data.end = z.raw.end - len("-->")
+				return
+			}
+		case '!':
+			if dashCount >= 2 {
+				c = z.readByte()
+				if z.err != nil {
+					z.data.end = z.raw.end
+					return
+				}
+				if c == '>' {
+					z.data.end = z.raw.end - len("--!>")
+					return
+				}
+			}
+		}
+		dashCount = 0
+	}
+}
+
+// readUntilCloseAngle reads until the next ">".
+func (z *Tokenizer) readUntilCloseAngle() {
+	z.data.start = z.raw.end
+	for {
+		c := z.readByte()
+		if z.err != nil {
+			z.data.end = z.raw.end
+			return
+		}
+		if c == '>' {
+			z.data.end = z.raw.end - len(">")
+			return
+		}
+	}
+}
+
+// readMarkupDeclaration reads the next token starting with "<!". It might be
+// a "<!--comment-->", a "<!DOCTYPE foo>", a "<![CDATA[section]]>" or
+// "<!a bogus comment". The opening "<!" has already been consumed.
+func (z *Tokenizer) readMarkupDeclaration() TokenType {
+	z.data.start = z.raw.end
+	var c [2]byte
+	for i := 0; i < 2; i++ {
+		c[i] = z.readByte()
+		if z.err != nil {
+			z.data.end = z.raw.end
+			return CommentToken
+		}
+	}
+	if c[0] == '-' && c[1] == '-' {
+		z.readComment()
+		return CommentToken
+	}
+	z.raw.end -= 2
+	if z.readDoctype() {
+		return DoctypeToken
+	}
+	if z.allowCDATA && z.readCDATA() {
+		z.convertNUL = true
+		return TextToken
+	}
+	// It's a bogus comment.
+	z.readUntilCloseAngle()
+	return CommentToken
+}
+
+// readDoctype attempts to read a doctype declaration and returns true if
+// successful. The opening "<!" has already been consumed.
+func (z *Tokenizer) readDoctype() bool {
+	const s = "DOCTYPE"
+	for i := 0; i < len(s); i++ {
+		c := z.readByte()
+		if z.err != nil {
+			z.data.end = z.raw.end
+			return false
+		}
+		if c != s[i] && c != s[i]+('a'-'A') {
+			// Back up to read the fragment of "DOCTYPE" again.
+			z.raw.end = z.data.start
+			return false
+		}
+	}
+	if z.skipWhiteSpace(); z.err != nil {
+		z.data.start = z.raw.end
+		z.data.end = z.raw.end
+		return true
+	}
+	z.readUntilCloseAngle()
+	return true
+}
+
+// readCDATA attempts to read a CDATA section and returns true if
+// successful. The opening "<!" has already been consumed.
+func (z *Tokenizer) readCDATA() bool {
+	const s = "[CDATA["
+	for i := 0; i < len(s); i++ {
+		c := z.readByte()
+		if z.err != nil {
+			z.data.end = z.raw.end
+			return false
+		}
+		if c != s[i] {
+			// Back up to read the fragment of "[CDATA[" again.
+			z.raw.end = z.data.start
+			return false
+		}
+	}
+	z.data.start = z.raw.end
+	brackets := 0
+	for {
+		c := z.readByte()
+		if z.err != nil {
+			z.data.end = z.raw.end
+			return true
+		}
+		switch c {
+		case ']':
+			brackets++
+		case '>':
+			if brackets >= 2 {
+				z.data.end = z.raw.end - len("]]>")
+				return true
+			}
+			brackets = 0
+		default:
+			brackets = 0
+		}
+	}
+}
+
+// startTagIn returns whether the start tag in z.buf[z.data.start:z.data.end]
+// case-insensitively matches any element of ss.
+func (z *Tokenizer) startTagIn(ss ...string) bool {
+loop:
+	for _, s := range ss {
+		if z.data.end-z.data.start != len(s) {
+			continue loop
+		}
+		for i := 0; i < len(s); i++ {
+			c := z.buf[z.data.start+i]
+			if 'A' <= c && c <= 'Z' {
+				c += 'a' - 'A'
+			}
+			if c != s[i] {
+				continue loop
+			}
+		}
+		return true
+	}
+	return false
+}
+
+// readStartTag reads the next start tag token. The opening "<a" has already
+// been consumed, where 'a' means anything in [A-Za-z].
+func (z *Tokenizer) readStartTag() TokenType {
+	z.readTag(true)
+	if z.err != nil {
+		return ErrorToken
+	}
+	// Several tags flag the tokenizer's next token as raw.
+	c, raw := z.buf[z.data.start], false
+	if 'A' <= c && c <= 'Z' {
+		c += 'a' - 'A'
+	}
+	switch c {
+	case 'i':
+		raw = z.startTagIn("iframe")
+	case 'n':
+		raw = z.startTagIn("noembed", "noframes", "noscript")
+	case 'p':
+		raw = z.startTagIn("plaintext")
+	case 's':
+		raw = z.startTagIn("script", "style")
+	case 't':
+		raw = z.startTagIn("textarea", "title")
+	case 'x':
+		raw = z.startTagIn("xmp")
+	}
+	if raw {
+		z.rawTag = strings.ToLower(string(z.buf[z.data.start:z.data.end]))
+	}
+	// Look for a self-closing token like "<br/>".
+	if z.err == nil && z.buf[z.raw.end-2] == '/' {
+		return SelfClosingTagToken
+	}
+	return StartTagToken
+}
+
+// readTag reads the next tag token and its attributes. If saveAttr, those
+// attributes are saved in z.attr, otherwise z.attr is set to an empty slice.
+// The opening "<a" or "</a" has already been consumed, where 'a' means anything
+// in [A-Za-z].
+func (z *Tokenizer) readTag(saveAttr bool) {
+	z.attr = z.attr[:0]
+	z.nAttrReturned = 0
+	// Read the tag name and attribute key/value pairs.
+	z.readTagName()
+	if z.skipWhiteSpace(); z.err != nil {
+		return
+	}
+	for {
+		c := z.readByte()
+		if z.err != nil || c == '>' {
+			break
+		}
+		z.raw.end--
+		z.readTagAttrKey()
+		z.readTagAttrVal()
+		// Save pendingAttr if saveAttr and that attribute has a non-empty key.
+		if saveAttr && z.pendingAttr[0].start != z.pendingAttr[0].end {
+			z.attr = append(z.attr, z.pendingAttr)
+		}
+		if z.skipWhiteSpace(); z.err != nil {
+			break
+		}
+	}
+}
+
+// readTagName sets z.data to the "div" in "<div k=v>". The reader (z.raw.end)
+// is positioned such that the first byte of the tag name (the "d" in "<div")
+// has already been consumed.
+func (z *Tokenizer) readTagName() {
+	z.data.start = z.raw.end - 1
+	for {
+		c := z.readByte()
+		if z.err != nil {
+			z.data.end = z.raw.end
+			return
+		}
+		switch c {
+		case ' ', '\n', '\r', '\t', '\f':
+			z.data.end = z.raw.end - 1
+			return
+		case '/', '>':
+			z.raw.end--
+			z.data.end = z.raw.end
+			return
+		}
+	}
+}
+
+// readTagAttrKey sets z.pendingAttr[0] to the "k" in "<div k=v>".
+// Precondition: z.err == nil.
+func (z *Tokenizer) readTagAttrKey() {
+	z.pendingAttr[0].start = z.raw.end
+	for {
+		c := z.readByte()
+		if z.err != nil {
+			z.pendingAttr[0].end = z.raw.end
+			return
+		}
+		switch c {
+		case ' ', '\n', '\r', '\t', '\f', '/':
+			z.pendingAttr[0].end = z.raw.end - 1
+			return
+		case '=', '>':
+			z.raw.end--
+			z.pendingAttr[0].end = z.raw.end
+			return
+		}
+	}
+}
+
+// readTagAttrVal sets z.pendingAttr[1] to the "v" in "<div k=v>".
+func (z *Tokenizer) readTagAttrVal() {
+	z.pendingAttr[1].start = z.raw.end
+	z.pendingAttr[1].end = z.raw.end
+	if z.skipWhiteSpace(); z.err != nil {
+		return
+	}
+	c := z.readByte()
+	if z.err != nil {
+		return
+	}
+	if c != '=' {
+		z.raw.end--
+		return
+	}
+	if z.skipWhiteSpace(); z.err != nil {
+		return
+	}
+	quote := z.readByte()
+	if z.err != nil {
+		return
+	}
+	switch quote {
+	case '>':
+		z.raw.end--
+		return
+
+	case '\'', '"':
+		z.pendingAttr[1].start = z.raw.end
+		for {
+			c := z.readByte()
+			if z.err != nil {
+				z.pendingAttr[1].end = z.raw.end
+				return
+			}
+			if c == quote {
+				z.pendingAttr[1].end = z.raw.end - 1
+				return
+			}
+		}
+
+	default:
+		z.pendingAttr[1].start = z.raw.end - 1
+		for {
+			c := z.readByte()
+			if z.err != nil {
+				z.pendingAttr[1].end = z.raw.end
+				return
+			}
+			switch c {
+			case ' ', '\n', '\r', '\t', '\f':
+				z.pendingAttr[1].end = z.raw.end - 1
+				return
+			case '>':
+				z.raw.end--
+				z.pendingAttr[1].end = z.raw.end
+				return
+			}
+		}
+	}
+}
+
+// Next scans the next token and returns its type.
+func (z *Tokenizer) Next() TokenType {
+	z.raw.start = z.raw.end
+	z.data.start = z.raw.end
+	z.data.end = z.raw.end
+	if z.err != nil {
+		z.tt = ErrorToken
+		return z.tt
+	}
+	if z.rawTag != "" {
+		if z.rawTag == "plaintext" {
+			// Read everything up to EOF.
+			for z.err == nil {
+				z.readByte()
+			}
+			z.data.end = z.raw.end
+			z.textIsRaw = true
+		} else {
+			z.readRawOrRCDATA()
+		}
+		if z.data.end > z.data.start {
+			z.tt = TextToken
+			z.convertNUL = true
+			return z.tt
+		}
+	}
+	z.textIsRaw = false
+	z.convertNUL = false
+
+loop:
+	for {
+		c := z.readByte()
+		if z.err != nil {
+			break loop
+		}
+		if c != '<' {
+			continue loop
+		}
+
+		// Check if the '<' we have just read is part of a tag, comment
+		// or doctype. If not, it's part of the accumulated text token.
+		c = z.readByte()
+		if z.err != nil {
+			break loop
+		}
+		var tokenType TokenType
+		switch {
+		case 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z':
+			tokenType = StartTagToken
+		case c == '/':
+			tokenType = EndTagToken
+		case c == '!' || c == '?':
+			// We use CommentToken to mean any of "<!--actual comments-->",
+			// "<!DOCTYPE declarations>" and "<?xml processing instructions?>".
+			tokenType = CommentToken
+		default:
+			// Reconsume the current character.
+			z.raw.end--
+			continue
+		}
+
+		// We have a non-text token, but we might have accumulated some text
+		// before that. If so, we return the text first, and return the non-
+		// text token on the subsequent call to Next.
+		if x := z.raw.end - len("<a"); z.raw.start < x {
+			z.raw.end = x
+			z.data.end = x
+			z.tt = TextToken
+			return z.tt
+		}
+		switch tokenType {
+		case StartTagToken:
+			z.tt = z.readStartTag()
+			return z.tt
+		case EndTagToken:
+			c = z.readByte()
+			if z.err != nil {
+				break loop
+			}
+			if c == '>' {
+				// "</>" does not generate a token at all. Generate an empty comment
+				// to allow passthrough clients to pick up the data using Raw.
+				// Reset the tokenizer state and start again.
+				z.tt = CommentToken
+				return z.tt
+			}
+			if 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' {
+				z.readTag(false)
+				if z.err != nil {
+					z.tt = ErrorToken
+				} else {
+					z.tt = EndTagToken
+				}
+				return z.tt
+			}
+			z.raw.end--
+			z.readUntilCloseAngle()
+			z.tt = CommentToken
+			return z.tt
+		case CommentToken:
+			if c == '!' {
+				z.tt = z.readMarkupDeclaration()
+				return z.tt
+			}
+			z.raw.end--
+			z.readUntilCloseAngle()
+			z.tt = CommentToken
+			return z.tt
+		}
+	}
+	if z.raw.start < z.raw.end {
+		z.data.end = z.raw.end
+		z.tt = TextToken
+		return z.tt
+	}
+	z.tt = ErrorToken
+	return z.tt
+}
+
+// Raw returns the unmodified text of the current token. Calling Next, Token,
+// Text, TagName or TagAttr may change the contents of the returned slice.
+func (z *Tokenizer) Raw() []byte {
+	return z.buf[z.raw.start:z.raw.end]
+}
+
+// convertNewlines converts "\r" and "\r\n" in s to "\n".
+// The conversion happens in place, but the resulting slice may be shorter.
+func convertNewlines(s []byte) []byte {
+	for i, c := range s {
+		if c != '\r' {
+			continue
+		}
+
+		src := i + 1
+		if src >= len(s) || s[src] != '\n' {
+			s[i] = '\n'
+			continue
+		}
+
+		dst := i
+		for src < len(s) {
+			if s[src] == '\r' {
+				if src+1 < len(s) && s[src+1] == '\n' {
+					src++
+				}
+				s[dst] = '\n'
+			} else {
+				s[dst] = s[src]
+			}
+			src++
+			dst++
+		}
+		return s[:dst]
+	}
+	return s
+}
+
+var (
+	nul         = []byte("\x00")
+	replacement = []byte("\ufffd")
+)
+
+// Text returns the unescaped text of a text, comment or doctype token. The
+// contents of the returned slice may change on the next call to Next.
+func (z *Tokenizer) Text() []byte {
+	switch z.tt {
+	case TextToken, CommentToken, DoctypeToken:
+		s := z.buf[z.data.start:z.data.end]
+		z.data.start = z.raw.end
+		z.data.end = z.raw.end
+		s = convertNewlines(s)
+		if (z.convertNUL || z.tt == CommentToken) && bytes.Contains(s, nul) {
+			s = bytes.Replace(s, nul, replacement, -1)
+		}
+		if !z.textIsRaw {
+			s = unescape(s, false)
+		}
+		return s
+	}
+	return nil
+}
+
+// TagName returns the lower-cased name of a tag token (the `img` out of
+// `<IMG SRC="foo">`) and whether the tag has attributes.
+// The contents of the returned slice may change on the next call to Next.
+func (z *Tokenizer) TagName() (name []byte, hasAttr bool) {
+	if z.data.start < z.data.end {
+		switch z.tt {
+		case StartTagToken, EndTagToken, SelfClosingTagToken:
+			s := z.buf[z.data.start:z.data.end]
+			z.data.start = z.raw.end
+			z.data.end = z.raw.end
+			return lower(s), z.nAttrReturned < len(z.attr)
+		}
+	}
+	return nil, false
+}
+
+// TagAttr returns the lower-cased key and unescaped value of the next unparsed
+// attribute for the current tag token and whether there are more attributes.
+// The contents of the returned slices may change on the next call to Next.
+func (z *Tokenizer) TagAttr() (key, val []byte, moreAttr bool) {
+	if z.nAttrReturned < len(z.attr) {
+		switch z.tt {
+		case StartTagToken, SelfClosingTagToken:
+			x := z.attr[z.nAttrReturned]
+			z.nAttrReturned++
+			key = z.buf[x[0].start:x[0].end]
+			val = z.buf[x[1].start:x[1].end]
+			return lower(key), unescape(convertNewlines(val), true), z.nAttrReturned < len(z.attr)
+		}
+	}
+	return nil, nil, false
+}
+
+// Token returns the next Token. The result's Data and Attr values remain valid
+// after subsequent Next calls.
+func (z *Tokenizer) Token() Token {
+	t := Token{Type: z.tt}
+	switch z.tt {
+	case TextToken, CommentToken, DoctypeToken:
+		t.Data = string(z.Text())
+	case StartTagToken, SelfClosingTagToken, EndTagToken:
+		name, moreAttr := z.TagName()
+		for moreAttr {
+			var key, val []byte
+			key, val, moreAttr = z.TagAttr()
+			t.Attr = append(t.Attr, Attribute{"", atom.String(key), string(val)})
+		}
+		if a := atom.Lookup(name); a != 0 {
+			t.DataAtom, t.Data = a, a.String()
+		} else {
+			t.DataAtom, t.Data = 0, string(name)
+		}
+	}
+	return t
+}
+
+// SetMaxBuf sets a limit on the amount of data buffered during tokenization.
+// A value of 0 means unlimited.
+func (z *Tokenizer) SetMaxBuf(n int) {
+	z.maxBuf = n
+}
+
+// NewTokenizer returns a new HTML Tokenizer for the given Reader.
+// The input is assumed to be UTF-8 encoded.
+func NewTokenizer(r io.Reader) *Tokenizer {
+	return NewTokenizerFragment(r, "")
+}
+
+// NewTokenizerFragment returns a new HTML Tokenizer for the given Reader, for
+// tokenizing an existing element's InnerHTML fragment. contextTag is that
+// element's tag, such as "div" or "iframe".
+//
+// For example, how the InnerHTML "a<b" is tokenized depends on whether it is
+// for a <p> tag or a <script> tag.
+//
+// The input is assumed to be UTF-8 encoded.
+func NewTokenizerFragment(r io.Reader, contextTag string) *Tokenizer {
+	z := &Tokenizer{
+		r:   r,
+		buf: make([]byte, 0, 4096),
+	}
+	if contextTag != "" {
+		switch s := strings.ToLower(contextTag); s {
+		case "iframe", "noembed", "noframes", "noscript", "plaintext", "script", "style", "title", "textarea", "xmp":
+			z.rawTag = s
+		}
+	}
+	return z
+}
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/token_test.go b/Godeps/_workspace/src/golang.org/x/net/html/token_test.go
new file mode 100644
index 00000000..20221c32
--- /dev/null
+++ b/Godeps/_workspace/src/golang.org/x/net/html/token_test.go
@@ -0,0 +1,748 @@
+// Copyright 2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package html
+
+import (
+	"bytes"
+	"io"
+	"io/ioutil"
+	"reflect"
+	"runtime"
+	"strings"
+	"testing"
+)
+
+type tokenTest struct {
+	// A short description of the test case.
+	desc string
+	// The HTML to parse.
+	html string
+	// The string representations of the expected tokens, joined by '$'.
+	golden string
+}
+
+var tokenTests = []tokenTest{
+	{
+		"empty",
+		"",
+		"",
+	},
+	// A single text node. The tokenizer should not break text nodes on whitespace,
+	// nor should it normalize whitespace within a text node.
+	{
+		"text",
+		"foo  bar",
+		"foo  bar",
+	},
+	// An entity.
+	{
+		"entity",
+		"one &lt; two",
+		"one &lt; two",
+	},
+	// A start, self-closing and end tag. The tokenizer does not care if the start
+	// and end tokens don't match; that is the job of the parser.
+	{
+		"tags",
+		"<a>b<c/>d</e>",
+		"<a>$b$<c/>$d$</e>",
+	},
+	// Angle brackets that aren't a tag.
+	{
+		"not a tag #0",
+		"<",
+		"&lt;",
+	},
+	{
+		"not a tag #1",
+		"</",
+		"&lt;/",
+	},
+	{
+		"not a tag #2",
+		"</>",
+		"<!---->",
+	},
+	{
+		"not a tag #3",
+		"a</>b",
+		"a$<!---->$b",
+	},
+	{
+		"not a tag #4",
+		"</ >",
+		"<!-- -->",
+	},
+	{
+		"not a tag #5",
+		"</.",
+		"<!--.-->",
+	},
+	{
+		"not a tag #6",
+		"</.>",
+		"<!--.-->",
+	},
+	{
+		"not a tag #7",
+		"a < b",
+		"a &lt; b",
+	},
+	{
+		"not a tag #8",
+		"<.>",
+		"&lt;.&gt;",
+	},
+	{
+		"not a tag #9",
+		"a<<<b>>>c",
+		"a&lt;&lt;$<b>$&gt;&gt;c",
+	},
+	{
+		"not a tag #10",
+		"if x<0 and y < 0 then x*y>0",
+		"if x&lt;0 and y &lt; 0 then x*y&gt;0",
+	},
+	{
+		"not a tag #11",
+		"<<p>",
+		"&lt;$<p>",
+	},
+	// EOF in a tag name.
+	{
+		"tag name eof #0",
+		"<a",
+		"",
+	},
+	{
+		"tag name eof #1",
+		"<a ",
+		"",
+	},
+	{
+		"tag name eof #2",
+		"a<b",
+		"a",
+	},
+	{
+		"tag name eof #3",
+		"<a><b",
+		"<a>",
+	},
+	{
+		"tag name eof #4",
+		`<a x`,
+		``,
+	},
+	// Some malformed tags that are missing a '>'.
+	{
+		"malformed tag #0",
+		`<p</p>`,
+		`<p< p="">`,
+	},
+	{
+		"malformed tag #1",
+		`<p </p>`,
+		`<p <="" p="">`,
+	},
+	{
+		"malformed tag #2",
+		`<p id`,
+		``,
+	},
+	{
+		"malformed tag #3",
+		`<p id=`,
+		``,
+	},
+	{
+		"malformed tag #4",
+		`<p id=>`,
+		`<p id="">`,
+	},
+	{
+		"malformed tag #5",
+		`<p id=0`,
+		``,
+	},
+	{
+		"malformed tag #6",
+		`<p id=0</p>`,
+		`<p id="0&lt;/p">`,
+	},
+	{
+		"malformed tag #7",
+		`<p id="0</p>`,
+		``,
+	},
+	{
+		"malformed tag #8",
+		`<p id="0"</p>`,
+		`<p id="0" <="" p="">`,
+	},
+	{
+		"malformed tag #9",
+		`<p></p id`,
+		`<p>`,
+	},
+	// Raw text and RCDATA.
+	{
+		"basic raw text",
+		"<script><a></b></script>",
+		"<script>$&lt;a&gt;&lt;/b&gt;$</script>",
+	},
+	{
+		"unfinished script end tag",
+		"<SCRIPT>a</SCR",
+		"<script>$a&lt;/SCR",
+	},
+	{
+		"broken script end tag",
+		"<SCRIPT>a</SCR ipt>",
+		"<script>$a&lt;/SCR ipt&gt;",
+	},
+	{
+		"EOF in script end tag",
+		"<SCRIPT>a</SCRipt",
+		"<script>$a&lt;/SCRipt",
+	},
+	{
+		"scriptx end tag",
+		"<SCRIPT>a</SCRiptx",
+		"<script>$a&lt;/SCRiptx",
+	},
+	{
+		"' ' completes script end tag",
+		"<SCRIPT>a</SCRipt ",
+		"<script>$a",
+	},
+	{
+		"'>' completes script end tag",
+		"<SCRIPT>a</SCRipt>",
+		"<script>$a$</script>",
+	},
+	{
+		"self-closing script end tag",
+		"<SCRIPT>a</SCRipt/>",
+		"<script>$a$</script>",
+	},
+	{
+		"nested script tag",
+		"<SCRIPT>a</SCRipt<script>",
+		"<script>$a&lt;/SCRipt&lt;script&gt;",
+	},
+	{
+		"script end tag after unfinished",
+		"<SCRIPT>a</SCRipt</script>",
+		"<script>$a&lt;/SCRipt$</script>",
+	},
+	{
+		"script/style mismatched tags",
+		"<script>a</style>",
+		"<script>$a&lt;/style&gt;",
+	},
+	{
+		"style element with entity",
+		"<style>&apos;",
+		"<style>$&amp;apos;",
+	},
+	{
+		"textarea with tag",
+		"<textarea><div></textarea>",
+		"<textarea>$&lt;div&gt;$</textarea>",
+	},
+	{
+		"title with tag and entity",
+		"<title><b>K&amp;R C</b></title>",
+		"<title>$&lt;b&gt;K&amp;R C&lt;/b&gt;$</title>",
+	},
+	// DOCTYPE tests.
+	{
+		"Proper DOCTYPE",
+		"<!DOCTYPE html>",
+		"<!DOCTYPE html>",
+	},
+	{
+		"DOCTYPE with no space",
+		"<!doctypehtml>",
+		"<!DOCTYPE html>",
+	},
+	{
+		"DOCTYPE with two spaces",
+		"<!doctype  html>",
+		"<!DOCTYPE html>",
+	},
+	{
+		"looks like DOCTYPE but isn't",
+		"<!DOCUMENT html>",
+		"<!--DOCUMENT html-->",
+	},
+	{
+		"DOCTYPE at EOF",
+		"<!DOCtype",
+		"<!DOCTYPE >",
+	},
+	// XML processing instructions.
+	{
+		"XML processing instruction",
+		"<?xml?>",
+		"<!--?xml?-->",
+	},
+	// Comments.
+	{
+		"comment0",
+		"abc<b><!-- skipme --></b>def",
+		"abc$<b>$<!-- skipme -->$</b>$def",
+	},
+	{
+		"comment1",
+		"a<!-->z",
+		"a$<!---->$z",
+	},
+	{
+		"comment2",
+		"a<!--->z",
+		"a$<!---->$z",
+	},
+	{
+		"comment3",
+		"a<!--x>-->z",
+		"a$<!--x>-->$z",
+	},
+	{
+		"comment4",
+		"a<!--x->-->z",
+		"a$<!--x->-->$z",
+	},
+	{
+		"comment5",
+		"a<!>z",
+		"a$<!---->$z",
+	},
+	{
+		"comment6",
+		"a<!->z",
+		"a$<!----->$z",
+	},
+	{
+		"comment7",
+		"a<!---<>z",
+		"a$<!---<>z-->",
+	},
+	{
+		"comment8",
+		"a<!--z",
+		"a$<!--z-->",
+	},
+	{
+		"comment9",
+		"a<!--z-",
+		"a$<!--z-->",
+	},
+	{
+		"comment10",
+		"a<!--z--",
+		"a$<!--z-->",
+	},
+	{
+		"comment11",
+		"a<!--z---",
+		"a$<!--z--->",
+	},
+	{
+		"comment12",
+		"a<!--z----",
+		"a$<!--z---->",
+	},
+	{
+		"comment13",
+		"a<!--x--!>z",
+		"a$<!--x-->$z",
+	},
+	// An attribute with a backslash.
+	{
+		"backslash",
+		`<p id="a\"b">`,
+		`<p id="a\" b"="">`,
+	},
+	// Entities, tag name and attribute key lower-casing, and whitespace
+	// normalization within a tag.
+	{
+		"tricky",
+		"<p \t\n iD=\"a&quot;B\"  foo=\"bar\"><EM>te&lt;&amp;;xt</em></p>",
+		`<p id="a&#34;B" foo="bar">$<em>$te&lt;&amp;;xt$</em>$</p>`,
+	},
+	// A nonexistent entity. Tokenizing and converting back to a string should
+	// escape the "&" to become "&amp;".
+	{
+		"noSuchEntity",
+		`<a b="c&noSuchEntity;d">&lt;&alsoDoesntExist;&`,
+		`<a b="c&amp;noSuchEntity;d">$&lt;&amp;alsoDoesntExist;&amp;`,
+	},
+	{
+		"entity without semicolon",
+		`&notit;&notin;<a b="q=z&amp=5&notice=hello&not;=world">`,
+		`¬it;∉$<a b="q=z&amp;amp=5&amp;notice=hello¬=world">`,
+	},
+	{
+		"entity with digits",
+		"&frac12;",
+		"½",
+	},
+	// Attribute tests:
+	// http://dev.w3.org/html5/pf-summary/Overview.html#attributes
+	{
+		"Empty attribute",
+		`<input disabled FOO>`,
+		`<input disabled="" foo="">`,
+	},
+	{
+		"Empty attribute, whitespace",
+		`<input disabled FOO >`,
+		`<input disabled="" foo="">`,
+	},
+	{
+		"Unquoted attribute value",
+		`<input value=yes FOO=BAR>`,
+		`<input value="yes" foo="BAR">`,
+	},
+	{
+		"Unquoted attribute value, spaces",
+		`<input value = yes FOO = BAR>`,
+		`<input value="yes" foo="BAR">`,
+	},
+	{
+		"Unquoted attribute value, trailing space",
+		`<input value=yes FOO=BAR >`,
+		`<input value="yes" foo="BAR">`,
+	},
+	{
+		"Single-quoted attribute value",
+		`<input value='yes' FOO='BAR'>`,
+		`<input value="yes" foo="BAR">`,
+	},
+	{
+		"Single-quoted attribute value, trailing space",
+		`<input value='yes' FOO='BAR' >`,
+		`<input value="yes" foo="BAR">`,
+	},
+	{
+		"Double-quoted attribute value",
+		`<input value="I'm an attribute" FOO="BAR">`,
+		`<input value="I&#39;m an attribute" foo="BAR">`,
+	},
+	{
+		"Attribute name characters",
+		`<meta http-equiv="content-type">`,
+		`<meta http-equiv="content-type">`,
+	},
+	{
+		"Mixed attributes",
+		`a<P V="0 1" w='2' X=3 y>z`,
+		`a$<p v="0 1" w="2" x="3" y="">$z`,
+	},
+	{
+		"Attributes with a solitary single quote",
+		`<p id=can't><p id=won't>`,
+		`<p id="can&#39;t">$<p id="won&#39;t">`,
+	},
+}
+
+func TestTokenizer(t *testing.T) {
+loop:
+	for _, tt := range tokenTests {
+		z := NewTokenizer(strings.NewReader(tt.html))
+		if tt.golden != "" {
+			for i, s := range strings.Split(tt.golden, "$") {
+				if z.Next() == ErrorToken {
+					t.Errorf("%s token %d: want %q got error %v", tt.desc, i, s, z.Err())
+					continue loop
+				}
+				actual := z.Token().String()
+				if s != actual {
+					t.Errorf("%s token %d: want %q got %q", tt.desc, i, s, actual)
+					continue loop
+				}
+			}
+		}
+		z.Next()
+		if z.Err() != io.EOF {
+			t.Errorf("%s: want EOF got %q", tt.desc, z.Err())
+		}
+	}
+}
+
+func TestMaxBuffer(t *testing.T) {
+	// Exceeding the maximum buffer size generates ErrBufferExceeded.
+	z := NewTokenizer(strings.NewReader("<" + strings.Repeat("t", 10)))
+	z.SetMaxBuf(5)
+	tt := z.Next()
+	if got, want := tt, ErrorToken; got != want {
+		t.Fatalf("token type: got: %v want: %v", got, want)
+	}
+	if got, want := z.Err(), ErrBufferExceeded; got != want {
+		t.Errorf("error type: got: %v want: %v", got, want)
+	}
+	if got, want := string(z.Raw()), "<tttt"; got != want {
+		t.Fatalf("buffered before overflow: got: %q want: %q", got, want)
+	}
+}
+
+func TestMaxBufferReconstruction(t *testing.T) {
+	// Exceeding the maximum buffer size at any point while tokenizing permits
+	// reconstructing the original input.
+tests:
+	for _, test := range tokenTests {
+		for maxBuf := 1; ; maxBuf++ {
+			r := strings.NewReader(test.html)
+			z := NewTokenizer(r)
+			z.SetMaxBuf(maxBuf)
+			var tokenized bytes.Buffer
+			for {
+				tt := z.Next()
+				tokenized.Write(z.Raw())
+				if tt == ErrorToken {
+					if err := z.Err(); err != io.EOF && err != ErrBufferExceeded {
+						t.Errorf("%s: unexpected error: %v", test.desc, err)
+					}
+					break
+				}
+			}
+			// Anything tokenized along with untokenized input or data left in the reader.
+			assembled, err := ioutil.ReadAll(io.MultiReader(&tokenized, bytes.NewReader(z.Buffered()), r))
+			if err != nil {
+				t.Errorf("%s: ReadAll: %v", test.desc, err)
+				continue tests
+			}
+			if got, want := string(assembled), test.html; got != want {
+				t.Errorf("%s: reassembled html:\n got: %q\nwant: %q", test.desc, got, want)
+				continue tests
+			}
+			// EOF indicates that we completed tokenization and hence found the max
+			// maxBuf that generates ErrBufferExceeded, so continue to the next test.
+			if z.Err() == io.EOF {
+				break
+			}
+		} // buffer sizes
+	} // tests
+}
+
+func TestPassthrough(t *testing.T) {
+	// Accumulating the raw output for each parse event should reconstruct the
+	// original input.
+	for _, test := range tokenTests {
+		z := NewTokenizer(strings.NewReader(test.html))
+		var parsed bytes.Buffer
+		for {
+			tt := z.Next()
+			parsed.Write(z.Raw())
+			if tt == ErrorToken {
+				break
+			}
+		}
+		if got, want := parsed.String(), test.html; got != want {
+			t.Errorf("%s: parsed output:\n got: %q\nwant: %q", test.desc, got, want)
+		}
+	}
+}
+
+func TestBufAPI(t *testing.T) {
+	s := "0<a>1</a>2<b>3<a>4<a>5</a>6</b>7</a>8<a/>9"
+	z := NewTokenizer(bytes.NewBufferString(s))
+	var result bytes.Buffer
+	depth := 0
+loop:
+	for {
+		tt := z.Next()
+		switch tt {
+		case ErrorToken:
+			if z.Err() != io.EOF {
+				t.Error(z.Err())
+			}
+			break loop
+		case TextToken:
+			if depth > 0 {
+				result.Write(z.Text())
+			}
+		case StartTagToken, EndTagToken:
+			tn, _ := z.TagName()
+			if len(tn) == 1 && tn[0] == 'a' {
+				if tt == StartTagToken {
+					depth++
+				} else {
+					depth--
+				}
+			}
+		}
+	}
+	u := "14567"
+	v := string(result.Bytes())
+	if u != v {
+		t.Errorf("TestBufAPI: want %q got %q", u, v)
+	}
+}
+
+func TestConvertNewlines(t *testing.T) {
+	testCases := map[string]string{
+		"Mac\rDOS\r\nUnix\n":    "Mac\nDOS\nUnix\n",
+		"Unix\nMac\rDOS\r\n":    "Unix\nMac\nDOS\n",
+		"DOS\r\nDOS\r\nDOS\r\n": "DOS\nDOS\nDOS\n",
+		"":         "",
+		"\n":       "\n",
+		"\n\r":     "\n\n",
+		"\r":       "\n",
+		"\r\n":     "\n",
+		"\r\n\n":   "\n\n",
+		"\r\n\r":   "\n\n",
+		"\r\n\r\n": "\n\n",
+		"\r\r":     "\n\n",
+		"\r\r\n":   "\n\n",
+		"\r\r\n\n": "\n\n\n",
+		"\r\r\r\n": "\n\n\n",
+		"\r \n":    "\n \n",
+		"xyz":      "xyz",
+	}
+	for in, want := range testCases {
+		if got := string(convertNewlines([]byte(in))); got != want {
+			t.Errorf("input %q: got %q, want %q", in, got, want)
+		}
+	}
+}
+
+func TestReaderEdgeCases(t *testing.T) {
+	const s = "<p>An io.Reader can return (0, nil) or (n, io.EOF).</p>"
+	testCases := []io.Reader{
+		&zeroOneByteReader{s: s},
+		&eofStringsReader{s: s},
+		&stuckReader{},
+	}
+	for i, tc := range testCases {
+		got := []TokenType{}
+		z := NewTokenizer(tc)
+		for {
+			tt := z.Next()
+			if tt == ErrorToken {
+				break
+			}
+			got = append(got, tt)
+		}
+		if err := z.Err(); err != nil && err != io.EOF {
+			if err != io.ErrNoProgress {
+				t.Errorf("i=%d: %v", i, err)
+			}
+			continue
+		}
+		want := []TokenType{
+			StartTagToken,
+			TextToken,
+			EndTagToken,
+		}
+		if !reflect.DeepEqual(got, want) {
+			t.Errorf("i=%d: got %v, want %v", i, got, want)
+			continue
+		}
+	}
+}
+
+// zeroOneByteReader is like a strings.Reader that alternates between
+// returning 0 bytes and 1 byte at a time.
+type zeroOneByteReader struct {
+	s string
+	n int
+}
+
+func (r *zeroOneByteReader) Read(p []byte) (int, error) {
+	if len(p) == 0 {
+		return 0, nil
+	}
+	if len(r.s) == 0 {
+		return 0, io.EOF
+	}
+	r.n++
+	if r.n%2 != 0 {
+		return 0, nil
+	}
+	p[0], r.s = r.s[0], r.s[1:]
+	return 1, nil
+}
+
+// eofStringsReader is like a strings.Reader but can return an (n, err) where
+// n > 0 && err != nil.
+type eofStringsReader struct {
+	s string
+}
+
+func (r *eofStringsReader) Read(p []byte) (int, error) {
+	n := copy(p, r.s)
+	r.s = r.s[n:]
+	if r.s != "" {
+		return n, nil
+	}
+	return n, io.EOF
+}
+
+// stuckReader is an io.Reader that always returns no data and no error.
+type stuckReader struct{}
+
+func (*stuckReader) Read(p []byte) (int, error) {
+	return 0, nil
+}
+
+const (
+	rawLevel = iota
+	lowLevel
+	highLevel
+)
+
+func benchmarkTokenizer(b *testing.B, level int) {
+	buf, err := ioutil.ReadFile("testdata/go1.html")
+	if err != nil {
+		b.Fatalf("could not read testdata/go1.html: %v", err)
+	}
+	b.SetBytes(int64(len(buf)))
+	runtime.GC()
+	b.ReportAllocs()
+	b.ResetTimer()
+	for i := 0; i < b.N; i++ {
+		z := NewTokenizer(bytes.NewBuffer(buf))
+		for {
+			tt := z.Next()
+			if tt == ErrorToken {
+				if err := z.Err(); err != nil && err != io.EOF {
+					b.Fatalf("tokenizer error: %v", err)
+				}
+				break
+			}
+			switch level {
+			case rawLevel:
+				// Calling z.Raw just returns the raw bytes of the token. It does
+				// not unescape &lt; to <, or lower-case tag names and attribute keys.
+				z.Raw()
+			case lowLevel:
+				// Caling z.Text, z.TagName and z.TagAttr returns []byte values
+				// whose contents may change on the next call to z.Next.
+				switch tt {
+				case TextToken, CommentToken, DoctypeToken:
+					z.Text()
+				case StartTagToken, SelfClosingTagToken:
+					_, more := z.TagName()
+					for more {
+						_, _, more = z.TagAttr()
+					}
+				case EndTagToken:
+					z.TagName()
+				}
+			case highLevel:
+				// Calling z.Token converts []byte values to strings whose validity
+				// extend beyond the next call to z.Next.
+				z.Token()
+			}
+		}
+	}
+}
+
+func BenchmarkRawLevelTokenizer(b *testing.B)  { benchmarkTokenizer(b, rawLevel) }
+func BenchmarkLowLevelTokenizer(b *testing.B)  { benchmarkTokenizer(b, lowLevel) }
+func BenchmarkHighLevelTokenizer(b *testing.B) { benchmarkTokenizer(b, highLevel) }
diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/gen.go b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/gen.go
new file mode 100644
index 00000000..29ca87a9
--- /dev/null
+++ b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/gen.go
@@ -0,0 +1,1727 @@
+// Copyright 2011 Google Inc. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package main
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"flag"
+	"fmt"
+	"go/format"
+	"io/ioutil"
+	"log"
+	"net/http"
+	"net/url"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"regexp"
+	"sort"
+	"strings"
+	"unicode"
+)
+
+// goGenVersion is the version of the Go code generator
+const goGenVersion = "0.5"
+
+var (
+	apiToGenerate = flag.String("api", "*", "The API ID to generate, like 'tasks:v1'. A value of '*' means all.")
+	useCache      = flag.Bool("cache", true, "Use cache of discovered Google API discovery documents.")
+	genDir        = flag.String("gendir", "", "Directory to use to write out generated Go files")
+	build         = flag.Bool("build", false, "Compile generated packages.")
+	install       = flag.Bool("install", false, "Install generated packages.")
+	apisURL       = flag.String("discoveryurl", "https://www.googleapis.com/discovery/v1/apis", "URL to root discovery document")
+
+	publicOnly = flag.Bool("publiconly", true, "Only build public, released APIs. Only applicable for Google employees.")
+
+	jsonFile     = flag.String("api_json_file", "", "If non-empty, the path to a local file on disk containing the API to generate. Exclusive with setting --api.")
+	output       = flag.String("output", "", "(optional) Path to source output file. If not specified, the API name and version are used to construct an output path (e.g. tasks/v1).")
+	googleAPIPkg = flag.String("googleapi_pkg", "google.golang.org/api/googleapi", "Go package path of the 'googleapi' support package.")
+)
+
+// API represents an API to generate, as well as its state while it's
+// generating.
+type API struct {
+	ID            string `json:"id"`
+	Name          string `json:"name"`
+	Version       string `json:"version"`
+	Title         string `json:"title"`
+	DiscoveryLink string `json:"discoveryLink"` // relative
+	RootURL       string `json:"rootUrl"`
+	ServicePath   string `json:"servicePath"`
+	Preferred     bool   `json:"preferred"`
+
+	m map[string]interface{}
+
+	forceJSON []byte // if non-nil, the JSON schema file. else fetched.
+	usedNames namePool
+	schemas   map[string]*Schema // apiName -> schema
+
+	p  func(format string, args ...interface{}) // print raw
+	pn func(format string, args ...interface{}) // print with indent and newline
+}
+
+func (a *API) sortedSchemaNames() (names []string) {
+	for name := range a.schemas {
+		names = append(names, name)
+	}
+	sort.Strings(names)
+	return
+}
+
+type AllAPIs struct {
+	Items []*API `json:"items"`
+}
+
+type generateError struct {
+	api   *API
+	error error
+}
+
+func (e *generateError) Error() string {
+	return fmt.Sprintf("API %s failed to generate code: %v", e.api.ID, e.error)
+}
+
+type compileError struct {
+	api    *API
+	output string
+}
+
+func (e *compileError) Error() string {
+	return fmt.Sprintf("API %s failed to compile:\n%v", e.api.ID, e.output)
+}
+
+func main() {
+	flag.Parse()
+
+	if *install {
+		*build = true
+	}
+
+	var (
+		apiIds  = []string{}
+		matches = []*API{}
+		errors  = []error{}
+	)
+	for _, api := range getAPIs() {
+		apiIds = append(apiIds, api.ID)
+		if !api.want() {
+			continue
+		}
+		matches = append(matches, api)
+		log.Printf("Generating API %s", api.ID)
+		err := api.WriteGeneratedCode()
+		if err != nil {
+			errors = append(errors, &generateError{api, err})
+			continue
+		}
+		if *build {
+			var args []string
+			if *install {
+				args = append(args, "install")
+			} else {
+				args = append(args, "build")
+			}
+			args = append(args, api.Target())
+			out, err := exec.Command("go", args...).CombinedOutput()
+			if err != nil {
+				errors = append(errors, &compileError{api, string(out)})
+			}
+		}
+	}
+
+	if len(matches) == 0 {
+		log.Fatalf("No APIs matched %q; options are %v", *apiToGenerate, apiIds)
+	}
+
+	if len(errors) > 0 {
+		log.Printf("%d API(s) failed to generate or compile:", len(errors))
+		for _, ce := range errors {
+			log.Printf(ce.Error())
+		}
+		os.Exit(1)
+	}
+}
+
+func (a *API) want() bool {
+	if strings.Contains(a.ID, "buzz") {
+		// R.I.P.
+		return false
+	}
+	if strings.Contains(a.ID, "fusiontables") {
+		// TODO(bradfitz): broken codegen.
+		return false
+	}
+	return *apiToGenerate == "*" || *apiToGenerate == a.ID
+}
+
+func getAPIs() []*API {
+	if *jsonFile != "" {
+		return getAPIsFromFile()
+	}
+	var all AllAPIs
+	disco := slurpURL(*apisURL)
+	if err := json.Unmarshal(disco, &all); err != nil {
+		log.Fatalf("error decoding JSON in %s: %v", apisURL, err)
+	}
+	if !*publicOnly && *apiToGenerate != "*" {
+		parts := strings.SplitN(*apiToGenerate, ":", 2)
+		apiName := parts[0]
+		apiVersion := parts[1]
+		all.Items = append(all.Items, &API{
+			ID:            *apiToGenerate,
+			Name:          apiName,
+			Version:       apiVersion,
+			DiscoveryLink: fmt.Sprintf("./apis/%s/%s/rest", apiName, apiVersion),
+		})
+	}
+	return all.Items
+}
+
+// getAPIsFromFile handles the case of generating exactly one API
+// from the flag given in --api_json_file
+func getAPIsFromFile() []*API {
+	if *apiToGenerate != "*" {
+		log.Fatalf("Can't set --api with --api_json_file.")
+	}
+	if !*publicOnly {
+		log.Fatalf("Can't set --publiconly with --api_json_file.")
+	}
+	a, err := apiFromFile(*jsonFile)
+	if err != nil {
+		log.Fatal(err)
+	}
+	return []*API{a}
+}
+
+func apiFromFile(file string) (*API, error) {
+	jsonBytes, err := ioutil.ReadFile(file)
+	if err != nil {
+		return nil, fmt.Errorf("Error reading %s: %v", file, err)
+	}
+	a := &API{
+		forceJSON: jsonBytes,
+	}
+	if err := json.Unmarshal(jsonBytes, a); err != nil {
+		return nil, fmt.Errorf("Decoding JSON in %s: %v", file, err)
+	}
+	return a, nil
+}
+
+func writeFile(file string, contents []byte) error {
+	// Don't write it if the contents are identical.
+	existing, err := ioutil.ReadFile(file)
+	if err == nil && (bytes.Equal(existing, contents) || basicallyEqual(existing, contents)) {
+		return nil
+	}
+	return ioutil.WriteFile(file, contents, 0644)
+}
+
+var etagLine = regexp.MustCompile(`(?m)^\s+"etag": ".+\n`)
+
+// basicallyEqual reports whether a and b are equal except for boring
+// differences like ETag updates.
+func basicallyEqual(a, b []byte) bool {
+	return etagLine.Match(a) && etagLine.Match(b) &&
+		bytes.Equal(etagLine.ReplaceAll(a, nil), etagLine.ReplaceAll(b, nil))
+}
+
+func slurpURL(urlStr string) []byte {
+	diskFile := filepath.Join(os.TempDir(), "google-api-cache-"+url.QueryEscape(urlStr))
+	if *useCache {
+		bs, err := ioutil.ReadFile(diskFile)
+		if err == nil && len(bs) > 0 {
+			return bs
+		}
+	}
+
+	req, err := http.NewRequest("GET", urlStr, nil)
+	if err != nil {
+		log.Fatal(err)
+	}
+	if *publicOnly {
+		req.Header.Add("X-User-IP", "0.0.0.0") // hack
+	}
+	res, err := http.DefaultClient.Do(req)
+	if err != nil {
+		log.Fatalf("Error fetching URL %s: %v", urlStr, err)
+	}
+	bs, err := ioutil.ReadAll(res.Body)
+	if err != nil {
+		log.Fatalf("Error reading body of URL %s: %v", urlStr, err)
+	}
+	if *useCache {
+		if err := ioutil.WriteFile(diskFile, bs, 0666); err != nil {
+			log.Printf("Warning: failed to write JSON of %s to disk file %s: %v", urlStr, diskFile, err)
+		}
+	}
+	return bs
+}
+
+func panicf(format string, args ...interface{}) {
+	panic(fmt.Sprintf(format, args...))
+}
+
+// namePool keeps track of used names and assigns free ones based on a
+// preferred name
+type namePool struct {
+	m map[string]bool // lazily initialized
+}
+
+func (p *namePool) Get(preferred string) string {
+	if p.m == nil {
+		p.m = make(map[string]bool)
+	}
+	name := preferred
+	tries := 0
+	for p.m[name] {
+		tries++
+		name = fmt.Sprintf("%s%d", preferred, tries)
+	}
+	p.m[name] = true
+	return name
+}
+
+func (a *API) SourceDir() string {
+	if *genDir == "" {
+		paths := filepath.SplitList(os.Getenv("GOPATH"))
+		if len(paths) > 0 && paths[0] != "" {
+			*genDir = filepath.Join(paths[0], "src", "google.golang.org", "api")
+		}
+	}
+	return filepath.Join(*genDir, a.Package(), a.Version)
+}
+
+func (a *API) DiscoveryURL() string {
+	if a.DiscoveryLink == "" {
+		log.Fatalf("API %s has no DiscoveryLink", a.ID)
+	}
+	base, _ := url.Parse(*apisURL)
+	u, err := base.Parse(a.DiscoveryLink)
+	if err != nil {
+		log.Fatalf("API %s has bogus DiscoveryLink %s: %v", a.ID, a.DiscoveryLink, err)
+	}
+	return u.String()
+}
+
+func (a *API) Package() string {
+	return strings.ToLower(a.Name)
+}
+
+func (a *API) Target() string {
+	return fmt.Sprintf("google.golang.org/api/%s/%s", a.Package(), a.Version)
+}
+
+// GetName returns a free top-level function/type identifier in the package.
+// It tries to return your preferred match if it's free.
+func (a *API) GetName(preferred string) string {
+	return a.usedNames.Get(preferred)
+}
+
+func (a *API) apiBaseURL() string {
+	if a.RootURL != "" {
+		return a.RootURL + a.ServicePath
+	}
+	return resolveRelative(*apisURL, jstr(a.m, "basePath"))
+}
+
+func (a *API) needsDataWrapper() bool {
+	for _, feature := range jstrlist(a.m, "features") {
+		if feature == "dataWrapper" {
+			return true
+		}
+	}
+	return false
+}
+
+func (a *API) jsonBytes() []byte {
+	if v := a.forceJSON; v != nil {
+		return v
+	}
+	return slurpURL(a.DiscoveryURL())
+}
+
+func (a *API) WriteGeneratedCode() error {
+	outdir := a.SourceDir()
+	err := os.MkdirAll(outdir, 0755)
+	if err != nil {
+		return fmt.Errorf("failed to Mkdir %s: %v", outdir, err)
+	}
+
+	pkg := a.Package()
+	writeFile(filepath.Join(outdir, a.Package()+"-api.json"), a.jsonBytes())
+
+	genfilename := *output
+	if genfilename == "" {
+		genfilename = filepath.Join(outdir, pkg+"-gen.go")
+	}
+
+	code, err := a.GenerateCode()
+	errw := writeFile(genfilename, code)
+	if err == nil {
+		err = errw
+	}
+	return err
+}
+
+func (a *API) GenerateCode() ([]byte, error) {
+	pkg := a.Package()
+
+	a.m = make(map[string]interface{})
+	m := a.m
+	jsonBytes := a.jsonBytes()
+	err := json.Unmarshal(jsonBytes, &a.m)
+	if err != nil {
+		return nil, err
+	}
+
+	// Buffer the output in memory, for gofmt'ing later in the defer.
+	var buf bytes.Buffer
+	a.p = func(format string, args ...interface{}) {
+		_, err := fmt.Fprintf(&buf, format, args...)
+		if err != nil {
+			panic(err)
+		}
+	}
+	a.pn = func(format string, args ...interface{}) {
+		a.p(format+"\n", args...)
+	}
+
+	p, pn := a.p, a.pn
+	reslist := a.Resources(a.m, "")
+
+	p("// Package %s provides access to the %s.\n", pkg, jstr(m, "title"))
+	if docs := jstr(m, "documentationLink"); docs != "" {
+		p("//\n")
+		p("// See %s\n", docs)
+	}
+	p("//\n// Usage example:\n")
+	p("//\n")
+	p("//   import %q\n", a.Target())
+	p("//   ...\n")
+	p("//   %sService, err := %s.New(oauthHttpClient)\n", pkg, pkg)
+
+	p("package %s\n", pkg)
+	p("\n")
+	p("import (\n")
+	for _, pkg := range []string{
+		"bytes",
+		*googleAPIPkg,
+		"encoding/json",
+		"errors",
+		"fmt",
+		"io",
+		"net/http",
+		"net/url",
+		"strconv",
+		"strings",
+	} {
+		p("\t%q\n", pkg)
+	}
+	p(")\n\n")
+	pn("// Always reference these packages, just in case the auto-generated code")
+	pn("// below doesn't.")
+	pn("var _ = bytes.NewBuffer")
+	pn("var _ = strconv.Itoa")
+	pn("var _ = fmt.Sprintf")
+	pn("var _ = json.NewDecoder")
+	pn("var _ = io.Copy")
+	pn("var _ = url.Parse")
+	pn("var _ = googleapi.Version")
+	pn("var _ = errors.New")
+	pn("var _ = strings.Replace")
+	pn("")
+	pn("const apiId = %q", jstr(m, "id"))
+	pn("const apiName = %q", jstr(m, "name"))
+	pn("const apiVersion = %q", jstr(m, "version"))
+	p("const basePath = %q\n", a.apiBaseURL())
+	p("\n")
+
+	a.generateScopeConstants()
+
+	a.GetName("New") // ignore return value; we're the first caller
+	pn("func New(client *http.Client) (*Service, error) {")
+	pn("if client == nil { return nil, errors.New(\"client is nil\") }")
+	pn("s := &Service{client: client, BasePath: basePath}")
+	for _, res := range reslist { // add top level resources.
+		pn("s.%s = New%s(s)", res.GoField(), res.GoType())
+	}
+	pn("return s, nil")
+	pn("}")
+
+	a.GetName("Service") // ignore return value; no user-defined names yet
+	p("\ntype Service struct {\n")
+	p("\tclient *http.Client\n")
+	p("\tBasePath string // API endpoint base URL\n")
+
+	for _, res := range reslist {
+		p("\n\t%s\t*%s\n", res.GoField(), res.GoType())
+	}
+	p("}\n")
+
+	for _, res := range reslist {
+		res.generateType()
+	}
+
+	a.PopulateSchemas()
+
+	for _, name := range a.sortedSchemaNames() {
+		a.schemas[name].writeSchemaCode(a)
+	}
+
+	for _, meth := range a.APIMethods() {
+		meth.generateCode()
+	}
+
+	for _, res := range reslist {
+		res.generateMethods()
+	}
+
+	clean, err := format.Source(buf.Bytes())
+	if err != nil {
+		return buf.Bytes(), err
+	}
+	return clean, nil
+}
+
+func (a *API) generateScopeConstants() {
+	auth := jobj(a.m, "auth")
+	if auth == nil {
+		return
+	}
+	oauth2 := jobj(auth, "oauth2")
+	if oauth2 == nil {
+		return
+	}
+	scopes := jobj(oauth2, "scopes")
+	if scopes == nil || len(scopes) == 0 {
+		return
+	}
+
+	a.p("// OAuth2 scopes used by this API.\n")
+	a.p("const (\n")
+	n := 0
+	for _, scopeName := range sortedKeys(scopes) {
+		mi := scopes[scopeName]
+		if n > 0 {
+			a.p("\n")
+		}
+		n++
+		ident := scopeIdentifierFromURL(scopeName)
+		if des := jstr(mi.(map[string]interface{}), "description"); des != "" {
+			a.p("%s", asComment("\t", des))
+		}
+		a.p("\t%s = %q\n", ident, scopeName)
+	}
+	a.p(")\n\n")
+}
+
+func scopeIdentifierFromURL(urlStr string) string {
+	const prefix = "https://www.googleapis.com/auth/"
+	if !strings.HasPrefix(urlStr, prefix) {
+		const https = "https://"
+		if !strings.HasPrefix(urlStr, https) {
+			log.Fatalf("Unexpected oauth2 scope %q doesn't start with %q", urlStr, https)
+		}
+		ident := validGoIdentifer(depunct(urlStr[len(https):], true)) + "Scope"
+		return ident
+	}
+	ident := validGoIdentifer(initialCap(urlStr[len(prefix):])) + "Scope"
+	return ident
+}
+
+type Schema struct {
+	api *API
+	m   map[string]interface{} // original JSON map
+
+	typ *Type // lazily populated by Type
+
+	apiName      string // the native API-defined name of this type
+	goName       string // lazily populated by GoName
+	goReturnType string // lazily populated by GoReturnType
+}
+
+type Property struct {
+	s       *Schema                // property of which schema
+	apiName string                 // the native API-defined name of this property
+	m       map[string]interface{} // original JSON map
+
+	typ *Type // lazily populated by Type
+}
+
+func (p *Property) Type() *Type {
+	if p.typ == nil {
+		p.typ = &Type{api: p.s.api, m: p.m}
+	}
+	return p.typ
+}
+
+func (p *Property) GoName() string {
+	return initialCap(p.apiName)
+}
+
+func (p *Property) APIName() string {
+	return p.apiName
+}
+
+func (p *Property) Description() string {
+	return jstr(p.m, "description")
+}
+
+type Type struct {
+	m   map[string]interface{} // JSON map containing key "type" and maybe "items", "properties"
+	api *API
+}
+
+func (t *Type) apiType() string {
+	// Note: returns "" on reference types
+	if t, ok := t.m["type"].(string); ok {
+		return t
+	}
+	return ""
+}
+
+func (t *Type) apiTypeFormat() string {
+	if f, ok := t.m["format"].(string); ok {
+		return f
+	}
+	return ""
+}
+
+func (t *Type) isIntAsString() bool {
+	return t.apiType() == "string" && strings.Contains(t.apiTypeFormat(), "int")
+}
+
+func (t *Type) asSimpleGoType() (goType string, ok bool) {
+	return simpleTypeConvert(t.apiType(), t.apiTypeFormat())
+}
+
+func (t *Type) String() string {
+	return fmt.Sprintf("[type=%q, map=%s]", t.apiType(), prettyJSON(t.m))
+}
+
+func (t *Type) AsGo() string {
+	if t, ok := t.asSimpleGoType(); ok {
+		return t
+	}
+	if at, ok := t.ArrayType(); ok {
+		if at.apiType() == "string" {
+			switch at.apiTypeFormat() {
+			case "int64":
+				return "googleapi.Int64s"
+			case "uint64":
+				return "googleapi.Uint64s"
+			case "int32":
+				return "googleapi.Int32s"
+			case "uint32":
+				return "googleapi.Uint32s"
+			case "float64":
+				return "googleapi.Float64s"
+			default:
+				return "[]" + at.AsGo()
+			}
+		}
+		return "[]" + at.AsGo()
+	}
+	if ref, ok := t.Reference(); ok {
+		s := t.api.schemas[ref]
+		if s == nil {
+			panic(fmt.Sprintf("in Type.AsGo(), failed to find referenced type %q for %s",
+				ref, prettyJSON(t.m)))
+		}
+		return s.Type().AsGo()
+	}
+	if typ, ok := t.MapType(); ok {
+		return typ
+	}
+	if t.IsStruct() {
+		if apiName, ok := t.m["_apiName"].(string); ok {
+			s := t.api.schemas[apiName]
+			if s == nil {
+				panic(fmt.Sprintf("in Type.AsGo, _apiName of %q didn't point to a valid schema; json: %s",
+					apiName, prettyJSON(t.m)))
+			}
+			if v := jobj(s.m, "variant"); v != nil {
+				return s.GoName()
+			}
+			return "*" + s.GoName()
+		}
+		panic("in Type.AsGo, no _apiName found for struct type " + prettyJSON(t.m))
+	}
+	panic("unhandled Type.AsGo for " + prettyJSON(t.m))
+}
+
+func (t *Type) IsSimple() bool {
+	_, ok := simpleTypeConvert(t.apiType(), t.apiTypeFormat())
+	return ok
+}
+
+func (t *Type) IsStruct() bool {
+	return t.apiType() == "object"
+}
+
+func (t *Type) Reference() (apiName string, ok bool) {
+	apiName = jstr(t.m, "$ref")
+	ok = apiName != ""
+	return
+}
+
+func (t *Type) IsMap() bool {
+	_, ok := t.MapType()
+	return ok
+}
+
+// MapType checks if the current node is a map and if true, it returns the Go type for the map, such as map[string]string.
+func (t *Type) MapType() (typ string, ok bool) {
+	props := jobj(t.m, "additionalProperties")
+	if props == nil {
+		return "", false
+	}
+	s := jstr(props, "type")
+	if s == "string" {
+		return "map[string]string", true
+	}
+	if s != "array" {
+		if s == "" { // Check for reference
+			s = jstr(props, "$ref")
+			if s != "" {
+				return "map[string]" + s, true
+			}
+		}
+		log.Printf("Warning: found map to type %q which is not implemented yet.", s)
+		return "", false
+	}
+	items := jobj(props, "items")
+	if items == nil {
+		return "", false
+	}
+	s = jstr(items, "type")
+	if s != "string" {
+		if s == "" { // Check for reference
+			s = jstr(items, "$ref")
+			if s != "" {
+				return "map[string][]" + s, true
+			}
+		}
+		log.Printf("Warning: found map of arrays of type %q which is not implemented yet.", s)
+		return "", false
+	}
+	return "map[string][]string", true
+}
+
+func (t *Type) IsReference() bool {
+	return jstr(t.m, "$ref") != ""
+}
+
+func (t *Type) ReferenceSchema() (s *Schema, ok bool) {
+	apiName, ok := t.Reference()
+	if !ok {
+		return
+	}
+
+	s = t.api.schemas[apiName]
+	if s == nil {
+		panicf("failed to find t.api.schemas[%q] while resolving reference",
+			apiName)
+	}
+	return s, true
+}
+
+func (t *Type) ArrayType() (elementType *Type, ok bool) {
+	if t.apiType() != "array" {
+		return
+	}
+	items := jobj(t.m, "items")
+	if items == nil {
+		panicf("can't handle array type missing its 'items' key. map is %#v", t.m)
+	}
+	return &Type{api: t.api, m: items}, true
+}
+
+func (s *Schema) Type() *Type {
+	if s.typ == nil {
+		s.typ = &Type{api: s.api, m: s.m}
+	}
+	return s.typ
+}
+
+func (s *Schema) properties() []*Property {
+	if !s.Type().IsStruct() {
+		panic("called properties on non-object schema")
+	}
+	pl := []*Property{}
+	propMap := jobj(s.m, "properties")
+	for _, name := range sortedKeys(propMap) {
+		m := propMap[name].(map[string]interface{})
+		pl = append(pl, &Property{
+			s:       s,
+			m:       m,
+			apiName: name,
+		})
+	}
+	return pl
+}
+
+func (s *Schema) populateSubSchemas() (outerr error) {
+	defer func() {
+		r := recover()
+		if r == nil {
+			return
+		}
+		outerr = fmt.Errorf("%v", r)
+	}()
+
+	addSubStruct := func(subApiName string, t *Type) {
+		if s.api.schemas[subApiName] != nil {
+			panic("dup schema apiName: " + subApiName)
+		}
+		subm := t.m
+		subm["_apiName"] = subApiName
+		subs := &Schema{
+			api:     s.api,
+			m:       subm,
+			typ:     t,
+			apiName: subApiName,
+		}
+		s.api.schemas[subApiName] = subs
+		err := subs.populateSubSchemas()
+		if err != nil {
+			panicf("in sub-struct %q: %v", subApiName, err)
+		}
+	}
+
+	if s.Type().IsStruct() {
+		for _, p := range s.properties() {
+			if p.Type().IsSimple() || p.Type().IsMap() {
+				continue
+			}
+			if at, ok := p.Type().ArrayType(); ok {
+				if at.IsSimple() || at.IsReference() {
+					continue
+				}
+				subApiName := fmt.Sprintf("%s.%s", s.apiName, p.apiName)
+				if at.IsStruct() {
+					addSubStruct(subApiName, at) // was p.Type()?
+					continue
+				}
+				if _, ok := at.ArrayType(); ok {
+					addSubStruct(subApiName, at)
+					continue
+				}
+				panicf("Unknown property array type for %q: %s", subApiName, at)
+				continue
+			}
+			subApiName := fmt.Sprintf("%s.%s", s.apiName, p.apiName)
+			if p.Type().IsStruct() {
+				addSubStruct(subApiName, p.Type())
+				continue
+			}
+			if p.Type().IsReference() {
+				continue
+			}
+			panicf("Unknown type for %q: %s", subApiName, p.Type())
+		}
+		return
+	}
+
+	if at, ok := s.Type().ArrayType(); ok {
+		if at.IsSimple() || at.IsReference() {
+			return
+		}
+		subApiName := fmt.Sprintf("%s.Item", s.apiName)
+
+		if at.IsStruct() {
+			addSubStruct(subApiName, at)
+			return
+		}
+		if at, ok := at.ArrayType(); ok {
+			if at.IsSimple() || at.IsReference() {
+				return
+			}
+			addSubStruct(subApiName, at)
+			return
+		}
+		panicf("Unknown array type for %q: %s", subApiName, at)
+		return
+	}
+
+	if s.Type().IsSimple() || s.Type().IsReference() {
+		return
+	}
+
+	fmt.Fprintf(os.Stderr, "in populateSubSchemas, schema is: %s", prettyJSON(s.m))
+	panicf("populateSubSchemas: unsupported type for schema %q", s.apiName)
+	panic("unreachable")
+}
+
+// GoName returns (or creates and returns) the bare Go name
+// of the apiName, making sure that it's a proper Go identifier
+// and doesn't conflict with an existing name.
+func (s *Schema) GoName() string {
+	if s.goName == "" {
+		if name, ok := s.Type().MapType(); ok {
+			s.goName = name
+		} else {
+			s.goName = s.api.GetName(initialCap(s.apiName))
+		}
+	}
+	return s.goName
+}
+
+// GoReturnType returns the Go type to use as the return type.
+// If a type is a struct, it will return *StructType,
+// for a map it will return map[string]ValueType,
+// for (not yet supported) slices it will return []ValueType.
+func (s *Schema) GoReturnType() string {
+	if s.goReturnType == "" {
+		if s.Type().IsMap() {
+			s.goReturnType = s.GoName()
+		} else {
+			s.goReturnType = "*" + s.GoName()
+		}
+	}
+	return s.goReturnType
+}
+
+func (s *Schema) writeSchemaCode(api *API) {
+	if s.Type().IsStruct() && !s.Type().IsMap() {
+		s.writeSchemaStruct(api)
+		return
+	}
+
+	if _, ok := s.Type().ArrayType(); ok {
+		log.Printf("TODO writeSchemaCode for arrays for %s", s.GoName())
+		return
+	}
+
+	if destSchema, ok := s.Type().ReferenceSchema(); ok {
+		// Convert it to a struct using embedding.
+		s.api.p("\ntype %s struct {\n", s.GoName())
+		s.api.p("\t%s\n", destSchema.GoName())
+		s.api.p("}\n")
+		return
+	}
+
+	if s.Type().IsSimple() {
+		apitype := jstr(s.m, "type")
+		typ := mustSimpleTypeConvert(apitype, jstr(s.m, "format"))
+		s.api.p("\ntype %s %s\n", s.GoName(), typ)
+		return
+	}
+
+	if s.Type().IsMap() {
+		return
+	}
+
+	fmt.Fprintf(os.Stderr, "in writeSchemaCode, schema is: %s", prettyJSON(s.m))
+	panicf("writeSchemaCode: unsupported type for schema %q", s.apiName)
+}
+
+func (s *Schema) writeVariant(api *API, v map[string]interface{}) {
+	s.api.p("\ntype %s map[string]interface{}\n\n", s.GoName())
+
+	// Write out the "Type" method that identifies the variant type.
+	s.api.p("func (t %s) Type() string {\n", s.GoName())
+	s.api.p("  return googleapi.VariantType(t)\n")
+	s.api.p("}\n\n")
+
+	// Write out helper methods to convert each possible variant.
+	for _, m := range jobjlist(v, "map") {
+		val := jstr(m, "type_value")
+		reftype := jstr(m, "$ref")
+		if val == "" && reftype == "" {
+			log.Printf("TODO variant %s ref %s not yet supported.", val, reftype)
+			continue
+		}
+
+		_, ok := api.schemas[reftype]
+		if !ok {
+			log.Printf("TODO variant %s ref %s not yet supported.", val, reftype)
+			continue
+		}
+
+		s.api.p("func (t %s) %s() (r %s, ok bool) {\n", s.GoName(), initialCap(val), reftype)
+		s.api.p("  if t.Type() != %q {\n", initialCap(val))
+		s.api.p("    return r, false\n")
+		s.api.p("  }\n")
+		s.api.p("  ok = googleapi.ConvertVariant(map[string]interface{}(t), &r)\n")
+		s.api.p("  return r, ok\n")
+		s.api.p("}\n\n")
+	}
+}
+
+func (s *Schema) writeSchemaStruct(api *API) {
+	if v := jobj(s.m, "variant"); v != nil {
+		s.writeVariant(api, v)
+		return
+	}
+	// TODO: description
+	s.api.p("\ntype %s struct {\n", s.GoName())
+	for i, p := range s.properties() {
+		if i > 0 {
+			s.api.p("\n")
+		}
+		pname := p.GoName()
+		if des := p.Description(); des != "" {
+			s.api.p("%s", asComment("\t", fmt.Sprintf("%s: %s", pname, des)))
+		}
+		var extraOpt string
+		if p.Type().isIntAsString() {
+			extraOpt += ",string"
+		}
+		s.api.p("\t%s %s `json:\"%s,omitempty%s\"`\n", pname, p.Type().AsGo(), p.APIName(), extraOpt)
+	}
+	s.api.p("}\n")
+}
+
+// PopulateSchemas reads all the API types ("schemas") from the JSON file
+// and converts them to *Schema instances, returning an identically
+// keyed map, additionally containing subresources.  For instance,
+//
+// A resource "Foo" of type "object" with a property "bar", also of type
+// "object" (an anonymous sub-resource), will get a synthetic API name
+// of "Foo.bar".
+//
+// A resource "Foo" of type "array" with an "items" of type "object"
+// will get a synthetic API name of "Foo.Item".
+func (a *API) PopulateSchemas() {
+	m := jobj(a.m, "schemas")
+	if a.schemas != nil {
+		panic("")
+	}
+	a.schemas = make(map[string]*Schema)
+	for name, mi := range m {
+		s := &Schema{
+			api:     a,
+			apiName: name,
+			m:       mi.(map[string]interface{}),
+		}
+
+		// And a little gross hack, so a map alone is good
+		// enough to get its apiName:
+		s.m["_apiName"] = name
+
+		a.schemas[name] = s
+		err := s.populateSubSchemas()
+		if err != nil {
+			panicf("Error populating schema with API name %q: %v", name, err)
+		}
+	}
+}
+
+type Resource struct {
+	api       *API
+	name      string
+	parent    string
+	m         map[string]interface{}
+	resources []*Resource
+}
+
+func (r *Resource) generateType() {
+	p, pn := r.api.p, r.api.pn
+	t := r.GoType()
+	pn(fmt.Sprintf("func New%s(s *Service) *%s {", t, t))
+	pn("rs := &%s{s : s}", t)
+	for _, res := range r.resources {
+		pn("rs.%s = New%s(s)", res.GoField(), res.GoType())
+	}
+	pn("return rs")
+	pn("}")
+
+	p("\ntype %s struct {\n", t)
+	p("\ts *Service\n")
+	for _, res := range r.resources {
+		p("\n\t%s\t*%s\n", res.GoField(), res.GoType())
+	}
+	p("}\n")
+
+	for _, res := range r.resources {
+		res.generateType()
+	}
+}
+
+func (r *Resource) generateMethods() {
+	for _, meth := range r.Methods() {
+		meth.generateCode()
+	}
+	for _, res := range r.resources {
+		res.generateMethods()
+	}
+}
+
+func (r *Resource) GoField() string {
+	return initialCap(r.name)
+}
+
+func (r *Resource) GoType() string {
+	return initialCap(fmt.Sprintf("%s.%s", r.parent, r.name)) + "Service"
+}
+
+func (r *Resource) Methods() []*Method {
+	ms := []*Method{}
+
+	methMap := jobj(r.m, "methods")
+	for _, mname := range sortedKeys(methMap) {
+		mi := methMap[mname]
+		ms = append(ms, &Method{
+			api:  r.api,
+			r:    r,
+			name: mname,
+			m:    mi.(map[string]interface{}),
+		})
+	}
+	return ms
+}
+
+type Method struct {
+	api  *API
+	r    *Resource // or nil if a API-level (top-level) method
+	name string
+	m    map[string]interface{} // original JSON
+
+	params []*Param // all Params, of each type, lazily set by first access to Parameters
+}
+
+func (m *Method) Id() string {
+	return jstr(m.m, "id")
+}
+
+func (m *Method) supportsMedia() bool {
+	return jobj(m.m, "mediaUpload") != nil
+}
+
+func (m *Method) mediaPath() string {
+	return jstr(jobj(jobj(jobj(m.m, "mediaUpload"), "protocols"), "simple"), "path")
+}
+
+func (m *Method) Params() []*Param {
+	if m.params == nil {
+		paramMap := jobj(m.m, "parameters")
+		for _, name := range sortedKeys(paramMap) {
+			mi := paramMap[name]
+			pm := mi.(map[string]interface{})
+			m.params = append(m.params, &Param{
+				name:   name,
+				m:      pm,
+				method: m,
+			})
+		}
+	}
+	return m.params
+}
+
+func (m *Method) grepParams(f func(*Param) bool) []*Param {
+	matches := make([]*Param, 0)
+	for _, param := range m.Params() {
+		if f(param) {
+			matches = append(matches, param)
+		}
+	}
+	return matches
+}
+
+func (m *Method) NamedParam(name string) *Param {
+	matches := m.grepParams(func(p *Param) bool {
+		return p.name == name
+	})
+	if len(matches) < 1 {
+		log.Panicf("failed to find named parameter %q", name)
+	}
+	if len(matches) > 1 {
+		log.Panicf("found multiple parameters for parameter name %q", name)
+	}
+	return matches[0]
+}
+
+func (m *Method) OptParams() []*Param {
+	return m.grepParams(func(p *Param) bool {
+		return !p.IsRequired()
+	})
+}
+
+func (m *Method) RequiredRepeatedQueryParams() []*Param {
+	return m.grepParams(func(p *Param) bool {
+		return p.IsRequired() && p.IsRepeated() && p.Location() == "query"
+	})
+}
+
+func (m *Method) RequiredQueryParams() []*Param {
+	return m.grepParams(func(p *Param) bool {
+		return p.IsRequired() && !p.IsRepeated() && p.Location() == "query"
+	})
+}
+
+func (meth *Method) generateCode() {
+	res := meth.r // may be nil if a top-level method
+	a := meth.api
+	p, pn := a.p, a.pn
+
+	pn("\n// method id %q:", meth.Id())
+
+	retTypeComma := responseType(a, meth.m)
+	if retTypeComma != "" {
+		retTypeComma += ", "
+	}
+
+	args := meth.NewArguments()
+	methodName := initialCap(meth.name)
+
+	prefix := ""
+	if res != nil {
+		prefix = initialCap(fmt.Sprintf("%s.%s", res.parent, res.name))
+	}
+	callName := a.GetName(prefix + methodName + "Call")
+
+	p("\ntype %s struct {\n", callName)
+	p("\ts *Service\n")
+	for _, arg := range args.l {
+		p("\t%s %s\n", arg.goname, arg.gotype)
+	}
+	p("\topt_ map[string]interface{}\n")
+	if meth.supportsMedia() {
+		p("\tmedia_ io.Reader\n")
+	}
+	p("}\n")
+
+	p("\n%s", asComment("", methodName+": "+jstr(meth.m, "description")))
+
+	var servicePtr string
+	if res == nil {
+		p("func (s *Service) %s(%s) *%s {\n", methodName, args, callName)
+		servicePtr = "s"
+	} else {
+		p("func (r *%s) %s(%s) *%s {\n", res.GoType(), methodName, args, callName)
+		servicePtr = "r.s"
+	}
+
+	p("\tc := &%s{s: %s, opt_: make(map[string]interface{})}\n", callName, servicePtr)
+	for _, arg := range args.l {
+		p("\tc.%s = %s\n", arg.goname, arg.goname)
+	}
+	p("\treturn c\n")
+	p("}\n")
+
+	for _, opt := range meth.OptParams() {
+		setter := initialCap(opt.name)
+		des := jstr(opt.m, "description")
+		des = strings.Replace(des, "Optional.", "", 1)
+		des = strings.TrimSpace(des)
+		p("\n%s", asComment("", fmt.Sprintf("%s sets the optional parameter %q: %s", setter, opt.name, des)))
+		np := new(namePool)
+		np.Get("c") // take the receiver's name
+		paramName := np.Get(validGoIdentifer(opt.name))
+		p("func (c *%s) %s(%s %s) *%s {\n", callName, setter, paramName, opt.GoType(), callName)
+		p("c.opt_[%q] = %s\n", opt.name, paramName)
+		p("return c\n")
+		p("}\n")
+	}
+
+	if meth.supportsMedia() {
+		p("func (c *%s) Media(r io.Reader) *%s {\n", callName, callName)
+		p("c.media_ = r\n")
+		p("return c\n")
+		p("}\n")
+	}
+
+	pn("\n// Fields allows partial responses to be retrieved.")
+	pn("// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse")
+	pn("// for more information.")
+	pn("func (c *%s) Fields(s ...googleapi.Field) *%s {", callName, callName)
+	pn(`c.opt_["fields"] = googleapi.CombineFields(s)`)
+	pn("return c")
+	pn("}")
+
+	pn("\nfunc (c *%s) Do() (%serror) {", callName, retTypeComma)
+
+	nilRet := ""
+	if retTypeComma != "" {
+		nilRet = "nil, "
+	}
+	pn("var body io.Reader = nil")
+	hasContentType := false
+	httpMethod := jstr(meth.m, "httpMethod")
+	if ba := args.bodyArg(); ba != nil && httpMethod != "GET" {
+		style := "WithoutDataWrapper"
+		if a.needsDataWrapper() {
+			style = "WithDataWrapper"
+		}
+		pn("body, err := googleapi.%s.JSONReader(c.%s)", style, ba.goname)
+		pn("if err != nil { return %serr }", nilRet)
+		pn(`ctype := "application/json"`)
+		hasContentType = true
+	}
+	pn("params := make(url.Values)")
+	// Set this first. if they override it, though, might be gross.  We don't expect
+	// XML replies elsewhere.  TODO(bradfitz): hide this option in the generated code?
+	pn(`params.Set("alt", "json")`)
+	for _, p := range meth.RequiredQueryParams() {
+		pn("params.Set(%q, fmt.Sprintf(\"%%v\", c.%s))", p.name, p.goCallFieldName())
+	}
+	for _, p := range meth.RequiredRepeatedQueryParams() {
+		pn("for _, v := range c.%s { params.Add(%q, fmt.Sprintf(\"%%v\", v)) }",
+			p.name, p.name)
+	}
+	opts := meth.OptParams()
+	opts = append(opts, &Param{name: "fields"})
+	for _, p := range opts {
+		pn("if v, ok := c.opt_[%q]; ok { params.Set(%q, fmt.Sprintf(\"%%v\", v)) }",
+			p.name, p.name)
+	}
+
+	p("urls := googleapi.ResolveRelative(c.s.BasePath, %q)\n", jstr(meth.m, "path"))
+	if meth.supportsMedia() {
+		pn("if c.media_ != nil {")
+		// Hack guess, since we get a 404 otherwise:
+		//pn("urls = googleapi.ResolveRelative(%q, %q)", a.apiBaseURL(), meth.mediaPath())
+		// Further hack.  Discovery doc is wrong?
+		pn("urls = strings.Replace(urls, %q, %q, 1)", "https://www.googleapis.com/", "https://www.googleapis.com/upload/")
+		pn(`params.Set("uploadType", "multipart")`)
+		pn("}")
+	}
+	pn("urls += \"?\" + params.Encode()")
+	if meth.supportsMedia() && httpMethod != "GET" {
+		if !hasContentType { // Support mediaUpload but no ctype set.
+			pn("body = new(bytes.Buffer)")
+			pn(`ctype := "application/json"`)
+			hasContentType = true
+		}
+		pn("contentLength_, hasMedia_ := googleapi.ConditionallyIncludeMedia(c.media_, &body, &ctype)")
+	}
+	pn("req, _ := http.NewRequest(%q, urls, body)", httpMethod)
+	// Replace param values after NewRequest to avoid reencoding them.
+	// E.g. Cloud Storage API requires '%2F' in entity param to be kept, but url.Parse replaces it with '/'.
+	argsForLocation := args.forLocation("path")
+	if len(argsForLocation) > 0 {
+		pn(`googleapi.Expand(req.URL, map[string]string{`)
+		for _, arg := range argsForLocation {
+			pn(`"%s": %s,`, arg.apiname, arg.exprAsString("c."))
+		}
+		pn(`})`)
+	} else {
+		// Just call SetOpaque since we aren't calling Expand
+		pn(`googleapi.SetOpaque(req.URL)`)
+	}
+
+	if meth.supportsMedia() {
+		pn("if hasMedia_ { req.ContentLength = contentLength_ }")
+	}
+	if hasContentType {
+		pn(`req.Header.Set("Content-Type", ctype)`)
+	}
+	pn(`req.Header.Set("User-Agent", "google-api-go-client/` + goGenVersion + `")`)
+	pn("res, err := c.s.client.Do(req);")
+	pn("if err != nil { return %serr }", nilRet)
+	pn("defer googleapi.CloseBody(res)")
+	pn("if err := googleapi.CheckResponse(res); err != nil { return %serr }", nilRet)
+	if retTypeComma == "" {
+		pn("return nil")
+	} else {
+		pn("var ret %s", responseType(a, meth.m))
+		pn("if err := json.NewDecoder(res.Body).Decode(&ret); err != nil { return nil, err }")
+		pn("return ret, nil")
+	}
+
+	bs, _ := json.MarshalIndent(meth.m, "\t// ", "  ")
+	pn("// %s\n", string(bs))
+	pn("}")
+}
+
+type Param struct {
+	method        *Method
+	name          string
+	m             map[string]interface{}
+	callFieldName string // empty means to use the default
+}
+
+func (p *Param) IsRequired() bool {
+	v, _ := p.m["required"].(bool)
+	return v
+}
+
+func (p *Param) IsRepeated() bool {
+	v, _ := p.m["repeated"].(bool)
+	return v
+}
+
+func (p *Param) Location() string {
+	return p.m["location"].(string)
+}
+
+func (p *Param) GoType() string {
+	typ, format := jstr(p.m, "type"), jstr(p.m, "format")
+	if typ == "string" && strings.Contains(format, "int") && p.Location() != "query" {
+		panic("unexpected int parameter encoded as string, not in query: " + p.name)
+	}
+	t, ok := simpleTypeConvert(typ, format)
+	if !ok {
+		panic("failed to convert parameter type " + fmt.Sprintf("type=%q, format=%q", typ, format))
+	}
+	return t
+}
+
+// goCallFieldName returns the name of this parameter's field in a
+// method's "Call" struct.
+func (p *Param) goCallFieldName() string {
+	if p.callFieldName != "" {
+		return p.callFieldName
+	}
+	return validGoIdentifer(p.name)
+}
+
+// APIMethods returns top-level ("API-level") methods. They don't have an associated resource.
+func (a *API) APIMethods() []*Method {
+	meths := []*Method{}
+	methMap := jobj(a.m, "methods")
+	for _, name := range sortedKeys(methMap) {
+		mi := methMap[name]
+		meths = append(meths, &Method{
+			api:  a,
+			r:    nil, // to be explicit
+			name: name,
+			m:    mi.(map[string]interface{}),
+		})
+	}
+	return meths
+}
+
+func (a *API) Resources(m map[string]interface{}, p string) []*Resource {
+	res := []*Resource{}
+	resMap := jobj(m, "resources")
+	for _, rname := range sortedKeys(resMap) {
+		rmi := resMap[rname]
+		rm := rmi.(map[string]interface{})
+		res = append(res, &Resource{a, rname, p, rm, a.Resources(rm, fmt.Sprintf("%s.%s", p, rname))})
+	}
+	return res
+}
+
+func resolveRelative(basestr, relstr string) string {
+	u, err := url.Parse(basestr)
+	if err != nil {
+		panicf("Error parsing base URL %q: %v", basestr, err)
+	}
+	rel, err := url.Parse(relstr)
+	if err != nil {
+		panicf("Error parsing relative URL %q: %v", relstr, err)
+	}
+	u = u.ResolveReference(rel)
+	return u.String()
+}
+
+func (meth *Method) NewArguments() (args *arguments) {
+	args = &arguments{
+		method: meth,
+		m:      make(map[string]*argument),
+	}
+	po, ok := meth.m["parameterOrder"].([]interface{})
+	if ok {
+		for _, poi := range po {
+			pname := poi.(string)
+			arg := meth.NewArg(pname, meth.NamedParam(pname))
+			args.AddArg(arg)
+		}
+	}
+	if ro := jobj(meth.m, "request"); ro != nil {
+		args.AddArg(meth.NewBodyArg(ro))
+	}
+	return
+}
+
+func (meth *Method) NewBodyArg(m map[string]interface{}) *argument {
+	reftype := jstr(m, "$ref")
+	return &argument{
+		goname:   validGoIdentifer(strings.ToLower(reftype)),
+		apiname:  "REQUEST",
+		gotype:   "*" + reftype,
+		apitype:  reftype,
+		location: "body",
+	}
+}
+
+func (meth *Method) NewArg(apiname string, p *Param) *argument {
+	m := p.m
+	apitype := jstr(m, "type")
+	des := jstr(m, "description")
+	goname := validGoIdentifer(apiname) // but might be changed later, if conflicts
+	if strings.Contains(des, "identifier") && !strings.HasSuffix(strings.ToLower(goname), "id") {
+		goname += "id" // yay
+		p.callFieldName = goname
+	}
+	gotype := mustSimpleTypeConvert(apitype, jstr(m, "format"))
+	if p.IsRepeated() {
+		gotype = "[]" + gotype
+	}
+	return &argument{
+		apiname:  apiname,
+		apitype:  apitype,
+		goname:   goname,
+		gotype:   gotype,
+		location: jstr(m, "location"),
+	}
+}
+
+type argument struct {
+	method           *Method
+	apiname, apitype string
+	goname, gotype   string
+	location         string // "path", "query", "body"
+}
+
+func (a *argument) String() string {
+	return a.goname + " " + a.gotype
+}
+
+func (a *argument) exprAsString(prefix string) string {
+	switch a.gotype {
+	case "[]string":
+		log.Printf("TODO(bradfitz): only including the first parameter in path query.")
+		return prefix + a.goname + `[0]`
+	case "string":
+		return prefix + a.goname
+	case "integer", "int64":
+		return "strconv.FormatInt(" + prefix + a.goname + ", 10)"
+	case "uint64":
+		return "strconv.FormatUint(" + prefix + a.goname + ", 10)"
+	}
+	log.Panicf("unknown type: apitype=%q, gotype=%q", a.apitype, a.gotype)
+	return ""
+}
+
+// arguments are the arguments that a method takes
+type arguments struct {
+	l      []*argument
+	m      map[string]*argument
+	method *Method
+}
+
+func (args *arguments) forLocation(loc string) []*argument {
+	matches := make([]*argument, 0)
+	for _, arg := range args.l {
+		if arg.location == loc {
+			matches = append(matches, arg)
+		}
+	}
+	return matches
+}
+
+func (args *arguments) bodyArg() *argument {
+	for _, arg := range args.l {
+		if arg.location == "body" {
+			return arg
+		}
+	}
+	return nil
+}
+
+func (args *arguments) AddArg(arg *argument) {
+	n := 1
+	oname := arg.goname
+	for {
+		_, present := args.m[arg.goname]
+		if !present {
+			args.m[arg.goname] = arg
+			args.l = append(args.l, arg)
+			return
+		}
+		n++
+		arg.goname = fmt.Sprintf("%s%d", oname, n)
+	}
+}
+
+func (a *arguments) String() string {
+	var buf bytes.Buffer
+	for i, arg := range a.l {
+		if i != 0 {
+			buf.Write([]byte(", "))
+		}
+		buf.Write([]byte(arg.String()))
+	}
+	return buf.String()
+}
+
+func asComment(pfx, c string) string {
+	var buf bytes.Buffer
+	const maxLen = 70
+	removeNewlines := func(s string) string {
+		return strings.Replace(s, "\n", "\n"+pfx+"// ", -1)
+	}
+	for len(c) > 0 {
+		line := c
+		if len(line) < maxLen {
+			fmt.Fprintf(&buf, "%s// %s\n", pfx, removeNewlines(line))
+			break
+		}
+		line = line[:maxLen]
+		si := strings.LastIndex(line, " ")
+		if si != -1 {
+			line = line[:si]
+		}
+		fmt.Fprintf(&buf, "%s// %s\n", pfx, removeNewlines(line))
+		c = c[len(line):]
+		if si != -1 {
+			c = c[1:]
+		}
+	}
+	return buf.String()
+}
+
+func simpleTypeConvert(apiType, format string) (gotype string, ok bool) {
+	// From http://tools.ietf.org/html/draft-zyp-json-schema-03#section-5.1
+	switch apiType {
+	case "boolean":
+		gotype = "bool"
+	case "string":
+		gotype = "string"
+		switch format {
+		case "int64", "uint64", "int32", "uint32":
+			gotype = format
+		}
+	case "number":
+		gotype = "float64"
+	case "integer":
+		gotype = "int64"
+	case "any":
+		gotype = "interface{}"
+	}
+	return gotype, gotype != ""
+}
+
+func mustSimpleTypeConvert(apiType, format string) string {
+	if gotype, ok := simpleTypeConvert(apiType, format); ok {
+		return gotype
+	}
+	panic(fmt.Sprintf("failed to simpleTypeConvert(%q, %q)", apiType, format))
+}
+
+func (a *API) goTypeOfJsonObject(outerName, memberName string, m map[string]interface{}) (string, error) {
+	apitype := jstr(m, "type")
+	switch apitype {
+	case "array":
+		items := jobj(m, "items")
+		if items == nil {
+			return "", errors.New("no items but type was array")
+		}
+		if ref := jstr(items, "$ref"); ref != "" {
+			return "[]*" + ref, nil // TODO: wrong; delete this whole function
+		}
+		if atype := jstr(items, "type"); atype != "" {
+			return "[]" + mustSimpleTypeConvert(atype, jstr(items, "format")), nil
+		}
+		return "", errors.New("unsupported 'array' type")
+	case "object":
+		return "*" + outerName + "_" + memberName, nil
+		//return "", os.NewError("unsupported 'object' type")
+	}
+	return mustSimpleTypeConvert(apitype, jstr(m, "format")), nil
+}
+
+func responseType(api *API, m map[string]interface{}) string {
+	ro := jobj(m, "response")
+	if ro != nil {
+		if ref := jstr(ro, "$ref"); ref != "" {
+			if s := api.schemas[ref]; s != nil {
+				return s.GoReturnType()
+			}
+			return "*" + ref
+		}
+	}
+	return ""
+}
+
+// initialCap returns the identifier with a leading capital letter.
+// it also maps "foo-bar" to "FooBar".
+func initialCap(ident string) string {
+	if ident == "" {
+		panic("blank identifier")
+	}
+	return depunct(ident, true)
+}
+
+func validGoIdentifer(ident string) string {
+	id := depunct(ident, false)
+	switch id {
+	case "break", "default", "func", "interface", "select",
+		"case", "defer", "go", "map", "struct",
+		"chan", "else", "goto", "package", "switch",
+		"const", "fallthrough", "if", "range", "type",
+		"continue", "for", "import", "return", "var":
+		return id + "_"
+	}
+	return id
+}
+
+// depunct removes '-', '.', '$', '/' from identifers, making the
+// following character uppercase
+func depunct(ident string, needCap bool) string {
+	var buf bytes.Buffer
+	for _, c := range ident {
+		if c == '-' || c == '.' || c == '$' || c == '/' {
+			needCap = true
+			continue
+		}
+		if needCap {
+			c = unicode.ToUpper(c)
+			needCap = false
+		}
+		buf.WriteByte(byte(c))
+	}
+	return buf.String()
+
+}
+
+func prettyJSON(m map[string]interface{}) string {
+	bs, err := json.MarshalIndent(m, "", "  ")
+	if err != nil {
+		return fmt.Sprintf("[JSON error %v on %#v]", err, m)
+	}
+	return string(bs)
+}
+
+func jstr(m map[string]interface{}, key string) string {
+	if s, ok := m[key].(string); ok {
+		return s
+	}
+	return ""
+}
+
+func sortedKeys(m map[string]interface{}) (keys []string) {
+	for key := range m {
+		keys = append(keys, key)
+	}
+	sort.Strings(keys)
+	return
+}
+
+func jobj(m map[string]interface{}, key string) map[string]interface{} {
+	if m, ok := m[key].(map[string]interface{}); ok {
+		return m
+	}
+	return nil
+}
+
+func jobjlist(m map[string]interface{}, key string) []map[string]interface{} {
+	si, ok := m[key].([]interface{})
+	if !ok {
+		return nil
+	}
+	var sl []map[string]interface{}
+	for _, si := range si {
+		sl = append(sl, si.(map[string]interface{}))
+	}
+	return sl
+}
+
+func jstrlist(m map[string]interface{}, key string) []string {
+	si, ok := m[key].([]interface{})
+	if !ok {
+		return nil
+	}
+	sl := make([]string, 0)
+	for _, si := range si {
+		sl = append(sl, si.(string))
+	}
+	return sl
+}
diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/gen_test.go b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/gen_test.go
new file mode 100644
index 00000000..b2c1bbfa
--- /dev/null
+++ b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/gen_test.go
@@ -0,0 +1,79 @@
+package main
+
+import (
+	"bytes"
+	"flag"
+	"io/ioutil"
+	"path/filepath"
+	"testing"
+)
+
+var updateGolden = flag.Bool("update_golden", false, "If true, causes TestAPIs to update golden files")
+
+func TestAPIs(t *testing.T) {
+	names := []string{
+		"arrayofarray-1",
+		"arrayofmapofobjects",
+		"arrayofmapofstrings",
+		"blogger-3",
+		"getwithoutbody",
+		"mapofany",
+		"mapofarrayofobjects",
+		"mapofobjects",
+		"mapofstrings-1",
+		"quotednum",
+		"resource-named-service", // blogger/v3/blogger-api.json + s/BlogUserInfo/Service/
+		"variants",
+	}
+	for _, name := range names {
+		api, err := apiFromFile(filepath.Join("testdata", name+".json"))
+		if err != nil {
+			t.Errorf("Error loading API testdata/%s.json: %v", name, err)
+			continue
+		}
+		clean, err := api.GenerateCode()
+		if err != nil {
+			t.Errorf("Error generating code for %s: %v", name, err)
+			continue
+		}
+		goldenFile := filepath.Join("testdata", name+".want")
+		if *updateGolden {
+			if err := ioutil.WriteFile(goldenFile, clean, 0644); err != nil {
+				t.Fatal(err)
+			}
+		}
+		want, err := ioutil.ReadFile(goldenFile)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+		if !bytes.Equal(want, clean) {
+			tf, _ := ioutil.TempFile("", "api-"+name+"-got-json.")
+			tf.Write(clean)
+			tf.Close()
+			t.Errorf("Output for API %s differs: diff -u %s %s", name, goldenFile, tf.Name())
+		}
+	}
+}
+
+func TestScope(t *testing.T) {
+	tests := [][]string{
+		{
+			"https://www.googleapis.com/auth/somescope",
+			"SomescopeScope",
+		},
+		{
+			"https://mail.google.com/somescope",
+			"MailGoogleComSomescopeScope",
+		},
+		{
+			"https://mail.google.com/",
+			"MailGoogleComScope",
+		},
+	}
+	for _, test := range tests {
+		if got := scopeIdentifierFromURL(test[0]); got != test[1] {
+			t.Errorf("scopeIdentifierFromURL(%q) got %q, want %q", test[0], got, test[1])
+		}
+	}
+}
diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/arrayofarray-1.json b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/arrayofarray-1.json
new file mode 100644
index 00000000..81cefae3
--- /dev/null
+++ b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/arrayofarray-1.json
@@ -0,0 +1,49 @@
+{
+ "kind": "discovery#restDescription",
+ "etag": "\"kEk3sFj6Ef5_yR1-H3bAO6qw9mI/3m5rB86FE5KuW1K3jAl88AxCreg\"",
+ "discoveryVersion": "v1",
+ "id": "arrayofarray:v1",
+ "name": "arrayofarray",
+ "version": "v1",
+ "title": "Example API",
+ "description": "The Example API demonstrates an array of arrays.",
+ "ownerDomain": "google.com",
+ "ownerName": "Google",
+ "protocol": "rest",
+ "schemas": {
+  "GeoJsonMultiPolygon": {
+   "id": "GeoJsonMultiPolygon",
+   "type": "object",
+   "description": "Multi Polygon",
+   "properties": {
+    "coordinates": {
+     "type": "array",
+     "description": "Coordinate arrays.",
+     "items": {
+      "type": "array",
+      "items": {
+       "type": "array",
+       "items": {
+        "type": "array",
+        "items": {
+         "type": "number",
+         "format": "double"
+        }
+       }
+      }
+     }
+    },
+    "type": {
+     "type": "string",
+     "description": "Identifies this object as a multi-polygon.",
+     "enum": [
+      "MultiPolygon"
+     ],
+     "enumDescriptions": [
+      ""
+     ]
+    }
+   }
+  }
+ }
+}
diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/arrayofarray-1.want b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/arrayofarray-1.want
new file mode 100644
index 00000000..7c5d0599
--- /dev/null
+++ b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/arrayofarray-1.want
@@ -0,0 +1,59 @@
+// Package arrayofarray provides access to the Example API.
+//
+// Usage example:
+//
+//   import "google.golang.org/api/arrayofarray/v1"
+//   ...
+//   arrayofarrayService, err := arrayofarray.New(oauthHttpClient)
+package arrayofarray
+
+import (
+	"bytes"
+	"google.golang.org/api/googleapi"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"strconv"
+	"strings"
+)
+
+// Always reference these packages, just in case the auto-generated code
+// below doesn't.
+var _ = bytes.NewBuffer
+var _ = strconv.Itoa
+var _ = fmt.Sprintf
+var _ = json.NewDecoder
+var _ = io.Copy
+var _ = url.Parse
+var _ = googleapi.Version
+var _ = errors.New
+var _ = strings.Replace
+
+const apiId = "arrayofarray:v1"
+const apiName = "arrayofarray"
+const apiVersion = "v1"
+const basePath = "https://www.googleapis.com/discovery/v1/apis"
+
+func New(client *http.Client) (*Service, error) {
+	if client == nil {
+		return nil, errors.New("client is nil")
+	}
+	s := &Service{client: client, BasePath: basePath}
+	return s, nil
+}
+
+type Service struct {
+	client   *http.Client
+	BasePath string // API endpoint base URL
+}
+
+type GeoJsonMultiPolygon struct {
+	// Coordinates: Coordinate arrays.
+	Coordinates [][][][]float64 `json:"coordinates,omitempty"`
+
+	// Type: Identifies this object as a multi-polygon.
+	Type string `json:"type,omitempty"`
+}
diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/arrayofmapofobjects.json b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/arrayofmapofobjects.json
new file mode 100644
index 00000000..1d373619
--- /dev/null
+++ b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/arrayofmapofobjects.json
@@ -0,0 +1,32 @@
+{
+ "kind": "discovery#restDescription",
+ "etag": "\"kEk3sFj6Ef5_yR1-H3bAO6qw9mI/3m5rB86FE5KuW1K3jAl88AxCreg\"",
+ "discoveryVersion": "v1",
+ "id": "arrayofmapofstrings:v1",
+ "name": "arrayofmapofstrings",
+ "version": "v1",
+ "title": "Example API",
+ "description": "The Example API demonstrates an array of arrays.",
+ "ownerDomain": "google.com",
+ "ownerName": "Google",
+ "protocol": "rest",
+ "schemas": {
+  "Analyze": {
+   "id": "Analyze",
+   "type": "object",
+   "properties": {
+    "errors": {
+     "type": "array",
+     "description": "List of errors with the data.",
+     "items": {
+      "type": "object",
+      "additionalProperties": {
+       "$ref": "Property",
+       "description": "Error level followed by a detailed error message."
+      }
+     }
+    }
+   }
+  }
+ }
+}
diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/arrayofmapofobjects.want b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/arrayofmapofobjects.want
new file mode 100644
index 00000000..0338c8b5
--- /dev/null
+++ b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/arrayofmapofobjects.want
@@ -0,0 +1,56 @@
+// Package arrayofmapofstrings provides access to the Example API.
+//
+// Usage example:
+//
+//   import "google.golang.org/api/arrayofmapofstrings/v1"
+//   ...
+//   arrayofmapofstringsService, err := arrayofmapofstrings.New(oauthHttpClient)
+package arrayofmapofstrings
+
+import (
+	"bytes"
+	"google.golang.org/api/googleapi"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"strconv"
+	"strings"
+)
+
+// Always reference these packages, just in case the auto-generated code
+// below doesn't.
+var _ = bytes.NewBuffer
+var _ = strconv.Itoa
+var _ = fmt.Sprintf
+var _ = json.NewDecoder
+var _ = io.Copy
+var _ = url.Parse
+var _ = googleapi.Version
+var _ = errors.New
+var _ = strings.Replace
+
+const apiId = "arrayofmapofstrings:v1"
+const apiName = "arrayofmapofstrings"
+const apiVersion = "v1"
+const basePath = "https://www.googleapis.com/discovery/v1/apis"
+
+func New(client *http.Client) (*Service, error) {
+	if client == nil {
+		return nil, errors.New("client is nil")
+	}
+	s := &Service{client: client, BasePath: basePath}
+	return s, nil
+}
+
+type Service struct {
+	client   *http.Client
+	BasePath string // API endpoint base URL
+}
+
+type Analyze struct {
+	// Errors: List of errors with the data.
+	Errors []map[string]Property `json:"errors,omitempty"`
+}
diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/arrayofmapofstrings.json b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/arrayofmapofstrings.json
new file mode 100644
index 00000000..65b338b1
--- /dev/null
+++ b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/arrayofmapofstrings.json
@@ -0,0 +1,32 @@
+{
+ "kind": "discovery#restDescription",
+ "etag": "\"kEk3sFj6Ef5_yR1-H3bAO6qw9mI/3m5rB86FE5KuW1K3jAl88AxCreg\"",
+ "discoveryVersion": "v1",
+ "id": "arrayofmapofstrings:v1",
+ "name": "arrayofmapofstrings",
+ "version": "v1",
+ "title": "Example API",
+ "description": "The Example API demonstrates an array of arrays.",
+ "ownerDomain": "google.com",
+ "ownerName": "Google",
+ "protocol": "rest",
+ "schemas": {
+  "Analyze": {
+   "id": "Analyze",
+   "type": "object",
+   "properties": {
+    "errors": {
+     "type": "array",
+     "description": "List of errors with the data.",
+     "items": {
+      "type": "object",
+      "additionalProperties": {
+       "type": "string",
+       "description": "Error level followed by a detailed error message."
+      }
+     }
+    }
+   }
+  }
+ }
+}
diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/arrayofmapofstrings.want b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/arrayofmapofstrings.want
new file mode 100644
index 00000000..af81a7f5
--- /dev/null
+++ b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/arrayofmapofstrings.want
@@ -0,0 +1,56 @@
+// Package arrayofmapofstrings provides access to the Example API.
+//
+// Usage example:
+//
+//   import "google.golang.org/api/arrayofmapofstrings/v1"
+//   ...
+//   arrayofmapofstringsService, err := arrayofmapofstrings.New(oauthHttpClient)
+package arrayofmapofstrings
+
+import (
+	"bytes"
+	"google.golang.org/api/googleapi"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"strconv"
+	"strings"
+)
+
+// Always reference these packages, just in case the auto-generated code
+// below doesn't.
+var _ = bytes.NewBuffer
+var _ = strconv.Itoa
+var _ = fmt.Sprintf
+var _ = json.NewDecoder
+var _ = io.Copy
+var _ = url.Parse
+var _ = googleapi.Version
+var _ = errors.New
+var _ = strings.Replace
+
+const apiId = "arrayofmapofstrings:v1"
+const apiName = "arrayofmapofstrings"
+const apiVersion = "v1"
+const basePath = "https://www.googleapis.com/discovery/v1/apis"
+
+func New(client *http.Client) (*Service, error) {
+	if client == nil {
+		return nil, errors.New("client is nil")
+	}
+	s := &Service{client: client, BasePath: basePath}
+	return s, nil
+}
+
+type Service struct {
+	client   *http.Client
+	BasePath string // API endpoint base URL
+}
+
+type Analyze struct {
+	// Errors: List of errors with the data.
+	Errors []map[string]string `json:"errors,omitempty"`
+}
diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/blogger-3.json b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/blogger-3.json
new file mode 100644
index 00000000..53caa836
--- /dev/null
+++ b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/blogger-3.json
@@ -0,0 +1,2199 @@
+{
+ "kind": "discovery#restDescription",
+ "etag": "\"DGgqtFnjgu83tuwvvVNNUhOiHWk/HqXrvEeuZV7fVbX7lTgVYLdSy_g\"",
+ "discoveryVersion": "v1",
+ "id": "blogger:v3",
+ "name": "blogger",
+ "version": "v3",
+ "title": "Blogger API",
+ "description": "API for access to the data within Blogger.",
+ "ownerDomain": "google.com",
+ "ownerName": "Google",
+ "icons": {
+  "x16": "http://www.google.com/images/icons/product/blogger-16.png",
+  "x32": "http://www.google.com/images/icons/product/blogger-32.png"
+ },
+ "documentationLink": "https://developers.google.com/blogger/docs/3.0/getting_started",
+ "labels": [
+  "limited_availability"
+ ],
+ "protocol": "rest",
+ "baseUrl": "https://www.googleapis.com/blogger/v3/",
+ "basePath": "/blogger/v3/",
+ "rootUrl": "https://www.googleapis.com/",
+ "servicePath": "blogger/v3/",
+ "batchPath": "batch",
+ "parameters": {
+  "alt": {
+   "type": "string",
+   "description": "Data format for the response.",
+   "default": "json",
+   "enum": [
+    "json"
+   ],
+   "enumDescriptions": [
+    "Responses with Content-Type of application/json"
+   ],
+   "location": "query"
+  },
+  "fields": {
+   "type": "string",
+   "description": "Selector specifying which fields to include in a partial response.",
+   "location": "query"
+  },
+  "key": {
+   "type": "string",
+   "description": "API key. Your API key identifies your project and provides you with API access, quota, and reports. Required unless you provide an OAuth 2.0 token.",
+   "location": "query"
+  },
+  "oauth_token": {
+   "type": "string",
+   "description": "OAuth 2.0 token for the current user.",
+   "location": "query"
+  },
+  "prettyPrint": {
+   "type": "boolean",
+   "description": "Returns response with indentations and line breaks.",
+   "default": "true",
+   "location": "query"
+  },
+  "quotaUser": {
+   "type": "string",
+   "description": "Available to use for quota purposes for server-side applications. Can be any arbitrary string assigned to a user, but should not exceed 40 characters. Overrides userIp if both are provided.",
+   "location": "query"
+  },
+  "userIp": {
+   "type": "string",
+   "description": "IP address of the site where the request originates. Use this if you want to enforce per-user limits.",
+   "location": "query"
+  }
+ },
+ "auth": {
+  "oauth2": {
+   "scopes": {
+    "https://www.googleapis.com/auth/blogger": {
+     "description": "Manage your Blogger account"
+    },
+    "https://www.googleapis.com/auth/blogger.readonly": {
+     "description": "View your Blogger account"
+    }
+   }
+  }
+ },
+ "schemas": {
+  "Blog": {
+   "id": "Blog",
+   "type": "object",
+   "properties": {
+    "customMetaData": {
+     "type": "string",
+     "description": "The JSON custom meta-data for the Blog"
+    },
+    "description": {
+     "type": "string",
+     "description": "The description of this blog. This is displayed underneath the title."
+    },
+    "id": {
+     "type": "string",
+     "description": "The identifier for this resource."
+    },
+    "kind": {
+     "type": "string",
+     "description": "The kind of this entry. Always blogger#blog",
+     "default": "blogger#blog"
+    },
+    "locale": {
+     "type": "object",
+     "description": "The locale this Blog is set to.",
+     "properties": {
+      "country": {
+       "type": "string",
+       "description": "The country this blog's locale is set to."
+      },
+      "language": {
+       "type": "string",
+       "description": "The language this blog is authored in."
+      },
+      "variant": {
+       "type": "string",
+       "description": "The language variant this blog is authored in."
+      }
+     }
+    },
+    "name": {
+     "type": "string",
+     "description": "The name of this blog. This is displayed as the title."
+    },
+    "pages": {
+     "type": "object",
+     "description": "The container of pages in this blog.",
+     "properties": {
+      "selfLink": {
+       "type": "string",
+       "description": "The URL of the container for pages in this blog."
+      },
+      "totalItems": {
+       "type": "integer",
+       "description": "The count of pages in this blog.",
+       "format": "int32"
+      }
+     }
+    },
+    "posts": {
+     "type": "object",
+     "description": "The container of posts in this blog.",
+     "properties": {
+      "items": {
+       "type": "array",
+       "description": "The List of Posts for this Blog.",
+       "items": {
+        "$ref": "Post"
+       }
+      },
+      "selfLink": {
+       "type": "string",
+       "description": "The URL of the container for posts in this blog."
+      },
+      "totalItems": {
+       "type": "integer",
+       "description": "The count of posts in this blog.",
+       "format": "int32"
+      }
+     }
+    },
+    "published": {
+     "type": "string",
+     "description": "RFC 3339 date-time when this blog was published.",
+     "format": "date-time"
+    },
+    "selfLink": {
+     "type": "string",
+     "description": "The API REST URL to fetch this resource from."
+    },
+    "updated": {
+     "type": "string",
+     "description": "RFC 3339 date-time when this blog was last updated.",
+     "format": "date-time"
+    },
+    "url": {
+     "type": "string",
+     "description": "The URL where this blog is published."
+    }
+   }
+  },
+  "BlogList": {
+   "id": "BlogList",
+   "type": "object",
+   "properties": {
+    "blogUserInfos": {
+     "type": "array",
+     "description": "Admin level list of blog per-user information",
+     "items": {
+      "$ref": "BlogUserInfo"
+     }
+    },
+    "items": {
+     "type": "array",
+     "description": "The list of Blogs this user has Authorship or Admin rights over.",
+     "items": {
+      "$ref": "Blog"
+     }
+    },
+    "kind": {
+     "type": "string",
+     "description": "The kind of this entity. Always blogger#blogList",
+     "default": "blogger#blogList"
+    }
+   }
+  },
+  "BlogPerUserInfo": {
+   "id": "BlogPerUserInfo",
+   "type": "object",
+   "properties": {
+    "blogId": {
+     "type": "string",
+     "description": "ID of the Blog resource"
+    },
+    "hasAdminAccess": {
+     "type": "boolean",
+     "description": "True if the user has Admin level access to the blog."
+    },
+    "kind": {
+     "type": "string",
+     "description": "The kind of this entity. Always blogger#blogPerUserInfo",
+     "default": "blogger#blogPerUserInfo"
+    },
+    "photosAlbumKey": {
+     "type": "string",
+     "description": "The Photo Album Key for the user when adding photos to the blog"
+    },
+    "userId": {
+     "type": "string",
+     "description": "ID of the User"
+    }
+   }
+  },
+  "BlogUserInfo": {
+   "id": "BlogUserInfo",
+   "type": "object",
+   "properties": {
+    "blog": {
+     "$ref": "Blog",
+     "description": "The Blog resource."
+    },
+    "blog_user_info": {
+     "$ref": "BlogPerUserInfo",
+     "description": "Information about a User for the Blog."
+    },
+    "kind": {
+     "type": "string",
+     "description": "The kind of this entity. Always blogger#blogUserInfo",
+     "default": "blogger#blogUserInfo"
+    }
+   }
+  },
+  "Comment": {
+   "id": "Comment",
+   "type": "object",
+   "properties": {
+    "author": {
+     "type": "object",
+     "description": "The author of this Comment.",
+     "properties": {
+      "displayName": {
+       "type": "string",
+       "description": "The display name."
+      },
+      "id": {
+       "type": "string",
+       "description": "The identifier of the Comment creator."
+      },
+      "image": {
+       "type": "object",
+       "description": "The comment creator's avatar.",
+       "properties": {
+        "url": {
+         "type": "string",
+         "description": "The comment creator's avatar URL."
+        }
+       }
+      },
+      "url": {
+       "type": "string",
+       "description": "The URL of the Comment creator's Profile page."
+      }
+     }
+    },
+    "blog": {
+     "type": "object",
+     "description": "Data about the blog containing this comment.",
+     "properties": {
+      "id": {
+       "type": "string",
+       "description": "The identifier of the blog containing this comment."
+      }
+     }
+    },
+    "content": {
+     "type": "string",
+     "description": "The actual content of the comment. May include HTML markup."
+    },
+    "id": {
+     "type": "string",
+     "description": "The identifier for this resource."
+    },
+    "inReplyTo": {
+     "type": "object",
+     "description": "Data about the comment this is in reply to.",
+     "properties": {
+      "id": {
+       "type": "string",
+       "description": "The identified of the parent of this comment."
+      }
+     }
+    },
+    "kind": {
+     "type": "string",
+     "description": "The kind of this entry. Always blogger#comment",
+     "default": "blogger#comment"
+    },
+    "post": {
+     "type": "object",
+     "description": "Data about the post containing this comment.",
+     "properties": {
+      "id": {
+       "type": "string",
+       "description": "The identifier of the post containing this comment."
+      }
+     }
+    },
+    "published": {
+     "type": "string",
+     "description": "RFC 3339 date-time when this comment was published.",
+     "format": "date-time"
+    },
+    "selfLink": {
+     "type": "string",
+     "description": "The API REST URL to fetch this resource from."
+    },
+    "status": {
+     "type": "string",
+     "description": "The status of the comment (only populated for admin users)"
+    },
+    "updated": {
+     "type": "string",
+     "description": "RFC 3339 date-time when this comment was last updated.",
+     "format": "date-time"
+    }
+   }
+  },
+  "CommentList": {
+   "id": "CommentList",
+   "type": "object",
+   "properties": {
+    "items": {
+     "type": "array",
+     "description": "The List of Comments for a Post.",
+     "items": {
+      "$ref": "Comment"
+     }
+    },
+    "kind": {
+     "type": "string",
+     "description": "The kind of this entry. Always blogger#commentList",
+     "default": "blogger#commentList"
+    },
+    "nextPageToken": {
+     "type": "string",
+     "description": "Pagination token to fetch the next page, if one exists."
+    },
+    "prevPageToken": {
+     "type": "string",
+     "description": "Pagination token to fetch the previous page, if one exists."
+    }
+   }
+  },
+  "Page": {
+   "id": "Page",
+   "type": "object",
+   "properties": {
+    "author": {
+     "type": "object",
+     "description": "The author of this Page.",
+     "properties": {
+      "displayName": {
+       "type": "string",
+       "description": "The display name."
+      },
+      "id": {
+       "type": "string",
+       "description": "The identifier of the Page creator."
+      },
+      "image": {
+       "type": "object",
+       "description": "The page author's avatar.",
+       "properties": {
+        "url": {
+         "type": "string",
+         "description": "The page author's avatar URL."
+        }
+       }
+      },
+      "url": {
+       "type": "string",
+       "description": "The URL of the Page creator's Profile page."
+      }
+     }
+    },
+    "blog": {
+     "type": "object",
+     "description": "Data about the blog containing this Page.",
+     "properties": {
+      "id": {
+       "type": "string",
+       "description": "The identifier of the blog containing this page."
+      }
+     }
+    },
+    "content": {
+     "type": "string",
+     "description": "The body content of this Page, in HTML."
+    },
+    "id": {
+     "type": "string",
+     "description": "The identifier for this resource."
+    },
+    "kind": {
+     "type": "string",
+     "description": "The kind of this entity. Always blogger#page",
+     "default": "blogger#page"
+    },
+    "published": {
+     "type": "string",
+     "description": "RFC 3339 date-time when this Page was published.",
+     "format": "date-time"
+    },
+    "selfLink": {
+     "type": "string",
+     "description": "The API REST URL to fetch this resource from."
+    },
+    "status": {
+     "type": "string",
+     "description": "The status of the page for admin resources (either LIVE or DRAFT)."
+    },
+    "title": {
+     "type": "string",
+     "description": "The title of this entity. This is the name displayed in the Admin user interface."
+    },
+    "updated": {
+     "type": "string",
+     "description": "RFC 3339 date-time when this Page was last updated.",
+     "format": "date-time"
+    },
+    "url": {
+     "type": "string",
+     "description": "The URL that this Page is displayed at."
+    }
+   }
+  },
+  "PageList": {
+   "id": "PageList",
+   "type": "object",
+   "properties": {
+    "items": {
+     "type": "array",
+     "description": "The list of Pages for a Blog.",
+     "items": {
+      "$ref": "Page"
+     }
+    },
+    "kind": {
+     "type": "string",
+     "description": "The kind of this entity. Always blogger#pageList",
+     "default": "blogger#pageList"
+    }
+   }
+  },
+  "Pageviews": {
+   "id": "Pageviews",
+   "type": "object",
+   "properties": {
+    "blogId": {
+     "type": "string",
+     "description": "Blog Id",
+     "format": "int64"
+    },
+    "counts": {
+     "type": "array",
+     "description": "The container of posts in this blog.",
+     "items": {
+      "type": "object",
+      "properties": {
+       "count": {
+        "type": "string",
+        "description": "Count of page views for the given time range",
+        "format": "int64"
+       },
+       "timeRange": {
+        "type": "string",
+        "description": "Time range the given count applies to"
+       }
+      }
+     }
+    },
+    "kind": {
+     "type": "string",
+     "description": "The kind of this entry. Always blogger#page_views",
+     "default": "blogger#page_views"
+    }
+   }
+  },
+  "Post": {
+   "id": "Post",
+   "type": "object",
+   "properties": {
+    "author": {
+     "type": "object",
+     "description": "The author of this Post.",
+     "properties": {
+      "displayName": {
+       "type": "string",
+       "description": "The display name."
+      },
+      "id": {
+       "type": "string",
+       "description": "The identifier of the Post creator."
+      },
+      "image": {
+       "type": "object",
+       "description": "The Post author's avatar.",
+       "properties": {
+        "url": {
+         "type": "string",
+         "description": "The Post author's avatar URL."
+        }
+       }
+      },
+      "url": {
+       "type": "string",
+       "description": "The URL of the Post creator's Profile page."
+      }
+     }
+    },
+    "blog": {
+     "type": "object",
+     "description": "Data about the blog containing this Post.",
+     "properties": {
+      "id": {
+       "type": "string",
+       "description": "The identifier of the Blog that contains this Post."
+      }
+     }
+    },
+    "content": {
+     "type": "string",
+     "description": "The content of the Post. May contain HTML markup."
+    },
+    "customMetaData": {
+     "type": "string",
+     "description": "The JSON meta-data for the Post."
+    },
+    "id": {
+     "type": "string",
+     "description": "The identifier of this Post."
+    },
+    "images": {
+     "type": "array",
+     "description": "Display image for the Post.",
+     "items": {
+      "type": "object",
+      "properties": {
+       "url": {
+        "type": "string"
+       }
+      }
+     }
+    },
+    "kind": {
+     "type": "string",
+     "description": "The kind of this entity. Always blogger#post",
+     "default": "blogger#post"
+    },
+    "labels": {
+     "type": "array",
+     "description": "The list of labels this Post was tagged with.",
+     "items": {
+      "type": "string"
+     }
+    },
+    "location": {
+     "type": "object",
+     "description": "The location for geotagged posts.",
+     "properties": {
+      "lat": {
+       "type": "number",
+       "description": "Location's latitude.",
+       "format": "double"
+      },
+      "lng": {
+       "type": "number",
+       "description": "Location's longitude.",
+       "format": "double"
+      },
+      "name": {
+       "type": "string",
+       "description": "Location name."
+      },
+      "span": {
+       "type": "string",
+       "description": "Location's viewport span. Can be used when rendering a map preview."
+      }
+     }
+    },
+    "published": {
+     "type": "string",
+     "description": "RFC 3339 date-time when this Post was published.",
+     "format": "date-time"
+    },
+    "replies": {
+     "type": "object",
+     "description": "The container of comments on this Post.",
+     "properties": {
+      "items": {
+       "type": "array",
+       "description": "The List of Comments for this Post.",
+       "items": {
+        "$ref": "Comment"
+       }
+      },
+      "selfLink": {
+       "type": "string",
+       "description": "The URL of the comments on this post."
+      },
+      "totalItems": {
+       "type": "string",
+       "description": "The count of comments on this post.",
+       "format": "int64"
+      }
+     }
+    },
+    "selfLink": {
+     "type": "string",
+     "description": "The API REST URL to fetch this resource from."
+    },
+    "status": {
+     "type": "string",
+     "description": "Status of the post. Only set for admin-level requests"
+    },
+    "title": {
+     "type": "string",
+     "description": "The title of the Post."
+    },
+    "titleLink": {
+     "type": "string",
+     "description": "The title link URL, similar to atom's related link."
+    },
+    "updated": {
+     "type": "string",
+     "description": "RFC 3339 date-time when this Post was last updated.",
+     "format": "date-time"
+    },
+    "url": {
+     "type": "string",
+     "description": "The URL where this Post is displayed."
+    }
+   }
+  },
+  "PostList": {
+   "id": "PostList",
+   "type": "object",
+   "properties": {
+    "items": {
+     "type": "array",
+     "description": "The list of Posts for this Blog.",
+     "items": {
+      "$ref": "Post"
+     }
+    },
+    "kind": {
+     "type": "string",
+     "description": "The kind of this entity. Always blogger#postList",
+     "default": "blogger#postList"
+    },
+    "nextPageToken": {
+     "type": "string",
+     "description": "Pagination token to fetch the next page, if one exists."
+    }
+   }
+  },
+  "PostPerUserInfo": {
+   "id": "PostPerUserInfo",
+   "type": "object",
+   "properties": {
+    "blogId": {
+     "type": "string",
+     "description": "ID of the Blog that the post resource belongs to."
+    },
+    "hasEditAccess": {
+     "type": "boolean",
+     "description": "True if the user has Author level access to the post."
+    },
+    "kind": {
+     "type": "string",
+     "description": "The kind of this entity. Always blogger#postPerUserInfo",
+     "default": "blogger#postPerUserInfo"
+    },
+    "postId": {
+     "type": "string",
+     "description": "ID of the Post resource."
+    },
+    "userId": {
+     "type": "string",
+     "description": "ID of the User."
+    }
+   }
+  },
+  "PostUserInfo": {
+   "id": "PostUserInfo",
+   "type": "object",
+   "properties": {
+    "kind": {
+     "type": "string",
+     "description": "The kind of this entity. Always blogger#postUserInfo",
+     "default": "blogger#postUserInfo"
+    },
+    "post": {
+     "$ref": "Post",
+     "description": "The Post resource."
+    },
+    "post_user_info": {
+     "$ref": "PostPerUserInfo",
+     "description": "Information about a User for the Post."
+    }
+   }
+  },
+  "PostUserInfosList": {
+   "id": "PostUserInfosList",
+   "type": "object",
+   "properties": {
+    "items": {
+     "type": "array",
+     "description": "The list of Posts with User information for the post, for this Blog.",
+     "items": {
+      "$ref": "PostUserInfo"
+     }
+    },
+    "kind": {
+     "type": "string",
+     "description": "The kind of this entity. Always blogger#postList",
+     "default": "blogger#postUserInfosList"
+    },
+    "nextPageToken": {
+     "type": "string",
+     "description": "Pagination token to fetch the next page, if one exists."
+    }
+   }
+  },
+  "User": {
+   "id": "User",
+   "type": "object",
+   "properties": {
+    "about": {
+     "type": "string",
+     "description": "Profile summary information."
+    },
+    "blogs": {
+     "type": "object",
+     "description": "The container of blogs for this user.",
+     "properties": {
+      "selfLink": {
+       "type": "string",
+       "description": "The URL of the Blogs for this user."
+      }
+     }
+    },
+    "created": {
+     "type": "string",
+     "description": "The timestamp of when this profile was created, in seconds since epoch.",
+     "format": "date-time"
+    },
+    "displayName": {
+     "type": "string",
+     "description": "The display name."
+    },
+    "id": {
+     "type": "string",
+     "description": "The identifier for this User."
+    },
+    "kind": {
+     "type": "string",
+     "description": "The kind of this entity. Always blogger#user",
+     "default": "blogger#user"
+    },
+    "locale": {
+     "type": "object",
+     "description": "This user's locale",
+     "properties": {
+      "country": {
+       "type": "string",
+       "description": "The user's country setting."
+      },
+      "language": {
+       "type": "string",
+       "description": "The user's language setting."
+      },
+      "variant": {
+       "type": "string",
+       "description": "The user's language variant setting."
+      }
+     }
+    },
+    "selfLink": {
+     "type": "string",
+     "description": "The API REST URL to fetch this resource from."
+    },
+    "url": {
+     "type": "string",
+     "description": "The user's profile page."
+    }
+   }
+  }
+ },
+ "resources": {
+  "blogUserInfos": {
+   "methods": {
+    "get": {
+     "id": "blogger.blogUserInfos.get",
+     "path": "users/{userId}/blogs/{blogId}",
+     "httpMethod": "GET",
+     "description": "Gets one blog and user info pair by blogId and userId.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "The ID of the blog to get.",
+       "required": true,
+       "location": "path"
+      },
+      "maxPosts": {
+       "type": "integer",
+       "description": "Maximum number of posts to pull back with the blog.",
+       "format": "uint32",
+       "location": "query"
+      },
+      "userId": {
+       "type": "string",
+       "description": "ID of the user whose blogs are to be fetched. Either the word 'self' (sans quote marks) or the user's profile identifier.",
+       "required": true,
+       "location": "path"
+      }
+     },
+     "parameterOrder": [
+      "userId",
+      "blogId"
+     ],
+     "response": {
+      "$ref": "BlogUserInfo"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger",
+      "https://www.googleapis.com/auth/blogger.readonly"
+     ]
+    }
+   }
+  },
+  "blogs": {
+   "methods": {
+    "get": {
+     "id": "blogger.blogs.get",
+     "path": "blogs/{blogId}",
+     "httpMethod": "GET",
+     "description": "Gets one blog by id.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "The ID of the blog to get.",
+       "required": true,
+       "location": "path"
+      },
+      "maxPosts": {
+       "type": "integer",
+       "description": "Maximum number of posts to pull back with the blog.",
+       "format": "uint32",
+       "location": "query"
+      }
+     },
+     "parameterOrder": [
+      "blogId"
+     ],
+     "response": {
+      "$ref": "Blog"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger",
+      "https://www.googleapis.com/auth/blogger.readonly"
+     ]
+    },
+    "getByUrl": {
+     "id": "blogger.blogs.getByUrl",
+     "path": "blogs/byurl",
+     "httpMethod": "GET",
+     "description": "Retrieve a Blog by URL.",
+     "parameters": {
+      "url": {
+       "type": "string",
+       "description": "The URL of the blog to retrieve.",
+       "required": true,
+       "location": "query"
+      }
+     },
+     "parameterOrder": [
+      "url"
+     ],
+     "response": {
+      "$ref": "Blog"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger",
+      "https://www.googleapis.com/auth/blogger.readonly"
+     ]
+    },
+    "listByUser": {
+     "id": "blogger.blogs.listByUser",
+     "path": "users/{userId}/blogs",
+     "httpMethod": "GET",
+     "description": "Retrieves a list of blogs, possibly filtered.",
+     "parameters": {
+      "fetchUserInfo": {
+       "type": "boolean",
+       "description": "Whether the response is a list of blogs with per-user information instead of just blogs.",
+       "location": "query"
+      },
+      "userId": {
+       "type": "string",
+       "description": "ID of the user whose blogs are to be fetched. Either the word 'self' (sans quote marks) or the user's profile identifier.",
+       "required": true,
+       "location": "path"
+      },
+      "view": {
+       "type": "string",
+       "enum": [
+        "ADMIN",
+        "AUTHOR",
+        "READER"
+       ],
+       "enumDescriptions": [
+        "Admin level detail",
+        "Author level detail",
+        "Admin level detail"
+       ],
+       "location": "query"
+      }
+     },
+     "parameterOrder": [
+      "userId"
+     ],
+     "response": {
+      "$ref": "BlogList"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger",
+      "https://www.googleapis.com/auth/blogger.readonly"
+     ]
+    }
+   }
+  },
+  "comments": {
+   "methods": {
+    "approve": {
+     "id": "blogger.comments.approve",
+     "path": "blogs/{blogId}/posts/{postId}/comments/{commentId}/approve",
+     "httpMethod": "POST",
+     "description": "Marks a comment as not spam.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "The Id of the Blog.",
+       "required": true,
+       "location": "path"
+      },
+      "commentId": {
+       "type": "string",
+       "description": "The ID of the comment to mark as not spam.",
+       "required": true,
+       "location": "path"
+      },
+      "postId": {
+       "type": "string",
+       "description": "The ID of the Post.",
+       "required": true,
+       "location": "path"
+      }
+     },
+     "parameterOrder": [
+      "blogId",
+      "postId",
+      "commentId"
+     ],
+     "response": {
+      "$ref": "Comment"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger"
+     ]
+    },
+    "delete": {
+     "id": "blogger.comments.delete",
+     "path": "blogs/{blogId}/posts/{postId}/comments/{commentId}",
+     "httpMethod": "DELETE",
+     "description": "Delete a comment by id.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "The Id of the Blog.",
+       "required": true,
+       "location": "path"
+      },
+      "commentId": {
+       "type": "string",
+       "description": "The ID of the comment to delete.",
+       "required": true,
+       "location": "path"
+      },
+      "postId": {
+       "type": "string",
+       "description": "The ID of the Post.",
+       "required": true,
+       "location": "path"
+      }
+     },
+     "parameterOrder": [
+      "blogId",
+      "postId",
+      "commentId"
+     ],
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger"
+     ]
+    },
+    "get": {
+     "id": "blogger.comments.get",
+     "path": "blogs/{blogId}/posts/{postId}/comments/{commentId}",
+     "httpMethod": "GET",
+     "description": "Gets one comment by id.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "ID of the blog to containing the comment.",
+       "required": true,
+       "location": "path"
+      },
+      "commentId": {
+       "type": "string",
+       "description": "The ID of the comment to get.",
+       "required": true,
+       "location": "path"
+      },
+      "postId": {
+       "type": "string",
+       "description": "ID of the post to fetch posts from.",
+       "required": true,
+       "location": "path"
+      }
+     },
+     "parameterOrder": [
+      "blogId",
+      "postId",
+      "commentId"
+     ],
+     "response": {
+      "$ref": "Comment"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger",
+      "https://www.googleapis.com/auth/blogger.readonly"
+     ]
+    },
+    "list": {
+     "id": "blogger.comments.list",
+     "path": "blogs/{blogId}/posts/{postId}/comments",
+     "httpMethod": "GET",
+     "description": "Retrieves the comments for a post, possibly filtered.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "ID of the blog to fetch comments from.",
+       "required": true,
+       "location": "path"
+      },
+      "endDate": {
+       "type": "string",
+       "description": "Latest date of comment to fetch, a date-time with RFC 3339 formatting.",
+       "format": "date-time",
+       "location": "query"
+      },
+      "fetchBodies": {
+       "type": "boolean",
+       "description": "Whether the body content of the comments is included.",
+       "location": "query"
+      },
+      "maxResults": {
+       "type": "integer",
+       "description": "Maximum number of comments to include in the result.",
+       "format": "uint32",
+       "location": "query"
+      },
+      "pageToken": {
+       "type": "string",
+       "description": "Continuation token if request is paged.",
+       "location": "query"
+      },
+      "postId": {
+       "type": "string",
+       "description": "ID of the post to fetch posts from.",
+       "required": true,
+       "location": "path"
+      },
+      "startDate": {
+       "type": "string",
+       "description": "Earliest date of comment to fetch, a date-time with RFC 3339 formatting.",
+       "format": "date-time",
+       "location": "query"
+      },
+      "statuses": {
+       "type": "string",
+       "enum": [
+        "emptied",
+        "live",
+        "pending",
+        "spam"
+       ],
+       "enumDescriptions": [
+        "Comments that have had their content removed",
+        "Comments that are publicly visible",
+        "Comments that are awaiting administrator approval",
+        "Comments marked as spam by the administrator"
+       ],
+       "repeated": true,
+       "location": "query"
+      },
+      "view": {
+       "type": "string",
+       "enum": [
+        "ADMIN",
+        "AUTHOR",
+        "READER"
+       ],
+       "enumDescriptions": [
+        "Admin level detail",
+        "Author level detail",
+        "Admin level detail"
+       ],
+       "location": "query"
+      }
+     },
+     "parameterOrder": [
+      "blogId",
+      "postId"
+     ],
+     "response": {
+      "$ref": "CommentList"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger",
+      "https://www.googleapis.com/auth/blogger.readonly"
+     ]
+    },
+    "listByBlog": {
+     "id": "blogger.comments.listByBlog",
+     "path": "blogs/{blogId}/comments",
+     "httpMethod": "GET",
+     "description": "Retrieves the comments for a blog, across all posts, possibly filtered.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "ID of the blog to fetch comments from.",
+       "required": true,
+       "location": "path"
+      },
+      "endDate": {
+       "type": "string",
+       "description": "Latest date of comment to fetch, a date-time with RFC 3339 formatting.",
+       "format": "date-time",
+       "location": "query"
+      },
+      "fetchBodies": {
+       "type": "boolean",
+       "description": "Whether the body content of the comments is included.",
+       "location": "query"
+      },
+      "maxResults": {
+       "type": "integer",
+       "description": "Maximum number of comments to include in the result.",
+       "format": "uint32",
+       "location": "query"
+      },
+      "pageToken": {
+       "type": "string",
+       "description": "Continuation token if request is paged.",
+       "location": "query"
+      },
+      "startDate": {
+       "type": "string",
+       "description": "Earliest date of comment to fetch, a date-time with RFC 3339 formatting.",
+       "format": "date-time",
+       "location": "query"
+      }
+     },
+     "parameterOrder": [
+      "blogId"
+     ],
+     "response": {
+      "$ref": "CommentList"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger",
+      "https://www.googleapis.com/auth/blogger.readonly"
+     ]
+    },
+    "markAsSpam": {
+     "id": "blogger.comments.markAsSpam",
+     "path": "blogs/{blogId}/posts/{postId}/comments/{commentId}/spam",
+     "httpMethod": "POST",
+     "description": "Marks a comment as spam.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "The Id of the Blog.",
+       "required": true,
+       "location": "path"
+      },
+      "commentId": {
+       "type": "string",
+       "description": "The ID of the comment to mark as spam.",
+       "required": true,
+       "location": "path"
+      },
+      "postId": {
+       "type": "string",
+       "description": "The ID of the Post.",
+       "required": true,
+       "location": "path"
+      }
+     },
+     "parameterOrder": [
+      "blogId",
+      "postId",
+      "commentId"
+     ],
+     "response": {
+      "$ref": "Comment"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger"
+     ]
+    },
+    "removeContent": {
+     "id": "blogger.comments.removeContent",
+     "path": "blogs/{blogId}/posts/{postId}/comments/{commentId}/removecontent",
+     "httpMethod": "POST",
+     "description": "Removes the content of a comment.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "The Id of the Blog.",
+       "required": true,
+       "location": "path"
+      },
+      "commentId": {
+       "type": "string",
+       "description": "The ID of the comment to delete content from.",
+       "required": true,
+       "location": "path"
+      },
+      "postId": {
+       "type": "string",
+       "description": "The ID of the Post.",
+       "required": true,
+       "location": "path"
+      }
+     },
+     "parameterOrder": [
+      "blogId",
+      "postId",
+      "commentId"
+     ],
+     "response": {
+      "$ref": "Comment"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger"
+     ]
+    }
+   }
+  },
+  "pageViews": {
+   "methods": {
+    "get": {
+     "id": "blogger.pageViews.get",
+     "path": "blogs/{blogId}/pageviews",
+     "httpMethod": "GET",
+     "description": "Retrieve pageview stats for a Blog.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "The ID of the blog to get.",
+       "required": true,
+       "location": "path"
+      },
+      "range": {
+       "type": "string",
+       "enum": [
+        "30DAYS",
+        "7DAYS",
+        "all"
+       ],
+       "enumDescriptions": [
+        "Page view counts from the last thirty days.",
+        "Page view counts from the last seven days.",
+        "Total page view counts from all time."
+       ],
+       "repeated": true,
+       "location": "query"
+      }
+     },
+     "parameterOrder": [
+      "blogId"
+     ],
+     "response": {
+      "$ref": "Pageviews"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger"
+     ]
+    }
+   }
+  },
+  "pages": {
+   "methods": {
+    "delete": {
+     "id": "blogger.pages.delete",
+     "path": "blogs/{blogId}/pages/{pageId}",
+     "httpMethod": "DELETE",
+     "description": "Delete a page by id.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "The Id of the Blog.",
+       "required": true,
+       "location": "path"
+      },
+      "pageId": {
+       "type": "string",
+       "description": "The ID of the Page.",
+       "required": true,
+       "location": "path"
+      }
+     },
+     "parameterOrder": [
+      "blogId",
+      "pageId"
+     ],
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger"
+     ]
+    },
+    "get": {
+     "id": "blogger.pages.get",
+     "path": "blogs/{blogId}/pages/{pageId}",
+     "httpMethod": "GET",
+     "description": "Gets one blog page by id.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "ID of the blog containing the page.",
+       "required": true,
+       "location": "path"
+      },
+      "pageId": {
+       "type": "string",
+       "description": "The ID of the page to get.",
+       "required": true,
+       "location": "path"
+      },
+      "view": {
+       "type": "string",
+       "enum": [
+        "ADMIN",
+        "AUTHOR",
+        "READER"
+       ],
+       "enumDescriptions": [
+        "Admin level detail",
+        "Author level detail",
+        "Admin level detail"
+       ],
+       "location": "query"
+      }
+     },
+     "parameterOrder": [
+      "blogId",
+      "pageId"
+     ],
+     "response": {
+      "$ref": "Page"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger",
+      "https://www.googleapis.com/auth/blogger.readonly"
+     ]
+    },
+    "insert": {
+     "id": "blogger.pages.insert",
+     "path": "blogs/{blogId}/pages",
+     "httpMethod": "POST",
+     "description": "Add a page.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "ID of the blog to add the page to.",
+       "required": true,
+       "location": "path"
+      }
+     },
+     "parameterOrder": [
+      "blogId"
+     ],
+     "request": {
+      "$ref": "Page"
+     },
+     "response": {
+      "$ref": "Page"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger"
+     ]
+    },
+    "list": {
+     "id": "blogger.pages.list",
+     "path": "blogs/{blogId}/pages",
+     "httpMethod": "GET",
+     "description": "Retrieves the pages for a blog, optionally including non-LIVE statuses.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "ID of the blog to fetch pages from.",
+       "required": true,
+       "location": "path"
+      },
+      "fetchBodies": {
+       "type": "boolean",
+       "description": "Whether to retrieve the Page bodies.",
+       "location": "query"
+      },
+      "statuses": {
+       "type": "string",
+       "enum": [
+        "draft",
+        "imported",
+        "live"
+       ],
+       "enumDescriptions": [
+        "Draft (unpublished) Pages",
+        "Pages that have had their content removed",
+        "Pages that are publicly visible"
+       ],
+       "repeated": true,
+       "location": "query"
+      },
+      "view": {
+       "type": "string",
+       "enum": [
+        "ADMIN",
+        "AUTHOR",
+        "READER"
+       ],
+       "enumDescriptions": [
+        "Admin level detail",
+        "Author level detail",
+        "Admin level detail"
+       ],
+       "location": "query"
+      }
+     },
+     "parameterOrder": [
+      "blogId"
+     ],
+     "response": {
+      "$ref": "PageList"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger",
+      "https://www.googleapis.com/auth/blogger.readonly"
+     ]
+    },
+    "patch": {
+     "id": "blogger.pages.patch",
+     "path": "blogs/{blogId}/pages/{pageId}",
+     "httpMethod": "PATCH",
+     "description": "Update a page. This method supports patch semantics.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "The ID of the Blog.",
+       "required": true,
+       "location": "path"
+      },
+      "pageId": {
+       "type": "string",
+       "description": "The ID of the Page.",
+       "required": true,
+       "location": "path"
+      }
+     },
+     "parameterOrder": [
+      "blogId",
+      "pageId"
+     ],
+     "request": {
+      "$ref": "Page"
+     },
+     "response": {
+      "$ref": "Page"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger"
+     ]
+    },
+    "update": {
+     "id": "blogger.pages.update",
+     "path": "blogs/{blogId}/pages/{pageId}",
+     "httpMethod": "PUT",
+     "description": "Update a page.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "The ID of the Blog.",
+       "required": true,
+       "location": "path"
+      },
+      "pageId": {
+       "type": "string",
+       "description": "The ID of the Page.",
+       "required": true,
+       "location": "path"
+      }
+     },
+     "parameterOrder": [
+      "blogId",
+      "pageId"
+     ],
+     "request": {
+      "$ref": "Page"
+     },
+     "response": {
+      "$ref": "Page"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger"
+     ]
+    }
+   }
+  },
+  "postUserInfos": {
+   "methods": {
+    "get": {
+     "id": "blogger.postUserInfos.get",
+     "path": "users/{userId}/blogs/{blogId}/posts/{postId}",
+     "httpMethod": "GET",
+     "description": "Gets one post and user info pair by postId and userId.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "The ID of the blog.",
+       "required": true,
+       "location": "path"
+      },
+      "maxComments": {
+       "type": "integer",
+       "description": "Maximum number of comments to pull back on a post.",
+       "format": "uint32",
+       "location": "query"
+      },
+      "postId": {
+       "type": "string",
+       "description": "The ID of the post to get.",
+       "required": true,
+       "location": "path"
+      },
+      "userId": {
+       "type": "string",
+       "description": "ID of the user for the per-user information to be fetched. Either the word 'self' (sans quote marks) or the user's profile identifier.",
+       "required": true,
+       "location": "path"
+      }
+     },
+     "parameterOrder": [
+      "userId",
+      "blogId",
+      "postId"
+     ],
+     "response": {
+      "$ref": "PostUserInfo"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger",
+      "https://www.googleapis.com/auth/blogger.readonly"
+     ]
+    },
+    "list": {
+     "id": "blogger.postUserInfos.list",
+     "path": "users/{userId}/blogs/{blogId}/posts",
+     "httpMethod": "GET",
+     "description": "Retrieves a list of post and user info pairs, possibly filtered.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "ID of the blog to fetch posts from.",
+       "required": true,
+       "location": "path"
+      },
+      "endDate": {
+       "type": "string",
+       "description": "Latest post date to fetch, a date-time with RFC 3339 formatting.",
+       "format": "date-time",
+       "location": "query"
+      },
+      "fetchBodies": {
+       "type": "boolean",
+       "description": "Whether the body content of posts is included.",
+       "location": "query"
+      },
+      "labels": {
+       "type": "string",
+       "description": "Comma-separated list of labels to search for.",
+       "location": "query"
+      },
+      "maxResults": {
+       "type": "integer",
+       "description": "Maximum number of posts to fetch.",
+       "format": "uint32",
+       "location": "query"
+      },
+      "orderBy": {
+       "type": "string",
+       "description": "Sort search results",
+       "default": "PUBLISHED",
+       "enum": [
+        "published",
+        "updated"
+       ],
+       "enumDescriptions": [
+        "Order by the date the post was published",
+        "Order by the date the post was last updated"
+       ],
+       "location": "query"
+      },
+      "pageToken": {
+       "type": "string",
+       "description": "Continuation token if the request is paged.",
+       "location": "query"
+      },
+      "startDate": {
+       "type": "string",
+       "description": "Earliest post date to fetch, a date-time with RFC 3339 formatting.",
+       "format": "date-time",
+       "location": "query"
+      },
+      "statuses": {
+       "type": "string",
+       "enum": [
+        "draft",
+        "live",
+        "scheduled"
+       ],
+       "enumDescriptions": [
+        "Draft posts",
+        "Published posts",
+        "Posts that are scheduled to publish in future."
+       ],
+       "repeated": true,
+       "location": "query"
+      },
+      "userId": {
+       "type": "string",
+       "description": "ID of the user for the per-user information to be fetched. Either the word 'self' (sans quote marks) or the user's profile identifier.",
+       "required": true,
+       "location": "path"
+      },
+      "view": {
+       "type": "string",
+       "enum": [
+        "ADMIN",
+        "AUTHOR",
+        "READER"
+       ],
+       "enumDescriptions": [
+        "Admin level detail",
+        "Author level detail",
+        "Reader level detail"
+       ],
+       "location": "query"
+      }
+     },
+     "parameterOrder": [
+      "userId",
+      "blogId"
+     ],
+     "response": {
+      "$ref": "PostUserInfosList"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger",
+      "https://www.googleapis.com/auth/blogger.readonly"
+     ]
+    }
+   }
+  },
+  "posts": {
+   "methods": {
+    "delete": {
+     "id": "blogger.posts.delete",
+     "path": "blogs/{blogId}/posts/{postId}",
+     "httpMethod": "DELETE",
+     "description": "Delete a post by id.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "The Id of the Blog.",
+       "required": true,
+       "location": "path"
+      },
+      "postId": {
+       "type": "string",
+       "description": "The ID of the Post.",
+       "required": true,
+       "location": "path"
+      }
+     },
+     "parameterOrder": [
+      "blogId",
+      "postId"
+     ],
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger"
+     ]
+    },
+    "get": {
+     "id": "blogger.posts.get",
+     "path": "blogs/{blogId}/posts/{postId}",
+     "httpMethod": "GET",
+     "description": "Get a post by id.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "ID of the blog to fetch the post from.",
+       "required": true,
+       "location": "path"
+      },
+      "maxComments": {
+       "type": "integer",
+       "description": "Maximum number of comments to pull back on a post.",
+       "format": "uint32",
+       "location": "query"
+      },
+      "postId": {
+       "type": "string",
+       "description": "The ID of the post",
+       "required": true,
+       "location": "path"
+      },
+      "view": {
+       "type": "string",
+       "enum": [
+        "ADMIN",
+        "AUTHOR",
+        "READER"
+       ],
+       "enumDescriptions": [
+        "Admin level detail",
+        "Author level detail",
+        "Admin level detail"
+       ],
+       "location": "query"
+      }
+     },
+     "parameterOrder": [
+      "blogId",
+      "postId"
+     ],
+     "response": {
+      "$ref": "Post"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger",
+      "https://www.googleapis.com/auth/blogger.readonly"
+     ]
+    },
+    "getByPath": {
+     "id": "blogger.posts.getByPath",
+     "path": "blogs/{blogId}/posts/bypath",
+     "httpMethod": "GET",
+     "description": "Retrieve a Post by Path.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "ID of the blog to fetch the post from.",
+       "required": true,
+       "location": "path"
+      },
+      "maxComments": {
+       "type": "integer",
+       "description": "Maximum number of comments to pull back on a post.",
+       "format": "uint32",
+       "location": "query"
+      },
+      "path": {
+       "type": "string",
+       "description": "Path of the Post to retrieve.",
+       "required": true,
+       "location": "query"
+      },
+      "view": {
+       "type": "string",
+       "enum": [
+        "ADMIN",
+        "AUTHOR",
+        "READER"
+       ],
+       "enumDescriptions": [
+        "Admin level detail",
+        "Author level detail",
+        "Admin level detail"
+       ],
+       "location": "query"
+      }
+     },
+     "parameterOrder": [
+      "blogId",
+      "path"
+     ],
+     "response": {
+      "$ref": "Post"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger",
+      "https://www.googleapis.com/auth/blogger.readonly"
+     ]
+    },
+    "insert": {
+     "id": "blogger.posts.insert",
+     "path": "blogs/{blogId}/posts",
+     "httpMethod": "POST",
+     "description": "Add a post.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "ID of the blog to add the post to.",
+       "required": true,
+       "location": "path"
+      },
+      "isDraft": {
+       "type": "boolean",
+       "description": "Whether to create the post as a draft",
+       "location": "query"
+      }
+     },
+     "parameterOrder": [
+      "blogId"
+     ],
+     "request": {
+      "$ref": "Post"
+     },
+     "response": {
+      "$ref": "Post"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger"
+     ]
+    },
+    "list": {
+     "id": "blogger.posts.list",
+     "path": "blogs/{blogId}/posts",
+     "httpMethod": "GET",
+     "description": "Retrieves a list of posts, possibly filtered.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "ID of the blog to fetch posts from.",
+       "required": true,
+       "location": "path"
+      },
+      "endDate": {
+       "type": "string",
+       "description": "Latest post date to fetch, a date-time with RFC 3339 formatting.",
+       "format": "date-time",
+       "location": "query"
+      },
+      "fetchBodies": {
+       "type": "boolean",
+       "description": "Whether the body content of posts is included (default: true). This should be set to false when the post bodies are not required, to help minimize traffic.",
+       "default": "true",
+       "location": "query"
+      },
+      "fetchImages": {
+       "type": "boolean",
+       "description": "Whether image URL metadata for each post is included.",
+       "location": "query"
+      },
+      "labels": {
+       "type": "string",
+       "description": "Comma-separated list of labels to search for.",
+       "location": "query"
+      },
+      "maxResults": {
+       "type": "integer",
+       "description": "Maximum number of posts to fetch.",
+       "format": "uint32",
+       "location": "query"
+      },
+      "orderBy": {
+       "type": "string",
+       "description": "Sort search results",
+       "default": "PUBLISHED",
+       "enum": [
+        "published",
+        "updated"
+       ],
+       "enumDescriptions": [
+        "Order by the date the post was published",
+        "Order by the date the post was last updated"
+       ],
+       "location": "query"
+      },
+      "pageToken": {
+       "type": "string",
+       "description": "Continuation token if the request is paged.",
+       "location": "query"
+      },
+      "startDate": {
+       "type": "string",
+       "description": "Earliest post date to fetch, a date-time with RFC 3339 formatting.",
+       "format": "date-time",
+       "location": "query"
+      },
+      "statuses": {
+       "type": "string",
+       "enum": [
+        "draft",
+        "live",
+        "scheduled"
+       ],
+       "enumDescriptions": [
+        "Draft posts",
+        "Published posts",
+        "Posts that are scheduled to publish in future."
+       ],
+       "repeated": true,
+       "location": "query"
+      },
+      "view": {
+       "type": "string",
+       "enum": [
+        "ADMIN",
+        "AUTHOR",
+        "READER"
+       ],
+       "enumDescriptions": [
+        "Admin level detail",
+        "Author level detail",
+        "Reader level detail"
+       ],
+       "location": "query"
+      }
+     },
+     "parameterOrder": [
+      "blogId"
+     ],
+     "response": {
+      "$ref": "PostList"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger",
+      "https://www.googleapis.com/auth/blogger.readonly"
+     ]
+    },
+    "patch": {
+     "id": "blogger.posts.patch",
+     "path": "blogs/{blogId}/posts/{postId}",
+     "httpMethod": "PATCH",
+     "description": "Update a post. This method supports patch semantics.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "The ID of the Blog.",
+       "required": true,
+       "location": "path"
+      },
+      "postId": {
+       "type": "string",
+       "description": "The ID of the Post.",
+       "required": true,
+       "location": "path"
+      }
+     },
+     "parameterOrder": [
+      "blogId",
+      "postId"
+     ],
+     "request": {
+      "$ref": "Post"
+     },
+     "response": {
+      "$ref": "Post"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger"
+     ]
+    },
+    "publish": {
+     "id": "blogger.posts.publish",
+     "path": "blogs/{blogId}/posts/{postId}/publish",
+     "httpMethod": "POST",
+     "description": "Publish a draft post.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "The ID of the Blog.",
+       "required": true,
+       "location": "path"
+      },
+      "postId": {
+       "type": "string",
+       "description": "The ID of the Post.",
+       "required": true,
+       "location": "path"
+      },
+      "publishDate": {
+       "type": "string",
+       "description": "The date and time to schedule the publishing of the Blog.",
+       "format": "date-time",
+       "location": "query"
+      }
+     },
+     "parameterOrder": [
+      "blogId",
+      "postId"
+     ],
+     "response": {
+      "$ref": "Post"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger"
+     ]
+    },
+    "revert": {
+     "id": "blogger.posts.revert",
+     "path": "blogs/{blogId}/posts/{postId}/revert",
+     "httpMethod": "POST",
+     "description": "Revert a published or scheduled post to draft state.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "The ID of the Blog.",
+       "required": true,
+       "location": "path"
+      },
+      "postId": {
+       "type": "string",
+       "description": "The ID of the Post.",
+       "required": true,
+       "location": "path"
+      }
+     },
+     "parameterOrder": [
+      "blogId",
+      "postId"
+     ],
+     "response": {
+      "$ref": "Post"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger"
+     ]
+    },
+    "search": {
+     "id": "blogger.posts.search",
+     "path": "blogs/{blogId}/posts/search",
+     "httpMethod": "GET",
+     "description": "Search for a post.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "ID of the blog to fetch the post from.",
+       "required": true,
+       "location": "path"
+      },
+      "fetchBodies": {
+       "type": "boolean",
+       "description": "Whether the body content of posts is included (default: true). This should be set to false when the post bodies are not required, to help minimize traffic.",
+       "default": "true",
+       "location": "query"
+      },
+      "orderBy": {
+       "type": "string",
+       "description": "Sort search results",
+       "default": "PUBLISHED",
+       "enum": [
+        "published",
+        "updated"
+       ],
+       "enumDescriptions": [
+        "Order by the date the post was published",
+        "Order by the date the post was last updated"
+       ],
+       "location": "query"
+      },
+      "q": {
+       "type": "string",
+       "description": "Query terms to search this blog for matching posts.",
+       "required": true,
+       "location": "query"
+      }
+     },
+     "parameterOrder": [
+      "blogId",
+      "q"
+     ],
+     "response": {
+      "$ref": "PostList"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger",
+      "https://www.googleapis.com/auth/blogger.readonly"
+     ]
+    },
+    "update": {
+     "id": "blogger.posts.update",
+     "path": "blogs/{blogId}/posts/{postId}",
+     "httpMethod": "PUT",
+     "description": "Update a post.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "The ID of the Blog.",
+       "required": true,
+       "location": "path"
+      },
+      "postId": {
+       "type": "string",
+       "description": "The ID of the Post.",
+       "required": true,
+       "location": "path"
+      }
+     },
+     "parameterOrder": [
+      "blogId",
+      "postId"
+     ],
+     "request": {
+      "$ref": "Post"
+     },
+     "response": {
+      "$ref": "Post"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger"
+     ]
+    }
+   }
+  },
+  "users": {
+   "methods": {
+    "get": {
+     "id": "blogger.users.get",
+     "path": "users/{userId}",
+     "httpMethod": "GET",
+     "description": "Gets one user by id.",
+     "parameters": {
+      "userId": {
+       "type": "string",
+       "description": "The ID of the user to get.",
+       "required": true,
+       "location": "path"
+      }
+     },
+     "parameterOrder": [
+      "userId"
+     ],
+     "response": {
+      "$ref": "User"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger",
+      "https://www.googleapis.com/auth/blogger.readonly"
+     ]
+    }
+   }
+  }
+ }
+}
diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/blogger-3.want b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/blogger-3.want
new file mode 100644
index 00000000..70803321
--- /dev/null
+++ b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/blogger-3.want
@@ -0,0 +1,4231 @@
+// Package blogger provides access to the Blogger API.
+//
+// See https://developers.google.com/blogger/docs/3.0/getting_started
+//
+// Usage example:
+//
+//   import "google.golang.org/api/blogger/v3"
+//   ...
+//   bloggerService, err := blogger.New(oauthHttpClient)
+package blogger
+
+import (
+	"bytes"
+	"google.golang.org/api/googleapi"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"strconv"
+	"strings"
+)
+
+// Always reference these packages, just in case the auto-generated code
+// below doesn't.
+var _ = bytes.NewBuffer
+var _ = strconv.Itoa
+var _ = fmt.Sprintf
+var _ = json.NewDecoder
+var _ = io.Copy
+var _ = url.Parse
+var _ = googleapi.Version
+var _ = errors.New
+var _ = strings.Replace
+
+const apiId = "blogger:v3"
+const apiName = "blogger"
+const apiVersion = "v3"
+const basePath = "https://www.googleapis.com/blogger/v3/"
+
+// OAuth2 scopes used by this API.
+const (
+	// Manage your Blogger account
+	BloggerScope = "https://www.googleapis.com/auth/blogger"
+
+	// View your Blogger account
+	BloggerReadonlyScope = "https://www.googleapis.com/auth/blogger.readonly"
+)
+
+func New(client *http.Client) (*Service, error) {
+	if client == nil {
+		return nil, errors.New("client is nil")
+	}
+	s := &Service{client: client, BasePath: basePath}
+	s.BlogUserInfos = NewBlogUserInfosService(s)
+	s.Blogs = NewBlogsService(s)
+	s.Comments = NewCommentsService(s)
+	s.PageViews = NewPageViewsService(s)
+	s.Pages = NewPagesService(s)
+	s.PostUserInfos = NewPostUserInfosService(s)
+	s.Posts = NewPostsService(s)
+	s.Users = NewUsersService(s)
+	return s, nil
+}
+
+type Service struct {
+	client   *http.Client
+	BasePath string // API endpoint base URL
+
+	BlogUserInfos *BlogUserInfosService
+
+	Blogs *BlogsService
+
+	Comments *CommentsService
+
+	PageViews *PageViewsService
+
+	Pages *PagesService
+
+	PostUserInfos *PostUserInfosService
+
+	Posts *PostsService
+
+	Users *UsersService
+}
+
+func NewBlogUserInfosService(s *Service) *BlogUserInfosService {
+	rs := &BlogUserInfosService{s: s}
+	return rs
+}
+
+type BlogUserInfosService struct {
+	s *Service
+}
+
+func NewBlogsService(s *Service) *BlogsService {
+	rs := &BlogsService{s: s}
+	return rs
+}
+
+type BlogsService struct {
+	s *Service
+}
+
+func NewCommentsService(s *Service) *CommentsService {
+	rs := &CommentsService{s: s}
+	return rs
+}
+
+type CommentsService struct {
+	s *Service
+}
+
+func NewPageViewsService(s *Service) *PageViewsService {
+	rs := &PageViewsService{s: s}
+	return rs
+}
+
+type PageViewsService struct {
+	s *Service
+}
+
+func NewPagesService(s *Service) *PagesService {
+	rs := &PagesService{s: s}
+	return rs
+}
+
+type PagesService struct {
+	s *Service
+}
+
+func NewPostUserInfosService(s *Service) *PostUserInfosService {
+	rs := &PostUserInfosService{s: s}
+	return rs
+}
+
+type PostUserInfosService struct {
+	s *Service
+}
+
+func NewPostsService(s *Service) *PostsService {
+	rs := &PostsService{s: s}
+	return rs
+}
+
+type PostsService struct {
+	s *Service
+}
+
+func NewUsersService(s *Service) *UsersService {
+	rs := &UsersService{s: s}
+	return rs
+}
+
+type UsersService struct {
+	s *Service
+}
+
+type Blog struct {
+	// CustomMetaData: The JSON custom meta-data for the Blog
+	CustomMetaData string `json:"customMetaData,omitempty"`
+
+	// Description: The description of this blog. This is displayed
+	// underneath the title.
+	Description string `json:"description,omitempty"`
+
+	// Id: The identifier for this resource.
+	Id string `json:"id,omitempty"`
+
+	// Kind: The kind of this entry. Always blogger#blog
+	Kind string `json:"kind,omitempty"`
+
+	// Locale: The locale this Blog is set to.
+	Locale *BlogLocale `json:"locale,omitempty"`
+
+	// Name: The name of this blog. This is displayed as the title.
+	Name string `json:"name,omitempty"`
+
+	// Pages: The container of pages in this blog.
+	Pages *BlogPages `json:"pages,omitempty"`
+
+	// Posts: The container of posts in this blog.
+	Posts *BlogPosts `json:"posts,omitempty"`
+
+	// Published: RFC 3339 date-time when this blog was published.
+	Published string `json:"published,omitempty"`
+
+	// SelfLink: The API REST URL to fetch this resource from.
+	SelfLink string `json:"selfLink,omitempty"`
+
+	// Updated: RFC 3339 date-time when this blog was last updated.
+	Updated string `json:"updated,omitempty"`
+
+	// Url: The URL where this blog is published.
+	Url string `json:"url,omitempty"`
+}
+
+type BlogLocale struct {
+	// Country: The country this blog's locale is set to.
+	Country string `json:"country,omitempty"`
+
+	// Language: The language this blog is authored in.
+	Language string `json:"language,omitempty"`
+
+	// Variant: The language variant this blog is authored in.
+	Variant string `json:"variant,omitempty"`
+}
+
+type BlogPages struct {
+	// SelfLink: The URL of the container for pages in this blog.
+	SelfLink string `json:"selfLink,omitempty"`
+
+	// TotalItems: The count of pages in this blog.
+	TotalItems int64 `json:"totalItems,omitempty"`
+}
+
+type BlogPosts struct {
+	// Items: The List of Posts for this Blog.
+	Items []*Post `json:"items,omitempty"`
+
+	// SelfLink: The URL of the container for posts in this blog.
+	SelfLink string `json:"selfLink,omitempty"`
+
+	// TotalItems: The count of posts in this blog.
+	TotalItems int64 `json:"totalItems,omitempty"`
+}
+
+type BlogList struct {
+	// BlogUserInfos: Admin level list of blog per-user information
+	BlogUserInfos []*BlogUserInfo `json:"blogUserInfos,omitempty"`
+
+	// Items: The list of Blogs this user has Authorship or Admin rights
+	// over.
+	Items []*Blog `json:"items,omitempty"`
+
+	// Kind: The kind of this entity. Always blogger#blogList
+	Kind string `json:"kind,omitempty"`
+}
+
+type BlogPerUserInfo struct {
+	// BlogId: ID of the Blog resource
+	BlogId string `json:"blogId,omitempty"`
+
+	// HasAdminAccess: True if the user has Admin level access to the blog.
+	HasAdminAccess bool `json:"hasAdminAccess,omitempty"`
+
+	// Kind: The kind of this entity. Always blogger#blogPerUserInfo
+	Kind string `json:"kind,omitempty"`
+
+	// PhotosAlbumKey: The Photo Album Key for the user when adding photos
+	// to the blog
+	PhotosAlbumKey string `json:"photosAlbumKey,omitempty"`
+
+	// UserId: ID of the User
+	UserId string `json:"userId,omitempty"`
+}
+
+type BlogUserInfo struct {
+	// Blog: The Blog resource.
+	Blog *Blog `json:"blog,omitempty"`
+
+	// Blog_user_info: Information about a User for the Blog.
+	Blog_user_info *BlogPerUserInfo `json:"blog_user_info,omitempty"`
+
+	// Kind: The kind of this entity. Always blogger#blogUserInfo
+	Kind string `json:"kind,omitempty"`
+}
+
+type Comment struct {
+	// Author: The author of this Comment.
+	Author *CommentAuthor `json:"author,omitempty"`
+
+	// Blog: Data about the blog containing this comment.
+	Blog *CommentBlog `json:"blog,omitempty"`
+
+	// Content: The actual content of the comment. May include HTML markup.
+	Content string `json:"content,omitempty"`
+
+	// Id: The identifier for this resource.
+	Id string `json:"id,omitempty"`
+
+	// InReplyTo: Data about the comment this is in reply to.
+	InReplyTo *CommentInReplyTo `json:"inReplyTo,omitempty"`
+
+	// Kind: The kind of this entry. Always blogger#comment
+	Kind string `json:"kind,omitempty"`
+
+	// Post: Data about the post containing this comment.
+	Post *CommentPost `json:"post,omitempty"`
+
+	// Published: RFC 3339 date-time when this comment was published.
+	Published string `json:"published,omitempty"`
+
+	// SelfLink: The API REST URL to fetch this resource from.
+	SelfLink string `json:"selfLink,omitempty"`
+
+	// Status: The status of the comment (only populated for admin users)
+	Status string `json:"status,omitempty"`
+
+	// Updated: RFC 3339 date-time when this comment was last updated.
+	Updated string `json:"updated,omitempty"`
+}
+
+type CommentAuthor struct {
+	// DisplayName: The display name.
+	DisplayName string `json:"displayName,omitempty"`
+
+	// Id: The identifier of the Comment creator.
+	Id string `json:"id,omitempty"`
+
+	// Image: The comment creator's avatar.
+	Image *CommentAuthorImage `json:"image,omitempty"`
+
+	// Url: The URL of the Comment creator's Profile page.
+	Url string `json:"url,omitempty"`
+}
+
+type CommentAuthorImage struct {
+	// Url: The comment creator's avatar URL.
+	Url string `json:"url,omitempty"`
+}
+
+type CommentBlog struct {
+	// Id: The identifier of the blog containing this comment.
+	Id string `json:"id,omitempty"`
+}
+
+type CommentInReplyTo struct {
+	// Id: The identified of the parent of this comment.
+	Id string `json:"id,omitempty"`
+}
+
+type CommentPost struct {
+	// Id: The identifier of the post containing this comment.
+	Id string `json:"id,omitempty"`
+}
+
+type CommentList struct {
+	// Items: The List of Comments for a Post.
+	Items []*Comment `json:"items,omitempty"`
+
+	// Kind: The kind of this entry. Always blogger#commentList
+	Kind string `json:"kind,omitempty"`
+
+	// NextPageToken: Pagination token to fetch the next page, if one
+	// exists.
+	NextPageToken string `json:"nextPageToken,omitempty"`
+
+	// PrevPageToken: Pagination token to fetch the previous page, if one
+	// exists.
+	PrevPageToken string `json:"prevPageToken,omitempty"`
+}
+
+type Page struct {
+	// Author: The author of this Page.
+	Author *PageAuthor `json:"author,omitempty"`
+
+	// Blog: Data about the blog containing this Page.
+	Blog *PageBlog `json:"blog,omitempty"`
+
+	// Content: The body content of this Page, in HTML.
+	Content string `json:"content,omitempty"`
+
+	// Id: The identifier for this resource.
+	Id string `json:"id,omitempty"`
+
+	// Kind: The kind of this entity. Always blogger#page
+	Kind string `json:"kind,omitempty"`
+
+	// Published: RFC 3339 date-time when this Page was published.
+	Published string `json:"published,omitempty"`
+
+	// SelfLink: The API REST URL to fetch this resource from.
+	SelfLink string `json:"selfLink,omitempty"`
+
+	// Status: The status of the page for admin resources (either LIVE or
+	// DRAFT).
+	Status string `json:"status,omitempty"`
+
+	// Title: The title of this entity. This is the name displayed in the
+	// Admin user interface.
+	Title string `json:"title,omitempty"`
+
+	// Updated: RFC 3339 date-time when this Page was last updated.
+	Updated string `json:"updated,omitempty"`
+
+	// Url: The URL that this Page is displayed at.
+	Url string `json:"url,omitempty"`
+}
+
+type PageAuthor struct {
+	// DisplayName: The display name.
+	DisplayName string `json:"displayName,omitempty"`
+
+	// Id: The identifier of the Page creator.
+	Id string `json:"id,omitempty"`
+
+	// Image: The page author's avatar.
+	Image *PageAuthorImage `json:"image,omitempty"`
+
+	// Url: The URL of the Page creator's Profile page.
+	Url string `json:"url,omitempty"`
+}
+
+type PageAuthorImage struct {
+	// Url: The page author's avatar URL.
+	Url string `json:"url,omitempty"`
+}
+
+type PageBlog struct {
+	// Id: The identifier of the blog containing this page.
+	Id string `json:"id,omitempty"`
+}
+
+type PageList struct {
+	// Items: The list of Pages for a Blog.
+	Items []*Page `json:"items,omitempty"`
+
+	// Kind: The kind of this entity. Always blogger#pageList
+	Kind string `json:"kind,omitempty"`
+}
+
+type Pageviews struct {
+	// BlogId: Blog Id
+	BlogId int64 `json:"blogId,omitempty,string"`
+
+	// Counts: The container of posts in this blog.
+	Counts []*PageviewsCounts `json:"counts,omitempty"`
+
+	// Kind: The kind of this entry. Always blogger#page_views
+	Kind string `json:"kind,omitempty"`
+}
+
+type PageviewsCounts struct {
+	// Count: Count of page views for the given time range
+	Count int64 `json:"count,omitempty,string"`
+
+	// TimeRange: Time range the given count applies to
+	TimeRange string `json:"timeRange,omitempty"`
+}
+
+type Post struct {
+	// Author: The author of this Post.
+	Author *PostAuthor `json:"author,omitempty"`
+
+	// Blog: Data about the blog containing this Post.
+	Blog *PostBlog `json:"blog,omitempty"`
+
+	// Content: The content of the Post. May contain HTML markup.
+	Content string `json:"content,omitempty"`
+
+	// CustomMetaData: The JSON meta-data for the Post.
+	CustomMetaData string `json:"customMetaData,omitempty"`
+
+	// Id: The identifier of this Post.
+	Id string `json:"id,omitempty"`
+
+	// Images: Display image for the Post.
+	Images []*PostImages `json:"images,omitempty"`
+
+	// Kind: The kind of this entity. Always blogger#post
+	Kind string `json:"kind,omitempty"`
+
+	// Labels: The list of labels this Post was tagged with.
+	Labels []string `json:"labels,omitempty"`
+
+	// Location: The location for geotagged posts.
+	Location *PostLocation `json:"location,omitempty"`
+
+	// Published: RFC 3339 date-time when this Post was published.
+	Published string `json:"published,omitempty"`
+
+	// Replies: The container of comments on this Post.
+	Replies *PostReplies `json:"replies,omitempty"`
+
+	// SelfLink: The API REST URL to fetch this resource from.
+	SelfLink string `json:"selfLink,omitempty"`
+
+	// Status: Status of the post. Only set for admin-level requests
+	Status string `json:"status,omitempty"`
+
+	// Title: The title of the Post.
+	Title string `json:"title,omitempty"`
+
+	// TitleLink: The title link URL, similar to atom's related link.
+	TitleLink string `json:"titleLink,omitempty"`
+
+	// Updated: RFC 3339 date-time when this Post was last updated.
+	Updated string `json:"updated,omitempty"`
+
+	// Url: The URL where this Post is displayed.
+	Url string `json:"url,omitempty"`
+}
+
+type PostAuthor struct {
+	// DisplayName: The display name.
+	DisplayName string `json:"displayName,omitempty"`
+
+	// Id: The identifier of the Post creator.
+	Id string `json:"id,omitempty"`
+
+	// Image: The Post author's avatar.
+	Image *PostAuthorImage `json:"image,omitempty"`
+
+	// Url: The URL of the Post creator's Profile page.
+	Url string `json:"url,omitempty"`
+}
+
+type PostAuthorImage struct {
+	// Url: The Post author's avatar URL.
+	Url string `json:"url,omitempty"`
+}
+
+type PostBlog struct {
+	// Id: The identifier of the Blog that contains this Post.
+	Id string `json:"id,omitempty"`
+}
+
+type PostImages struct {
+	Url string `json:"url,omitempty"`
+}
+
+type PostLocation struct {
+	// Lat: Location's latitude.
+	Lat float64 `json:"lat,omitempty"`
+
+	// Lng: Location's longitude.
+	Lng float64 `json:"lng,omitempty"`
+
+	// Name: Location name.
+	Name string `json:"name,omitempty"`
+
+	// Span: Location's viewport span. Can be used when rendering a map
+	// preview.
+	Span string `json:"span,omitempty"`
+}
+
+type PostReplies struct {
+	// Items: The List of Comments for this Post.
+	Items []*Comment `json:"items,omitempty"`
+
+	// SelfLink: The URL of the comments on this post.
+	SelfLink string `json:"selfLink,omitempty"`
+
+	// TotalItems: The count of comments on this post.
+	TotalItems int64 `json:"totalItems,omitempty,string"`
+}
+
+type PostList struct {
+	// Items: The list of Posts for this Blog.
+	Items []*Post `json:"items,omitempty"`
+
+	// Kind: The kind of this entity. Always blogger#postList
+	Kind string `json:"kind,omitempty"`
+
+	// NextPageToken: Pagination token to fetch the next page, if one
+	// exists.
+	NextPageToken string `json:"nextPageToken,omitempty"`
+}
+
+type PostPerUserInfo struct {
+	// BlogId: ID of the Blog that the post resource belongs to.
+	BlogId string `json:"blogId,omitempty"`
+
+	// HasEditAccess: True if the user has Author level access to the post.
+	HasEditAccess bool `json:"hasEditAccess,omitempty"`
+
+	// Kind: The kind of this entity. Always blogger#postPerUserInfo
+	Kind string `json:"kind,omitempty"`
+
+	// PostId: ID of the Post resource.
+	PostId string `json:"postId,omitempty"`
+
+	// UserId: ID of the User.
+	UserId string `json:"userId,omitempty"`
+}
+
+type PostUserInfo struct {
+	// Kind: The kind of this entity. Always blogger#postUserInfo
+	Kind string `json:"kind,omitempty"`
+
+	// Post: The Post resource.
+	Post *Post `json:"post,omitempty"`
+
+	// Post_user_info: Information about a User for the Post.
+	Post_user_info *PostPerUserInfo `json:"post_user_info,omitempty"`
+}
+
+type PostUserInfosList struct {
+	// Items: The list of Posts with User information for the post, for this
+	// Blog.
+	Items []*PostUserInfo `json:"items,omitempty"`
+
+	// Kind: The kind of this entity. Always blogger#postList
+	Kind string `json:"kind,omitempty"`
+
+	// NextPageToken: Pagination token to fetch the next page, if one
+	// exists.
+	NextPageToken string `json:"nextPageToken,omitempty"`
+}
+
+type User struct {
+	// About: Profile summary information.
+	About string `json:"about,omitempty"`
+
+	// Blogs: The container of blogs for this user.
+	Blogs *UserBlogs `json:"blogs,omitempty"`
+
+	// Created: The timestamp of when this profile was created, in seconds
+	// since epoch.
+	Created string `json:"created,omitempty"`
+
+	// DisplayName: The display name.
+	DisplayName string `json:"displayName,omitempty"`
+
+	// Id: The identifier for this User.
+	Id string `json:"id,omitempty"`
+
+	// Kind: The kind of this entity. Always blogger#user
+	Kind string `json:"kind,omitempty"`
+
+	// Locale: This user's locale
+	Locale *UserLocale `json:"locale,omitempty"`
+
+	// SelfLink: The API REST URL to fetch this resource from.
+	SelfLink string `json:"selfLink,omitempty"`
+
+	// Url: The user's profile page.
+	Url string `json:"url,omitempty"`
+}
+
+type UserBlogs struct {
+	// SelfLink: The URL of the Blogs for this user.
+	SelfLink string `json:"selfLink,omitempty"`
+}
+
+type UserLocale struct {
+	// Country: The user's country setting.
+	Country string `json:"country,omitempty"`
+
+	// Language: The user's language setting.
+	Language string `json:"language,omitempty"`
+
+	// Variant: The user's language variant setting.
+	Variant string `json:"variant,omitempty"`
+}
+
+// method id "blogger.blogUserInfos.get":
+
+type BlogUserInfosGetCall struct {
+	s      *Service
+	userId string
+	blogId string
+	opt_   map[string]interface{}
+}
+
+// Get: Gets one blog and user info pair by blogId and userId.
+func (r *BlogUserInfosService) Get(userId string, blogId string) *BlogUserInfosGetCall {
+	c := &BlogUserInfosGetCall{s: r.s, opt_: make(map[string]interface{})}
+	c.userId = userId
+	c.blogId = blogId
+	return c
+}
+
+// MaxPosts sets the optional parameter "maxPosts": Maximum number of
+// posts to pull back with the blog.
+func (c *BlogUserInfosGetCall) MaxPosts(maxPosts int64) *BlogUserInfosGetCall {
+	c.opt_["maxPosts"] = maxPosts
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *BlogUserInfosGetCall) Fields(s ...googleapi.Field) *BlogUserInfosGetCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *BlogUserInfosGetCall) Do() (*BlogUserInfo, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["maxPosts"]; ok {
+		params.Set("maxPosts", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "users/{userId}/blogs/{blogId}")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"userId": c.userId,
+		"blogId": c.blogId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *BlogUserInfo
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Gets one blog and user info pair by blogId and userId.",
+	//   "httpMethod": "GET",
+	//   "id": "blogger.blogUserInfos.get",
+	//   "parameterOrder": [
+	//     "userId",
+	//     "blogId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "The ID of the blog to get.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "maxPosts": {
+	//       "description": "Maximum number of posts to pull back with the blog.",
+	//       "format": "uint32",
+	//       "location": "query",
+	//       "type": "integer"
+	//     },
+	//     "userId": {
+	//       "description": "ID of the user whose blogs are to be fetched. Either the word 'self' (sans quote marks) or the user's profile identifier.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "users/{userId}/blogs/{blogId}",
+	//   "response": {
+	//     "$ref": "BlogUserInfo"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger",
+	//     "https://www.googleapis.com/auth/blogger.readonly"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.blogs.get":
+
+type BlogsGetCall struct {
+	s      *Service
+	blogId string
+	opt_   map[string]interface{}
+}
+
+// Get: Gets one blog by id.
+func (r *BlogsService) Get(blogId string) *BlogsGetCall {
+	c := &BlogsGetCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	return c
+}
+
+// MaxPosts sets the optional parameter "maxPosts": Maximum number of
+// posts to pull back with the blog.
+func (c *BlogsGetCall) MaxPosts(maxPosts int64) *BlogsGetCall {
+	c.opt_["maxPosts"] = maxPosts
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *BlogsGetCall) Fields(s ...googleapi.Field) *BlogsGetCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *BlogsGetCall) Do() (*Blog, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["maxPosts"]; ok {
+		params.Set("maxPosts", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *Blog
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Gets one blog by id.",
+	//   "httpMethod": "GET",
+	//   "id": "blogger.blogs.get",
+	//   "parameterOrder": [
+	//     "blogId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "The ID of the blog to get.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "maxPosts": {
+	//       "description": "Maximum number of posts to pull back with the blog.",
+	//       "format": "uint32",
+	//       "location": "query",
+	//       "type": "integer"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}",
+	//   "response": {
+	//     "$ref": "Blog"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger",
+	//     "https://www.googleapis.com/auth/blogger.readonly"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.blogs.getByUrl":
+
+type BlogsGetByUrlCall struct {
+	s    *Service
+	url  string
+	opt_ map[string]interface{}
+}
+
+// GetByUrl: Retrieve a Blog by URL.
+func (r *BlogsService) GetByUrl(url string) *BlogsGetByUrlCall {
+	c := &BlogsGetByUrlCall{s: r.s, opt_: make(map[string]interface{})}
+	c.url = url
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *BlogsGetByUrlCall) Fields(s ...googleapi.Field) *BlogsGetByUrlCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *BlogsGetByUrlCall) Do() (*Blog, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	params.Set("url", fmt.Sprintf("%v", c.url))
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/byurl")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.SetOpaque(req.URL)
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *Blog
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Retrieve a Blog by URL.",
+	//   "httpMethod": "GET",
+	//   "id": "blogger.blogs.getByUrl",
+	//   "parameterOrder": [
+	//     "url"
+	//   ],
+	//   "parameters": {
+	//     "url": {
+	//       "description": "The URL of the blog to retrieve.",
+	//       "location": "query",
+	//       "required": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/byurl",
+	//   "response": {
+	//     "$ref": "Blog"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger",
+	//     "https://www.googleapis.com/auth/blogger.readonly"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.blogs.listByUser":
+
+type BlogsListByUserCall struct {
+	s      *Service
+	userId string
+	opt_   map[string]interface{}
+}
+
+// ListByUser: Retrieves a list of blogs, possibly filtered.
+func (r *BlogsService) ListByUser(userId string) *BlogsListByUserCall {
+	c := &BlogsListByUserCall{s: r.s, opt_: make(map[string]interface{})}
+	c.userId = userId
+	return c
+}
+
+// FetchUserInfo sets the optional parameter "fetchUserInfo": Whether
+// the response is a list of blogs with per-user information instead of
+// just blogs.
+func (c *BlogsListByUserCall) FetchUserInfo(fetchUserInfo bool) *BlogsListByUserCall {
+	c.opt_["fetchUserInfo"] = fetchUserInfo
+	return c
+}
+
+// View sets the optional parameter "view":
+func (c *BlogsListByUserCall) View(view string) *BlogsListByUserCall {
+	c.opt_["view"] = view
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *BlogsListByUserCall) Fields(s ...googleapi.Field) *BlogsListByUserCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *BlogsListByUserCall) Do() (*BlogList, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fetchUserInfo"]; ok {
+		params.Set("fetchUserInfo", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["view"]; ok {
+		params.Set("view", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "users/{userId}/blogs")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"userId": c.userId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *BlogList
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Retrieves a list of blogs, possibly filtered.",
+	//   "httpMethod": "GET",
+	//   "id": "blogger.blogs.listByUser",
+	//   "parameterOrder": [
+	//     "userId"
+	//   ],
+	//   "parameters": {
+	//     "fetchUserInfo": {
+	//       "description": "Whether the response is a list of blogs with per-user information instead of just blogs.",
+	//       "location": "query",
+	//       "type": "boolean"
+	//     },
+	//     "userId": {
+	//       "description": "ID of the user whose blogs are to be fetched. Either the word 'self' (sans quote marks) or the user's profile identifier.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "view": {
+	//       "enum": [
+	//         "ADMIN",
+	//         "AUTHOR",
+	//         "READER"
+	//       ],
+	//       "enumDescriptions": [
+	//         "Admin level detail",
+	//         "Author level detail",
+	//         "Admin level detail"
+	//       ],
+	//       "location": "query",
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "users/{userId}/blogs",
+	//   "response": {
+	//     "$ref": "BlogList"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger",
+	//     "https://www.googleapis.com/auth/blogger.readonly"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.comments.approve":
+
+type CommentsApproveCall struct {
+	s         *Service
+	blogId    string
+	postId    string
+	commentId string
+	opt_      map[string]interface{}
+}
+
+// Approve: Marks a comment as not spam.
+func (r *CommentsService) Approve(blogId string, postId string, commentId string) *CommentsApproveCall {
+	c := &CommentsApproveCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.postId = postId
+	c.commentId = commentId
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *CommentsApproveCall) Fields(s ...googleapi.Field) *CommentsApproveCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *CommentsApproveCall) Do() (*Comment, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/posts/{postId}/comments/{commentId}/approve")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("POST", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId":    c.blogId,
+		"postId":    c.postId,
+		"commentId": c.commentId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *Comment
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Marks a comment as not spam.",
+	//   "httpMethod": "POST",
+	//   "id": "blogger.comments.approve",
+	//   "parameterOrder": [
+	//     "blogId",
+	//     "postId",
+	//     "commentId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "The Id of the Blog.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "commentId": {
+	//       "description": "The ID of the comment to mark as not spam.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "postId": {
+	//       "description": "The ID of the Post.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/posts/{postId}/comments/{commentId}/approve",
+	//   "response": {
+	//     "$ref": "Comment"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.comments.delete":
+
+type CommentsDeleteCall struct {
+	s         *Service
+	blogId    string
+	postId    string
+	commentId string
+	opt_      map[string]interface{}
+}
+
+// Delete: Delete a comment by id.
+func (r *CommentsService) Delete(blogId string, postId string, commentId string) *CommentsDeleteCall {
+	c := &CommentsDeleteCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.postId = postId
+	c.commentId = commentId
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *CommentsDeleteCall) Fields(s ...googleapi.Field) *CommentsDeleteCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *CommentsDeleteCall) Do() error {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/posts/{postId}/comments/{commentId}")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("DELETE", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId":    c.blogId,
+		"postId":    c.postId,
+		"commentId": c.commentId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return err
+	}
+	return nil
+	// {
+	//   "description": "Delete a comment by id.",
+	//   "httpMethod": "DELETE",
+	//   "id": "blogger.comments.delete",
+	//   "parameterOrder": [
+	//     "blogId",
+	//     "postId",
+	//     "commentId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "The Id of the Blog.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "commentId": {
+	//       "description": "The ID of the comment to delete.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "postId": {
+	//       "description": "The ID of the Post.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/posts/{postId}/comments/{commentId}",
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.comments.get":
+
+type CommentsGetCall struct {
+	s         *Service
+	blogId    string
+	postId    string
+	commentId string
+	opt_      map[string]interface{}
+}
+
+// Get: Gets one comment by id.
+func (r *CommentsService) Get(blogId string, postId string, commentId string) *CommentsGetCall {
+	c := &CommentsGetCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.postId = postId
+	c.commentId = commentId
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *CommentsGetCall) Fields(s ...googleapi.Field) *CommentsGetCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *CommentsGetCall) Do() (*Comment, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/posts/{postId}/comments/{commentId}")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId":    c.blogId,
+		"postId":    c.postId,
+		"commentId": c.commentId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *Comment
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Gets one comment by id.",
+	//   "httpMethod": "GET",
+	//   "id": "blogger.comments.get",
+	//   "parameterOrder": [
+	//     "blogId",
+	//     "postId",
+	//     "commentId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "ID of the blog to containing the comment.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "commentId": {
+	//       "description": "The ID of the comment to get.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "postId": {
+	//       "description": "ID of the post to fetch posts from.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/posts/{postId}/comments/{commentId}",
+	//   "response": {
+	//     "$ref": "Comment"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger",
+	//     "https://www.googleapis.com/auth/blogger.readonly"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.comments.list":
+
+type CommentsListCall struct {
+	s      *Service
+	blogId string
+	postId string
+	opt_   map[string]interface{}
+}
+
+// List: Retrieves the comments for a post, possibly filtered.
+func (r *CommentsService) List(blogId string, postId string) *CommentsListCall {
+	c := &CommentsListCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.postId = postId
+	return c
+}
+
+// EndDate sets the optional parameter "endDate": Latest date of comment
+// to fetch, a date-time with RFC 3339 formatting.
+func (c *CommentsListCall) EndDate(endDate string) *CommentsListCall {
+	c.opt_["endDate"] = endDate
+	return c
+}
+
+// FetchBodies sets the optional parameter "fetchBodies": Whether the
+// body content of the comments is included.
+func (c *CommentsListCall) FetchBodies(fetchBodies bool) *CommentsListCall {
+	c.opt_["fetchBodies"] = fetchBodies
+	return c
+}
+
+// MaxResults sets the optional parameter "maxResults": Maximum number
+// of comments to include in the result.
+func (c *CommentsListCall) MaxResults(maxResults int64) *CommentsListCall {
+	c.opt_["maxResults"] = maxResults
+	return c
+}
+
+// PageToken sets the optional parameter "pageToken": Continuation token
+// if request is paged.
+func (c *CommentsListCall) PageToken(pageToken string) *CommentsListCall {
+	c.opt_["pageToken"] = pageToken
+	return c
+}
+
+// StartDate sets the optional parameter "startDate": Earliest date of
+// comment to fetch, a date-time with RFC 3339 formatting.
+func (c *CommentsListCall) StartDate(startDate string) *CommentsListCall {
+	c.opt_["startDate"] = startDate
+	return c
+}
+
+// Statuses sets the optional parameter "statuses":
+func (c *CommentsListCall) Statuses(statuses string) *CommentsListCall {
+	c.opt_["statuses"] = statuses
+	return c
+}
+
+// View sets the optional parameter "view":
+func (c *CommentsListCall) View(view string) *CommentsListCall {
+	c.opt_["view"] = view
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *CommentsListCall) Fields(s ...googleapi.Field) *CommentsListCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *CommentsListCall) Do() (*CommentList, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["endDate"]; ok {
+		params.Set("endDate", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fetchBodies"]; ok {
+		params.Set("fetchBodies", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["maxResults"]; ok {
+		params.Set("maxResults", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["pageToken"]; ok {
+		params.Set("pageToken", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["startDate"]; ok {
+		params.Set("startDate", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["statuses"]; ok {
+		params.Set("statuses", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["view"]; ok {
+		params.Set("view", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/posts/{postId}/comments")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+		"postId": c.postId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *CommentList
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Retrieves the comments for a post, possibly filtered.",
+	//   "httpMethod": "GET",
+	//   "id": "blogger.comments.list",
+	//   "parameterOrder": [
+	//     "blogId",
+	//     "postId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "ID of the blog to fetch comments from.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "endDate": {
+	//       "description": "Latest date of comment to fetch, a date-time with RFC 3339 formatting.",
+	//       "format": "date-time",
+	//       "location": "query",
+	//       "type": "string"
+	//     },
+	//     "fetchBodies": {
+	//       "description": "Whether the body content of the comments is included.",
+	//       "location": "query",
+	//       "type": "boolean"
+	//     },
+	//     "maxResults": {
+	//       "description": "Maximum number of comments to include in the result.",
+	//       "format": "uint32",
+	//       "location": "query",
+	//       "type": "integer"
+	//     },
+	//     "pageToken": {
+	//       "description": "Continuation token if request is paged.",
+	//       "location": "query",
+	//       "type": "string"
+	//     },
+	//     "postId": {
+	//       "description": "ID of the post to fetch posts from.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "startDate": {
+	//       "description": "Earliest date of comment to fetch, a date-time with RFC 3339 formatting.",
+	//       "format": "date-time",
+	//       "location": "query",
+	//       "type": "string"
+	//     },
+	//     "statuses": {
+	//       "enum": [
+	//         "emptied",
+	//         "live",
+	//         "pending",
+	//         "spam"
+	//       ],
+	//       "enumDescriptions": [
+	//         "Comments that have had their content removed",
+	//         "Comments that are publicly visible",
+	//         "Comments that are awaiting administrator approval",
+	//         "Comments marked as spam by the administrator"
+	//       ],
+	//       "location": "query",
+	//       "repeated": true,
+	//       "type": "string"
+	//     },
+	//     "view": {
+	//       "enum": [
+	//         "ADMIN",
+	//         "AUTHOR",
+	//         "READER"
+	//       ],
+	//       "enumDescriptions": [
+	//         "Admin level detail",
+	//         "Author level detail",
+	//         "Admin level detail"
+	//       ],
+	//       "location": "query",
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/posts/{postId}/comments",
+	//   "response": {
+	//     "$ref": "CommentList"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger",
+	//     "https://www.googleapis.com/auth/blogger.readonly"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.comments.listByBlog":
+
+type CommentsListByBlogCall struct {
+	s      *Service
+	blogId string
+	opt_   map[string]interface{}
+}
+
+// ListByBlog: Retrieves the comments for a blog, across all posts,
+// possibly filtered.
+func (r *CommentsService) ListByBlog(blogId string) *CommentsListByBlogCall {
+	c := &CommentsListByBlogCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	return c
+}
+
+// EndDate sets the optional parameter "endDate": Latest date of comment
+// to fetch, a date-time with RFC 3339 formatting.
+func (c *CommentsListByBlogCall) EndDate(endDate string) *CommentsListByBlogCall {
+	c.opt_["endDate"] = endDate
+	return c
+}
+
+// FetchBodies sets the optional parameter "fetchBodies": Whether the
+// body content of the comments is included.
+func (c *CommentsListByBlogCall) FetchBodies(fetchBodies bool) *CommentsListByBlogCall {
+	c.opt_["fetchBodies"] = fetchBodies
+	return c
+}
+
+// MaxResults sets the optional parameter "maxResults": Maximum number
+// of comments to include in the result.
+func (c *CommentsListByBlogCall) MaxResults(maxResults int64) *CommentsListByBlogCall {
+	c.opt_["maxResults"] = maxResults
+	return c
+}
+
+// PageToken sets the optional parameter "pageToken": Continuation token
+// if request is paged.
+func (c *CommentsListByBlogCall) PageToken(pageToken string) *CommentsListByBlogCall {
+	c.opt_["pageToken"] = pageToken
+	return c
+}
+
+// StartDate sets the optional parameter "startDate": Earliest date of
+// comment to fetch, a date-time with RFC 3339 formatting.
+func (c *CommentsListByBlogCall) StartDate(startDate string) *CommentsListByBlogCall {
+	c.opt_["startDate"] = startDate
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *CommentsListByBlogCall) Fields(s ...googleapi.Field) *CommentsListByBlogCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *CommentsListByBlogCall) Do() (*CommentList, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["endDate"]; ok {
+		params.Set("endDate", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fetchBodies"]; ok {
+		params.Set("fetchBodies", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["maxResults"]; ok {
+		params.Set("maxResults", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["pageToken"]; ok {
+		params.Set("pageToken", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["startDate"]; ok {
+		params.Set("startDate", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/comments")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *CommentList
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Retrieves the comments for a blog, across all posts, possibly filtered.",
+	//   "httpMethod": "GET",
+	//   "id": "blogger.comments.listByBlog",
+	//   "parameterOrder": [
+	//     "blogId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "ID of the blog to fetch comments from.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "endDate": {
+	//       "description": "Latest date of comment to fetch, a date-time with RFC 3339 formatting.",
+	//       "format": "date-time",
+	//       "location": "query",
+	//       "type": "string"
+	//     },
+	//     "fetchBodies": {
+	//       "description": "Whether the body content of the comments is included.",
+	//       "location": "query",
+	//       "type": "boolean"
+	//     },
+	//     "maxResults": {
+	//       "description": "Maximum number of comments to include in the result.",
+	//       "format": "uint32",
+	//       "location": "query",
+	//       "type": "integer"
+	//     },
+	//     "pageToken": {
+	//       "description": "Continuation token if request is paged.",
+	//       "location": "query",
+	//       "type": "string"
+	//     },
+	//     "startDate": {
+	//       "description": "Earliest date of comment to fetch, a date-time with RFC 3339 formatting.",
+	//       "format": "date-time",
+	//       "location": "query",
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/comments",
+	//   "response": {
+	//     "$ref": "CommentList"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger",
+	//     "https://www.googleapis.com/auth/blogger.readonly"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.comments.markAsSpam":
+
+type CommentsMarkAsSpamCall struct {
+	s         *Service
+	blogId    string
+	postId    string
+	commentId string
+	opt_      map[string]interface{}
+}
+
+// MarkAsSpam: Marks a comment as spam.
+func (r *CommentsService) MarkAsSpam(blogId string, postId string, commentId string) *CommentsMarkAsSpamCall {
+	c := &CommentsMarkAsSpamCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.postId = postId
+	c.commentId = commentId
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *CommentsMarkAsSpamCall) Fields(s ...googleapi.Field) *CommentsMarkAsSpamCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *CommentsMarkAsSpamCall) Do() (*Comment, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/posts/{postId}/comments/{commentId}/spam")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("POST", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId":    c.blogId,
+		"postId":    c.postId,
+		"commentId": c.commentId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *Comment
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Marks a comment as spam.",
+	//   "httpMethod": "POST",
+	//   "id": "blogger.comments.markAsSpam",
+	//   "parameterOrder": [
+	//     "blogId",
+	//     "postId",
+	//     "commentId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "The Id of the Blog.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "commentId": {
+	//       "description": "The ID of the comment to mark as spam.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "postId": {
+	//       "description": "The ID of the Post.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/posts/{postId}/comments/{commentId}/spam",
+	//   "response": {
+	//     "$ref": "Comment"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.comments.removeContent":
+
+type CommentsRemoveContentCall struct {
+	s         *Service
+	blogId    string
+	postId    string
+	commentId string
+	opt_      map[string]interface{}
+}
+
+// RemoveContent: Removes the content of a comment.
+func (r *CommentsService) RemoveContent(blogId string, postId string, commentId string) *CommentsRemoveContentCall {
+	c := &CommentsRemoveContentCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.postId = postId
+	c.commentId = commentId
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *CommentsRemoveContentCall) Fields(s ...googleapi.Field) *CommentsRemoveContentCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *CommentsRemoveContentCall) Do() (*Comment, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/posts/{postId}/comments/{commentId}/removecontent")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("POST", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId":    c.blogId,
+		"postId":    c.postId,
+		"commentId": c.commentId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *Comment
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Removes the content of a comment.",
+	//   "httpMethod": "POST",
+	//   "id": "blogger.comments.removeContent",
+	//   "parameterOrder": [
+	//     "blogId",
+	//     "postId",
+	//     "commentId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "The Id of the Blog.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "commentId": {
+	//       "description": "The ID of the comment to delete content from.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "postId": {
+	//       "description": "The ID of the Post.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/posts/{postId}/comments/{commentId}/removecontent",
+	//   "response": {
+	//     "$ref": "Comment"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.pageViews.get":
+
+type PageViewsGetCall struct {
+	s      *Service
+	blogId string
+	opt_   map[string]interface{}
+}
+
+// Get: Retrieve pageview stats for a Blog.
+func (r *PageViewsService) Get(blogId string) *PageViewsGetCall {
+	c := &PageViewsGetCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	return c
+}
+
+// Range sets the optional parameter "range":
+func (c *PageViewsGetCall) Range(range_ string) *PageViewsGetCall {
+	c.opt_["range"] = range_
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *PageViewsGetCall) Fields(s ...googleapi.Field) *PageViewsGetCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *PageViewsGetCall) Do() (*Pageviews, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["range"]; ok {
+		params.Set("range", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/pageviews")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *Pageviews
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Retrieve pageview stats for a Blog.",
+	//   "httpMethod": "GET",
+	//   "id": "blogger.pageViews.get",
+	//   "parameterOrder": [
+	//     "blogId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "The ID of the blog to get.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "range": {
+	//       "enum": [
+	//         "30DAYS",
+	//         "7DAYS",
+	//         "all"
+	//       ],
+	//       "enumDescriptions": [
+	//         "Page view counts from the last thirty days.",
+	//         "Page view counts from the last seven days.",
+	//         "Total page view counts from all time."
+	//       ],
+	//       "location": "query",
+	//       "repeated": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/pageviews",
+	//   "response": {
+	//     "$ref": "Pageviews"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.pages.delete":
+
+type PagesDeleteCall struct {
+	s      *Service
+	blogId string
+	pageId string
+	opt_   map[string]interface{}
+}
+
+// Delete: Delete a page by id.
+func (r *PagesService) Delete(blogId string, pageId string) *PagesDeleteCall {
+	c := &PagesDeleteCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.pageId = pageId
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *PagesDeleteCall) Fields(s ...googleapi.Field) *PagesDeleteCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *PagesDeleteCall) Do() error {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/pages/{pageId}")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("DELETE", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+		"pageId": c.pageId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return err
+	}
+	return nil
+	// {
+	//   "description": "Delete a page by id.",
+	//   "httpMethod": "DELETE",
+	//   "id": "blogger.pages.delete",
+	//   "parameterOrder": [
+	//     "blogId",
+	//     "pageId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "The Id of the Blog.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "pageId": {
+	//       "description": "The ID of the Page.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/pages/{pageId}",
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.pages.get":
+
+type PagesGetCall struct {
+	s      *Service
+	blogId string
+	pageId string
+	opt_   map[string]interface{}
+}
+
+// Get: Gets one blog page by id.
+func (r *PagesService) Get(blogId string, pageId string) *PagesGetCall {
+	c := &PagesGetCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.pageId = pageId
+	return c
+}
+
+// View sets the optional parameter "view":
+func (c *PagesGetCall) View(view string) *PagesGetCall {
+	c.opt_["view"] = view
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *PagesGetCall) Fields(s ...googleapi.Field) *PagesGetCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *PagesGetCall) Do() (*Page, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["view"]; ok {
+		params.Set("view", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/pages/{pageId}")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+		"pageId": c.pageId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *Page
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Gets one blog page by id.",
+	//   "httpMethod": "GET",
+	//   "id": "blogger.pages.get",
+	//   "parameterOrder": [
+	//     "blogId",
+	//     "pageId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "ID of the blog containing the page.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "pageId": {
+	//       "description": "The ID of the page to get.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "view": {
+	//       "enum": [
+	//         "ADMIN",
+	//         "AUTHOR",
+	//         "READER"
+	//       ],
+	//       "enumDescriptions": [
+	//         "Admin level detail",
+	//         "Author level detail",
+	//         "Admin level detail"
+	//       ],
+	//       "location": "query",
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/pages/{pageId}",
+	//   "response": {
+	//     "$ref": "Page"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger",
+	//     "https://www.googleapis.com/auth/blogger.readonly"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.pages.insert":
+
+type PagesInsertCall struct {
+	s      *Service
+	blogId string
+	page   *Page
+	opt_   map[string]interface{}
+}
+
+// Insert: Add a page.
+func (r *PagesService) Insert(blogId string, page *Page) *PagesInsertCall {
+	c := &PagesInsertCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.page = page
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *PagesInsertCall) Fields(s ...googleapi.Field) *PagesInsertCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *PagesInsertCall) Do() (*Page, error) {
+	var body io.Reader = nil
+	body, err := googleapi.WithoutDataWrapper.JSONReader(c.page)
+	if err != nil {
+		return nil, err
+	}
+	ctype := "application/json"
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/pages")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("POST", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+	})
+	req.Header.Set("Content-Type", ctype)
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *Page
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Add a page.",
+	//   "httpMethod": "POST",
+	//   "id": "blogger.pages.insert",
+	//   "parameterOrder": [
+	//     "blogId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "ID of the blog to add the page to.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/pages",
+	//   "request": {
+	//     "$ref": "Page"
+	//   },
+	//   "response": {
+	//     "$ref": "Page"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.pages.list":
+
+type PagesListCall struct {
+	s      *Service
+	blogId string
+	opt_   map[string]interface{}
+}
+
+// List: Retrieves the pages for a blog, optionally including non-LIVE
+// statuses.
+func (r *PagesService) List(blogId string) *PagesListCall {
+	c := &PagesListCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	return c
+}
+
+// FetchBodies sets the optional parameter "fetchBodies": Whether to
+// retrieve the Page bodies.
+func (c *PagesListCall) FetchBodies(fetchBodies bool) *PagesListCall {
+	c.opt_["fetchBodies"] = fetchBodies
+	return c
+}
+
+// Statuses sets the optional parameter "statuses":
+func (c *PagesListCall) Statuses(statuses string) *PagesListCall {
+	c.opt_["statuses"] = statuses
+	return c
+}
+
+// View sets the optional parameter "view":
+func (c *PagesListCall) View(view string) *PagesListCall {
+	c.opt_["view"] = view
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *PagesListCall) Fields(s ...googleapi.Field) *PagesListCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *PagesListCall) Do() (*PageList, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fetchBodies"]; ok {
+		params.Set("fetchBodies", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["statuses"]; ok {
+		params.Set("statuses", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["view"]; ok {
+		params.Set("view", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/pages")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *PageList
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Retrieves the pages for a blog, optionally including non-LIVE statuses.",
+	//   "httpMethod": "GET",
+	//   "id": "blogger.pages.list",
+	//   "parameterOrder": [
+	//     "blogId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "ID of the blog to fetch pages from.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "fetchBodies": {
+	//       "description": "Whether to retrieve the Page bodies.",
+	//       "location": "query",
+	//       "type": "boolean"
+	//     },
+	//     "statuses": {
+	//       "enum": [
+	//         "draft",
+	//         "imported",
+	//         "live"
+	//       ],
+	//       "enumDescriptions": [
+	//         "Draft (unpublished) Pages",
+	//         "Pages that have had their content removed",
+	//         "Pages that are publicly visible"
+	//       ],
+	//       "location": "query",
+	//       "repeated": true,
+	//       "type": "string"
+	//     },
+	//     "view": {
+	//       "enum": [
+	//         "ADMIN",
+	//         "AUTHOR",
+	//         "READER"
+	//       ],
+	//       "enumDescriptions": [
+	//         "Admin level detail",
+	//         "Author level detail",
+	//         "Admin level detail"
+	//       ],
+	//       "location": "query",
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/pages",
+	//   "response": {
+	//     "$ref": "PageList"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger",
+	//     "https://www.googleapis.com/auth/blogger.readonly"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.pages.patch":
+
+type PagesPatchCall struct {
+	s      *Service
+	blogId string
+	pageId string
+	page   *Page
+	opt_   map[string]interface{}
+}
+
+// Patch: Update a page. This method supports patch semantics.
+func (r *PagesService) Patch(blogId string, pageId string, page *Page) *PagesPatchCall {
+	c := &PagesPatchCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.pageId = pageId
+	c.page = page
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *PagesPatchCall) Fields(s ...googleapi.Field) *PagesPatchCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *PagesPatchCall) Do() (*Page, error) {
+	var body io.Reader = nil
+	body, err := googleapi.WithoutDataWrapper.JSONReader(c.page)
+	if err != nil {
+		return nil, err
+	}
+	ctype := "application/json"
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/pages/{pageId}")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("PATCH", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+		"pageId": c.pageId,
+	})
+	req.Header.Set("Content-Type", ctype)
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *Page
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Update a page. This method supports patch semantics.",
+	//   "httpMethod": "PATCH",
+	//   "id": "blogger.pages.patch",
+	//   "parameterOrder": [
+	//     "blogId",
+	//     "pageId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "The ID of the Blog.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "pageId": {
+	//       "description": "The ID of the Page.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/pages/{pageId}",
+	//   "request": {
+	//     "$ref": "Page"
+	//   },
+	//   "response": {
+	//     "$ref": "Page"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.pages.update":
+
+type PagesUpdateCall struct {
+	s      *Service
+	blogId string
+	pageId string
+	page   *Page
+	opt_   map[string]interface{}
+}
+
+// Update: Update a page.
+func (r *PagesService) Update(blogId string, pageId string, page *Page) *PagesUpdateCall {
+	c := &PagesUpdateCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.pageId = pageId
+	c.page = page
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *PagesUpdateCall) Fields(s ...googleapi.Field) *PagesUpdateCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *PagesUpdateCall) Do() (*Page, error) {
+	var body io.Reader = nil
+	body, err := googleapi.WithoutDataWrapper.JSONReader(c.page)
+	if err != nil {
+		return nil, err
+	}
+	ctype := "application/json"
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/pages/{pageId}")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("PUT", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+		"pageId": c.pageId,
+	})
+	req.Header.Set("Content-Type", ctype)
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *Page
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Update a page.",
+	//   "httpMethod": "PUT",
+	//   "id": "blogger.pages.update",
+	//   "parameterOrder": [
+	//     "blogId",
+	//     "pageId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "The ID of the Blog.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "pageId": {
+	//       "description": "The ID of the Page.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/pages/{pageId}",
+	//   "request": {
+	//     "$ref": "Page"
+	//   },
+	//   "response": {
+	//     "$ref": "Page"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.postUserInfos.get":
+
+type PostUserInfosGetCall struct {
+	s      *Service
+	userId string
+	blogId string
+	postId string
+	opt_   map[string]interface{}
+}
+
+// Get: Gets one post and user info pair by postId and userId.
+func (r *PostUserInfosService) Get(userId string, blogId string, postId string) *PostUserInfosGetCall {
+	c := &PostUserInfosGetCall{s: r.s, opt_: make(map[string]interface{})}
+	c.userId = userId
+	c.blogId = blogId
+	c.postId = postId
+	return c
+}
+
+// MaxComments sets the optional parameter "maxComments": Maximum number
+// of comments to pull back on a post.
+func (c *PostUserInfosGetCall) MaxComments(maxComments int64) *PostUserInfosGetCall {
+	c.opt_["maxComments"] = maxComments
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *PostUserInfosGetCall) Fields(s ...googleapi.Field) *PostUserInfosGetCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *PostUserInfosGetCall) Do() (*PostUserInfo, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["maxComments"]; ok {
+		params.Set("maxComments", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "users/{userId}/blogs/{blogId}/posts/{postId}")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"userId": c.userId,
+		"blogId": c.blogId,
+		"postId": c.postId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *PostUserInfo
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Gets one post and user info pair by postId and userId.",
+	//   "httpMethod": "GET",
+	//   "id": "blogger.postUserInfos.get",
+	//   "parameterOrder": [
+	//     "userId",
+	//     "blogId",
+	//     "postId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "The ID of the blog.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "maxComments": {
+	//       "description": "Maximum number of comments to pull back on a post.",
+	//       "format": "uint32",
+	//       "location": "query",
+	//       "type": "integer"
+	//     },
+	//     "postId": {
+	//       "description": "The ID of the post to get.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "userId": {
+	//       "description": "ID of the user for the per-user information to be fetched. Either the word 'self' (sans quote marks) or the user's profile identifier.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "users/{userId}/blogs/{blogId}/posts/{postId}",
+	//   "response": {
+	//     "$ref": "PostUserInfo"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger",
+	//     "https://www.googleapis.com/auth/blogger.readonly"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.postUserInfos.list":
+
+type PostUserInfosListCall struct {
+	s      *Service
+	userId string
+	blogId string
+	opt_   map[string]interface{}
+}
+
+// List: Retrieves a list of post and user info pairs, possibly
+// filtered.
+func (r *PostUserInfosService) List(userId string, blogId string) *PostUserInfosListCall {
+	c := &PostUserInfosListCall{s: r.s, opt_: make(map[string]interface{})}
+	c.userId = userId
+	c.blogId = blogId
+	return c
+}
+
+// EndDate sets the optional parameter "endDate": Latest post date to
+// fetch, a date-time with RFC 3339 formatting.
+func (c *PostUserInfosListCall) EndDate(endDate string) *PostUserInfosListCall {
+	c.opt_["endDate"] = endDate
+	return c
+}
+
+// FetchBodies sets the optional parameter "fetchBodies": Whether the
+// body content of posts is included.
+func (c *PostUserInfosListCall) FetchBodies(fetchBodies bool) *PostUserInfosListCall {
+	c.opt_["fetchBodies"] = fetchBodies
+	return c
+}
+
+// Labels sets the optional parameter "labels": Comma-separated list of
+// labels to search for.
+func (c *PostUserInfosListCall) Labels(labels string) *PostUserInfosListCall {
+	c.opt_["labels"] = labels
+	return c
+}
+
+// MaxResults sets the optional parameter "maxResults": Maximum number
+// of posts to fetch.
+func (c *PostUserInfosListCall) MaxResults(maxResults int64) *PostUserInfosListCall {
+	c.opt_["maxResults"] = maxResults
+	return c
+}
+
+// OrderBy sets the optional parameter "orderBy": Sort search results
+func (c *PostUserInfosListCall) OrderBy(orderBy string) *PostUserInfosListCall {
+	c.opt_["orderBy"] = orderBy
+	return c
+}
+
+// PageToken sets the optional parameter "pageToken": Continuation token
+// if the request is paged.
+func (c *PostUserInfosListCall) PageToken(pageToken string) *PostUserInfosListCall {
+	c.opt_["pageToken"] = pageToken
+	return c
+}
+
+// StartDate sets the optional parameter "startDate": Earliest post date
+// to fetch, a date-time with RFC 3339 formatting.
+func (c *PostUserInfosListCall) StartDate(startDate string) *PostUserInfosListCall {
+	c.opt_["startDate"] = startDate
+	return c
+}
+
+// Statuses sets the optional parameter "statuses":
+func (c *PostUserInfosListCall) Statuses(statuses string) *PostUserInfosListCall {
+	c.opt_["statuses"] = statuses
+	return c
+}
+
+// View sets the optional parameter "view":
+func (c *PostUserInfosListCall) View(view string) *PostUserInfosListCall {
+	c.opt_["view"] = view
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *PostUserInfosListCall) Fields(s ...googleapi.Field) *PostUserInfosListCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *PostUserInfosListCall) Do() (*PostUserInfosList, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["endDate"]; ok {
+		params.Set("endDate", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fetchBodies"]; ok {
+		params.Set("fetchBodies", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["labels"]; ok {
+		params.Set("labels", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["maxResults"]; ok {
+		params.Set("maxResults", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["orderBy"]; ok {
+		params.Set("orderBy", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["pageToken"]; ok {
+		params.Set("pageToken", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["startDate"]; ok {
+		params.Set("startDate", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["statuses"]; ok {
+		params.Set("statuses", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["view"]; ok {
+		params.Set("view", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "users/{userId}/blogs/{blogId}/posts")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"userId": c.userId,
+		"blogId": c.blogId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *PostUserInfosList
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Retrieves a list of post and user info pairs, possibly filtered.",
+	//   "httpMethod": "GET",
+	//   "id": "blogger.postUserInfos.list",
+	//   "parameterOrder": [
+	//     "userId",
+	//     "blogId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "ID of the blog to fetch posts from.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "endDate": {
+	//       "description": "Latest post date to fetch, a date-time with RFC 3339 formatting.",
+	//       "format": "date-time",
+	//       "location": "query",
+	//       "type": "string"
+	//     },
+	//     "fetchBodies": {
+	//       "description": "Whether the body content of posts is included.",
+	//       "location": "query",
+	//       "type": "boolean"
+	//     },
+	//     "labels": {
+	//       "description": "Comma-separated list of labels to search for.",
+	//       "location": "query",
+	//       "type": "string"
+	//     },
+	//     "maxResults": {
+	//       "description": "Maximum number of posts to fetch.",
+	//       "format": "uint32",
+	//       "location": "query",
+	//       "type": "integer"
+	//     },
+	//     "orderBy": {
+	//       "default": "PUBLISHED",
+	//       "description": "Sort search results",
+	//       "enum": [
+	//         "published",
+	//         "updated"
+	//       ],
+	//       "enumDescriptions": [
+	//         "Order by the date the post was published",
+	//         "Order by the date the post was last updated"
+	//       ],
+	//       "location": "query",
+	//       "type": "string"
+	//     },
+	//     "pageToken": {
+	//       "description": "Continuation token if the request is paged.",
+	//       "location": "query",
+	//       "type": "string"
+	//     },
+	//     "startDate": {
+	//       "description": "Earliest post date to fetch, a date-time with RFC 3339 formatting.",
+	//       "format": "date-time",
+	//       "location": "query",
+	//       "type": "string"
+	//     },
+	//     "statuses": {
+	//       "enum": [
+	//         "draft",
+	//         "live",
+	//         "scheduled"
+	//       ],
+	//       "enumDescriptions": [
+	//         "Draft posts",
+	//         "Published posts",
+	//         "Posts that are scheduled to publish in future."
+	//       ],
+	//       "location": "query",
+	//       "repeated": true,
+	//       "type": "string"
+	//     },
+	//     "userId": {
+	//       "description": "ID of the user for the per-user information to be fetched. Either the word 'self' (sans quote marks) or the user's profile identifier.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "view": {
+	//       "enum": [
+	//         "ADMIN",
+	//         "AUTHOR",
+	//         "READER"
+	//       ],
+	//       "enumDescriptions": [
+	//         "Admin level detail",
+	//         "Author level detail",
+	//         "Reader level detail"
+	//       ],
+	//       "location": "query",
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "users/{userId}/blogs/{blogId}/posts",
+	//   "response": {
+	//     "$ref": "PostUserInfosList"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger",
+	//     "https://www.googleapis.com/auth/blogger.readonly"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.posts.delete":
+
+type PostsDeleteCall struct {
+	s      *Service
+	blogId string
+	postId string
+	opt_   map[string]interface{}
+}
+
+// Delete: Delete a post by id.
+func (r *PostsService) Delete(blogId string, postId string) *PostsDeleteCall {
+	c := &PostsDeleteCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.postId = postId
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *PostsDeleteCall) Fields(s ...googleapi.Field) *PostsDeleteCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *PostsDeleteCall) Do() error {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/posts/{postId}")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("DELETE", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+		"postId": c.postId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return err
+	}
+	return nil
+	// {
+	//   "description": "Delete a post by id.",
+	//   "httpMethod": "DELETE",
+	//   "id": "blogger.posts.delete",
+	//   "parameterOrder": [
+	//     "blogId",
+	//     "postId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "The Id of the Blog.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "postId": {
+	//       "description": "The ID of the Post.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/posts/{postId}",
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.posts.get":
+
+type PostsGetCall struct {
+	s      *Service
+	blogId string
+	postId string
+	opt_   map[string]interface{}
+}
+
+// Get: Get a post by id.
+func (r *PostsService) Get(blogId string, postId string) *PostsGetCall {
+	c := &PostsGetCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.postId = postId
+	return c
+}
+
+// MaxComments sets the optional parameter "maxComments": Maximum number
+// of comments to pull back on a post.
+func (c *PostsGetCall) MaxComments(maxComments int64) *PostsGetCall {
+	c.opt_["maxComments"] = maxComments
+	return c
+}
+
+// View sets the optional parameter "view":
+func (c *PostsGetCall) View(view string) *PostsGetCall {
+	c.opt_["view"] = view
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *PostsGetCall) Fields(s ...googleapi.Field) *PostsGetCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *PostsGetCall) Do() (*Post, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["maxComments"]; ok {
+		params.Set("maxComments", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["view"]; ok {
+		params.Set("view", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/posts/{postId}")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+		"postId": c.postId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *Post
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Get a post by id.",
+	//   "httpMethod": "GET",
+	//   "id": "blogger.posts.get",
+	//   "parameterOrder": [
+	//     "blogId",
+	//     "postId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "ID of the blog to fetch the post from.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "maxComments": {
+	//       "description": "Maximum number of comments to pull back on a post.",
+	//       "format": "uint32",
+	//       "location": "query",
+	//       "type": "integer"
+	//     },
+	//     "postId": {
+	//       "description": "The ID of the post",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "view": {
+	//       "enum": [
+	//         "ADMIN",
+	//         "AUTHOR",
+	//         "READER"
+	//       ],
+	//       "enumDescriptions": [
+	//         "Admin level detail",
+	//         "Author level detail",
+	//         "Admin level detail"
+	//       ],
+	//       "location": "query",
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/posts/{postId}",
+	//   "response": {
+	//     "$ref": "Post"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger",
+	//     "https://www.googleapis.com/auth/blogger.readonly"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.posts.getByPath":
+
+type PostsGetByPathCall struct {
+	s      *Service
+	blogId string
+	path   string
+	opt_   map[string]interface{}
+}
+
+// GetByPath: Retrieve a Post by Path.
+func (r *PostsService) GetByPath(blogId string, path string) *PostsGetByPathCall {
+	c := &PostsGetByPathCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.path = path
+	return c
+}
+
+// MaxComments sets the optional parameter "maxComments": Maximum number
+// of comments to pull back on a post.
+func (c *PostsGetByPathCall) MaxComments(maxComments int64) *PostsGetByPathCall {
+	c.opt_["maxComments"] = maxComments
+	return c
+}
+
+// View sets the optional parameter "view":
+func (c *PostsGetByPathCall) View(view string) *PostsGetByPathCall {
+	c.opt_["view"] = view
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *PostsGetByPathCall) Fields(s ...googleapi.Field) *PostsGetByPathCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *PostsGetByPathCall) Do() (*Post, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	params.Set("path", fmt.Sprintf("%v", c.path))
+	if v, ok := c.opt_["maxComments"]; ok {
+		params.Set("maxComments", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["view"]; ok {
+		params.Set("view", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/posts/bypath")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *Post
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Retrieve a Post by Path.",
+	//   "httpMethod": "GET",
+	//   "id": "blogger.posts.getByPath",
+	//   "parameterOrder": [
+	//     "blogId",
+	//     "path"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "ID of the blog to fetch the post from.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "maxComments": {
+	//       "description": "Maximum number of comments to pull back on a post.",
+	//       "format": "uint32",
+	//       "location": "query",
+	//       "type": "integer"
+	//     },
+	//     "path": {
+	//       "description": "Path of the Post to retrieve.",
+	//       "location": "query",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "view": {
+	//       "enum": [
+	//         "ADMIN",
+	//         "AUTHOR",
+	//         "READER"
+	//       ],
+	//       "enumDescriptions": [
+	//         "Admin level detail",
+	//         "Author level detail",
+	//         "Admin level detail"
+	//       ],
+	//       "location": "query",
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/posts/bypath",
+	//   "response": {
+	//     "$ref": "Post"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger",
+	//     "https://www.googleapis.com/auth/blogger.readonly"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.posts.insert":
+
+type PostsInsertCall struct {
+	s      *Service
+	blogId string
+	post   *Post
+	opt_   map[string]interface{}
+}
+
+// Insert: Add a post.
+func (r *PostsService) Insert(blogId string, post *Post) *PostsInsertCall {
+	c := &PostsInsertCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.post = post
+	return c
+}
+
+// IsDraft sets the optional parameter "isDraft": Whether to create the
+// post as a draft
+func (c *PostsInsertCall) IsDraft(isDraft bool) *PostsInsertCall {
+	c.opt_["isDraft"] = isDraft
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *PostsInsertCall) Fields(s ...googleapi.Field) *PostsInsertCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *PostsInsertCall) Do() (*Post, error) {
+	var body io.Reader = nil
+	body, err := googleapi.WithoutDataWrapper.JSONReader(c.post)
+	if err != nil {
+		return nil, err
+	}
+	ctype := "application/json"
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["isDraft"]; ok {
+		params.Set("isDraft", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/posts")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("POST", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+	})
+	req.Header.Set("Content-Type", ctype)
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *Post
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Add a post.",
+	//   "httpMethod": "POST",
+	//   "id": "blogger.posts.insert",
+	//   "parameterOrder": [
+	//     "blogId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "ID of the blog to add the post to.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "isDraft": {
+	//       "description": "Whether to create the post as a draft",
+	//       "location": "query",
+	//       "type": "boolean"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/posts",
+	//   "request": {
+	//     "$ref": "Post"
+	//   },
+	//   "response": {
+	//     "$ref": "Post"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.posts.list":
+
+type PostsListCall struct {
+	s      *Service
+	blogId string
+	opt_   map[string]interface{}
+}
+
+// List: Retrieves a list of posts, possibly filtered.
+func (r *PostsService) List(blogId string) *PostsListCall {
+	c := &PostsListCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	return c
+}
+
+// EndDate sets the optional parameter "endDate": Latest post date to
+// fetch, a date-time with RFC 3339 formatting.
+func (c *PostsListCall) EndDate(endDate string) *PostsListCall {
+	c.opt_["endDate"] = endDate
+	return c
+}
+
+// FetchBodies sets the optional parameter "fetchBodies": Whether the
+// body content of posts is included (default: true). This should be set
+// to false when the post bodies are not required, to help minimize
+// traffic.
+func (c *PostsListCall) FetchBodies(fetchBodies bool) *PostsListCall {
+	c.opt_["fetchBodies"] = fetchBodies
+	return c
+}
+
+// FetchImages sets the optional parameter "fetchImages": Whether image
+// URL metadata for each post is included.
+func (c *PostsListCall) FetchImages(fetchImages bool) *PostsListCall {
+	c.opt_["fetchImages"] = fetchImages
+	return c
+}
+
+// Labels sets the optional parameter "labels": Comma-separated list of
+// labels to search for.
+func (c *PostsListCall) Labels(labels string) *PostsListCall {
+	c.opt_["labels"] = labels
+	return c
+}
+
+// MaxResults sets the optional parameter "maxResults": Maximum number
+// of posts to fetch.
+func (c *PostsListCall) MaxResults(maxResults int64) *PostsListCall {
+	c.opt_["maxResults"] = maxResults
+	return c
+}
+
+// OrderBy sets the optional parameter "orderBy": Sort search results
+func (c *PostsListCall) OrderBy(orderBy string) *PostsListCall {
+	c.opt_["orderBy"] = orderBy
+	return c
+}
+
+// PageToken sets the optional parameter "pageToken": Continuation token
+// if the request is paged.
+func (c *PostsListCall) PageToken(pageToken string) *PostsListCall {
+	c.opt_["pageToken"] = pageToken
+	return c
+}
+
+// StartDate sets the optional parameter "startDate": Earliest post date
+// to fetch, a date-time with RFC 3339 formatting.
+func (c *PostsListCall) StartDate(startDate string) *PostsListCall {
+	c.opt_["startDate"] = startDate
+	return c
+}
+
+// Statuses sets the optional parameter "statuses":
+func (c *PostsListCall) Statuses(statuses string) *PostsListCall {
+	c.opt_["statuses"] = statuses
+	return c
+}
+
+// View sets the optional parameter "view":
+func (c *PostsListCall) View(view string) *PostsListCall {
+	c.opt_["view"] = view
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *PostsListCall) Fields(s ...googleapi.Field) *PostsListCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *PostsListCall) Do() (*PostList, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["endDate"]; ok {
+		params.Set("endDate", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fetchBodies"]; ok {
+		params.Set("fetchBodies", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fetchImages"]; ok {
+		params.Set("fetchImages", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["labels"]; ok {
+		params.Set("labels", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["maxResults"]; ok {
+		params.Set("maxResults", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["orderBy"]; ok {
+		params.Set("orderBy", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["pageToken"]; ok {
+		params.Set("pageToken", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["startDate"]; ok {
+		params.Set("startDate", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["statuses"]; ok {
+		params.Set("statuses", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["view"]; ok {
+		params.Set("view", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/posts")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *PostList
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Retrieves a list of posts, possibly filtered.",
+	//   "httpMethod": "GET",
+	//   "id": "blogger.posts.list",
+	//   "parameterOrder": [
+	//     "blogId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "ID of the blog to fetch posts from.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "endDate": {
+	//       "description": "Latest post date to fetch, a date-time with RFC 3339 formatting.",
+	//       "format": "date-time",
+	//       "location": "query",
+	//       "type": "string"
+	//     },
+	//     "fetchBodies": {
+	//       "default": "true",
+	//       "description": "Whether the body content of posts is included (default: true). This should be set to false when the post bodies are not required, to help minimize traffic.",
+	//       "location": "query",
+	//       "type": "boolean"
+	//     },
+	//     "fetchImages": {
+	//       "description": "Whether image URL metadata for each post is included.",
+	//       "location": "query",
+	//       "type": "boolean"
+	//     },
+	//     "labels": {
+	//       "description": "Comma-separated list of labels to search for.",
+	//       "location": "query",
+	//       "type": "string"
+	//     },
+	//     "maxResults": {
+	//       "description": "Maximum number of posts to fetch.",
+	//       "format": "uint32",
+	//       "location": "query",
+	//       "type": "integer"
+	//     },
+	//     "orderBy": {
+	//       "default": "PUBLISHED",
+	//       "description": "Sort search results",
+	//       "enum": [
+	//         "published",
+	//         "updated"
+	//       ],
+	//       "enumDescriptions": [
+	//         "Order by the date the post was published",
+	//         "Order by the date the post was last updated"
+	//       ],
+	//       "location": "query",
+	//       "type": "string"
+	//     },
+	//     "pageToken": {
+	//       "description": "Continuation token if the request is paged.",
+	//       "location": "query",
+	//       "type": "string"
+	//     },
+	//     "startDate": {
+	//       "description": "Earliest post date to fetch, a date-time with RFC 3339 formatting.",
+	//       "format": "date-time",
+	//       "location": "query",
+	//       "type": "string"
+	//     },
+	//     "statuses": {
+	//       "enum": [
+	//         "draft",
+	//         "live",
+	//         "scheduled"
+	//       ],
+	//       "enumDescriptions": [
+	//         "Draft posts",
+	//         "Published posts",
+	//         "Posts that are scheduled to publish in future."
+	//       ],
+	//       "location": "query",
+	//       "repeated": true,
+	//       "type": "string"
+	//     },
+	//     "view": {
+	//       "enum": [
+	//         "ADMIN",
+	//         "AUTHOR",
+	//         "READER"
+	//       ],
+	//       "enumDescriptions": [
+	//         "Admin level detail",
+	//         "Author level detail",
+	//         "Reader level detail"
+	//       ],
+	//       "location": "query",
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/posts",
+	//   "response": {
+	//     "$ref": "PostList"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger",
+	//     "https://www.googleapis.com/auth/blogger.readonly"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.posts.patch":
+
+type PostsPatchCall struct {
+	s      *Service
+	blogId string
+	postId string
+	post   *Post
+	opt_   map[string]interface{}
+}
+
+// Patch: Update a post. This method supports patch semantics.
+func (r *PostsService) Patch(blogId string, postId string, post *Post) *PostsPatchCall {
+	c := &PostsPatchCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.postId = postId
+	c.post = post
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *PostsPatchCall) Fields(s ...googleapi.Field) *PostsPatchCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *PostsPatchCall) Do() (*Post, error) {
+	var body io.Reader = nil
+	body, err := googleapi.WithoutDataWrapper.JSONReader(c.post)
+	if err != nil {
+		return nil, err
+	}
+	ctype := "application/json"
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/posts/{postId}")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("PATCH", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+		"postId": c.postId,
+	})
+	req.Header.Set("Content-Type", ctype)
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *Post
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Update a post. This method supports patch semantics.",
+	//   "httpMethod": "PATCH",
+	//   "id": "blogger.posts.patch",
+	//   "parameterOrder": [
+	//     "blogId",
+	//     "postId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "The ID of the Blog.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "postId": {
+	//       "description": "The ID of the Post.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/posts/{postId}",
+	//   "request": {
+	//     "$ref": "Post"
+	//   },
+	//   "response": {
+	//     "$ref": "Post"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.posts.publish":
+
+type PostsPublishCall struct {
+	s      *Service
+	blogId string
+	postId string
+	opt_   map[string]interface{}
+}
+
+// Publish: Publish a draft post.
+func (r *PostsService) Publish(blogId string, postId string) *PostsPublishCall {
+	c := &PostsPublishCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.postId = postId
+	return c
+}
+
+// PublishDate sets the optional parameter "publishDate": The date and
+// time to schedule the publishing of the Blog.
+func (c *PostsPublishCall) PublishDate(publishDate string) *PostsPublishCall {
+	c.opt_["publishDate"] = publishDate
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *PostsPublishCall) Fields(s ...googleapi.Field) *PostsPublishCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *PostsPublishCall) Do() (*Post, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["publishDate"]; ok {
+		params.Set("publishDate", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/posts/{postId}/publish")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("POST", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+		"postId": c.postId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *Post
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Publish a draft post.",
+	//   "httpMethod": "POST",
+	//   "id": "blogger.posts.publish",
+	//   "parameterOrder": [
+	//     "blogId",
+	//     "postId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "The ID of the Blog.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "postId": {
+	//       "description": "The ID of the Post.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "publishDate": {
+	//       "description": "The date and time to schedule the publishing of the Blog.",
+	//       "format": "date-time",
+	//       "location": "query",
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/posts/{postId}/publish",
+	//   "response": {
+	//     "$ref": "Post"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.posts.revert":
+
+type PostsRevertCall struct {
+	s      *Service
+	blogId string
+	postId string
+	opt_   map[string]interface{}
+}
+
+// Revert: Revert a published or scheduled post to draft state.
+func (r *PostsService) Revert(blogId string, postId string) *PostsRevertCall {
+	c := &PostsRevertCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.postId = postId
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *PostsRevertCall) Fields(s ...googleapi.Field) *PostsRevertCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *PostsRevertCall) Do() (*Post, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/posts/{postId}/revert")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("POST", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+		"postId": c.postId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *Post
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Revert a published or scheduled post to draft state.",
+	//   "httpMethod": "POST",
+	//   "id": "blogger.posts.revert",
+	//   "parameterOrder": [
+	//     "blogId",
+	//     "postId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "The ID of the Blog.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "postId": {
+	//       "description": "The ID of the Post.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/posts/{postId}/revert",
+	//   "response": {
+	//     "$ref": "Post"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.posts.search":
+
+type PostsSearchCall struct {
+	s      *Service
+	blogId string
+	q      string
+	opt_   map[string]interface{}
+}
+
+// Search: Search for a post.
+func (r *PostsService) Search(blogId string, q string) *PostsSearchCall {
+	c := &PostsSearchCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.q = q
+	return c
+}
+
+// FetchBodies sets the optional parameter "fetchBodies": Whether the
+// body content of posts is included (default: true). This should be set
+// to false when the post bodies are not required, to help minimize
+// traffic.
+func (c *PostsSearchCall) FetchBodies(fetchBodies bool) *PostsSearchCall {
+	c.opt_["fetchBodies"] = fetchBodies
+	return c
+}
+
+// OrderBy sets the optional parameter "orderBy": Sort search results
+func (c *PostsSearchCall) OrderBy(orderBy string) *PostsSearchCall {
+	c.opt_["orderBy"] = orderBy
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *PostsSearchCall) Fields(s ...googleapi.Field) *PostsSearchCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *PostsSearchCall) Do() (*PostList, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	params.Set("q", fmt.Sprintf("%v", c.q))
+	if v, ok := c.opt_["fetchBodies"]; ok {
+		params.Set("fetchBodies", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["orderBy"]; ok {
+		params.Set("orderBy", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/posts/search")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *PostList
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Search for a post.",
+	//   "httpMethod": "GET",
+	//   "id": "blogger.posts.search",
+	//   "parameterOrder": [
+	//     "blogId",
+	//     "q"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "ID of the blog to fetch the post from.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "fetchBodies": {
+	//       "default": "true",
+	//       "description": "Whether the body content of posts is included (default: true). This should be set to false when the post bodies are not required, to help minimize traffic.",
+	//       "location": "query",
+	//       "type": "boolean"
+	//     },
+	//     "orderBy": {
+	//       "default": "PUBLISHED",
+	//       "description": "Sort search results",
+	//       "enum": [
+	//         "published",
+	//         "updated"
+	//       ],
+	//       "enumDescriptions": [
+	//         "Order by the date the post was published",
+	//         "Order by the date the post was last updated"
+	//       ],
+	//       "location": "query",
+	//       "type": "string"
+	//     },
+	//     "q": {
+	//       "description": "Query terms to search this blog for matching posts.",
+	//       "location": "query",
+	//       "required": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/posts/search",
+	//   "response": {
+	//     "$ref": "PostList"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger",
+	//     "https://www.googleapis.com/auth/blogger.readonly"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.posts.update":
+
+type PostsUpdateCall struct {
+	s      *Service
+	blogId string
+	postId string
+	post   *Post
+	opt_   map[string]interface{}
+}
+
+// Update: Update a post.
+func (r *PostsService) Update(blogId string, postId string, post *Post) *PostsUpdateCall {
+	c := &PostsUpdateCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.postId = postId
+	c.post = post
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *PostsUpdateCall) Fields(s ...googleapi.Field) *PostsUpdateCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *PostsUpdateCall) Do() (*Post, error) {
+	var body io.Reader = nil
+	body, err := googleapi.WithoutDataWrapper.JSONReader(c.post)
+	if err != nil {
+		return nil, err
+	}
+	ctype := "application/json"
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/posts/{postId}")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("PUT", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+		"postId": c.postId,
+	})
+	req.Header.Set("Content-Type", ctype)
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *Post
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Update a post.",
+	//   "httpMethod": "PUT",
+	//   "id": "blogger.posts.update",
+	//   "parameterOrder": [
+	//     "blogId",
+	//     "postId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "The ID of the Blog.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "postId": {
+	//       "description": "The ID of the Post.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/posts/{postId}",
+	//   "request": {
+	//     "$ref": "Post"
+	//   },
+	//   "response": {
+	//     "$ref": "Post"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.users.get":
+
+type UsersGetCall struct {
+	s      *Service
+	userId string
+	opt_   map[string]interface{}
+}
+
+// Get: Gets one user by id.
+func (r *UsersService) Get(userId string) *UsersGetCall {
+	c := &UsersGetCall{s: r.s, opt_: make(map[string]interface{})}
+	c.userId = userId
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *UsersGetCall) Fields(s ...googleapi.Field) *UsersGetCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *UsersGetCall) Do() (*User, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "users/{userId}")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"userId": c.userId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *User
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Gets one user by id.",
+	//   "httpMethod": "GET",
+	//   "id": "blogger.users.get",
+	//   "parameterOrder": [
+	//     "userId"
+	//   ],
+	//   "parameters": {
+	//     "userId": {
+	//       "description": "The ID of the user to get.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "users/{userId}",
+	//   "response": {
+	//     "$ref": "User"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger",
+	//     "https://www.googleapis.com/auth/blogger.readonly"
+	//   ]
+	// }
+
+}
diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/getwithoutbody.json b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/getwithoutbody.json
new file mode 100644
index 00000000..b23b2574
--- /dev/null
+++ b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/getwithoutbody.json
@@ -0,0 +1,89 @@
+{
+ "kind": "discovery#restDescription",
+ "etag": "\"kEk3sFj6Ef5_yR1-H3bAO6qw9mI/3m5rB86FE5KuW1K3jAl88AxCreg\"",
+ "discoveryVersion": "v1",
+ "id": "getwithoutbody:v1",
+ "name": "getwithoutbody",
+ "version": "v1",
+ "title": "Example API",
+ "description": "The Example API demonstrates a GET with a request.",
+ "ownerDomain": "google.com",
+ "ownerName": "Google",
+ "protocol": "rest",
+ "schemas": {
+  "ListMetricRequest": {
+   "id": "ListMetricRequest",
+   "type": "object",
+   "description": "The request of getwithoutbody.metricDescriptors.list.",
+   "properties": {
+    "kind": {
+     "type": "string",
+     "description": "Identifies what kind of resource this is. Value: the fixed string \"getwithoutbody#listMetricRequest\".",
+     "default": "getwithoutbody#listMetricRequest"
+    }
+   }
+  },
+  "ListMetricResponse": {
+   "id": "ListMetricResponse",
+   "type": "object",
+   "description": "The response of getwithoutbody.metricDescriptors.list.",
+   "properties": {
+    "kind": {
+     "type": "string",
+     "description": "Identifies what kind of resource this is. Value: the fixed string \"getwithoutbody#listMetricResponse\".",
+     "default": "getwithoutbody#listMetricResponse"
+    },
+    "nextPageToken": {
+     "type": "string",
+     "description": "Pagination token. If present, indicates that additional results are available for retrieval. To access the results past the pagination limit, set this value to the pageToken query parameter."
+    }
+   }
+  }
+ },
+ "resources": {
+  "metricDescriptors": {
+   "methods": {
+    "list": {
+     "id": "getwithoutbody.metricDescriptors.list",
+     "path": "{project}/metricDescriptors",
+     "httpMethod": "GET",
+     "description": "List all of the available metric descriptors. Large number of metric descriptors will be paginated, use the nextPageToken returned in the response to request subsequent pages of results by setting the pageToken query parameter to the value of the nextPageToken.",
+     "parameters": {
+      "count": {
+       "type": "integer",
+       "description": "Maximum number of metric descriptors per page. Used for pagination. If not specified, count = 100.",
+       "default": "100",
+       "format": "int32",
+       "minimum": "1",
+       "maximum": "1000",
+       "location": "query"
+      },
+      "pageToken": {
+       "type": "string",
+       "description": "The pagination token, which is used to page through large result sets. Set this value to the value of the nextPageToken to retrieve the next page of results.",
+       "location": "query"
+      },
+      "project": {
+       "type": "string",
+       "description": "The project id. The value can be the numeric project ID or string-based project name.",
+       "required": true,
+       "location": "path"
+      }
+     },
+     "parameterOrder": [
+      "project"
+     ],
+     "request": {
+      "$ref": "ListMetricRequest"
+     },
+     "response": {
+      "$ref": "ListMetricResponse"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/getwithoutbody.readonly"
+     ]
+    }
+   }
+  }
+ }
+}
diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/getwithoutbody.want b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/getwithoutbody.want
new file mode 100644
index 00000000..a74ac99b
--- /dev/null
+++ b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/getwithoutbody.want
@@ -0,0 +1,202 @@
+// Package getwithoutbody provides access to the Example API.
+//
+// Usage example:
+//
+//   import "google.golang.org/api/getwithoutbody/v1"
+//   ...
+//   getwithoutbodyService, err := getwithoutbody.New(oauthHttpClient)
+package getwithoutbody
+
+import (
+	"bytes"
+	"google.golang.org/api/googleapi"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"strconv"
+	"strings"
+)
+
+// Always reference these packages, just in case the auto-generated code
+// below doesn't.
+var _ = bytes.NewBuffer
+var _ = strconv.Itoa
+var _ = fmt.Sprintf
+var _ = json.NewDecoder
+var _ = io.Copy
+var _ = url.Parse
+var _ = googleapi.Version
+var _ = errors.New
+var _ = strings.Replace
+
+const apiId = "getwithoutbody:v1"
+const apiName = "getwithoutbody"
+const apiVersion = "v1"
+const basePath = "https://www.googleapis.com/discovery/v1/apis"
+
+func New(client *http.Client) (*Service, error) {
+	if client == nil {
+		return nil, errors.New("client is nil")
+	}
+	s := &Service{client: client, BasePath: basePath}
+	s.MetricDescriptors = NewMetricDescriptorsService(s)
+	return s, nil
+}
+
+type Service struct {
+	client   *http.Client
+	BasePath string // API endpoint base URL
+
+	MetricDescriptors *MetricDescriptorsService
+}
+
+func NewMetricDescriptorsService(s *Service) *MetricDescriptorsService {
+	rs := &MetricDescriptorsService{s: s}
+	return rs
+}
+
+type MetricDescriptorsService struct {
+	s *Service
+}
+
+type ListMetricRequest struct {
+	// Kind: Identifies what kind of resource this is. Value: the fixed
+	// string "getwithoutbody#listMetricRequest".
+	Kind string `json:"kind,omitempty"`
+}
+
+type ListMetricResponse struct {
+	// Kind: Identifies what kind of resource this is. Value: the fixed
+	// string "getwithoutbody#listMetricResponse".
+	Kind string `json:"kind,omitempty"`
+
+	// NextPageToken: Pagination token. If present, indicates that
+	// additional results are available for retrieval. To access the results
+	// past the pagination limit, set this value to the pageToken query
+	// parameter.
+	NextPageToken string `json:"nextPageToken,omitempty"`
+}
+
+// method id "getwithoutbody.metricDescriptors.list":
+
+type MetricDescriptorsListCall struct {
+	s                 *Service
+	project           string
+	listmetricrequest *ListMetricRequest
+	opt_              map[string]interface{}
+}
+
+// List: List all of the available metric descriptors. Large number of
+// metric descriptors will be paginated, use the nextPageToken returned
+// in the response to request subsequent pages of results by setting the
+// pageToken query parameter to the value of the nextPageToken.
+func (r *MetricDescriptorsService) List(project string, listmetricrequest *ListMetricRequest) *MetricDescriptorsListCall {
+	c := &MetricDescriptorsListCall{s: r.s, opt_: make(map[string]interface{})}
+	c.project = project
+	c.listmetricrequest = listmetricrequest
+	return c
+}
+
+// Count sets the optional parameter "count": Maximum number of metric
+// descriptors per page. Used for pagination. If not specified, count =
+// 100.
+func (c *MetricDescriptorsListCall) Count(count int64) *MetricDescriptorsListCall {
+	c.opt_["count"] = count
+	return c
+}
+
+// PageToken sets the optional parameter "pageToken": The pagination
+// token, which is used to page through large result sets. Set this
+// value to the value of the nextPageToken to retrieve the next page of
+// results.
+func (c *MetricDescriptorsListCall) PageToken(pageToken string) *MetricDescriptorsListCall {
+	c.opt_["pageToken"] = pageToken
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *MetricDescriptorsListCall) Fields(s ...googleapi.Field) *MetricDescriptorsListCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *MetricDescriptorsListCall) Do() (*ListMetricResponse, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["count"]; ok {
+		params.Set("count", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["pageToken"]; ok {
+		params.Set("pageToken", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "{project}/metricDescriptors")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"project": c.project,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *ListMetricResponse
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "List all of the available metric descriptors. Large number of metric descriptors will be paginated, use the nextPageToken returned in the response to request subsequent pages of results by setting the pageToken query parameter to the value of the nextPageToken.",
+	//   "httpMethod": "GET",
+	//   "id": "getwithoutbody.metricDescriptors.list",
+	//   "parameterOrder": [
+	//     "project"
+	//   ],
+	//   "parameters": {
+	//     "count": {
+	//       "default": "100",
+	//       "description": "Maximum number of metric descriptors per page. Used for pagination. If not specified, count = 100.",
+	//       "format": "int32",
+	//       "location": "query",
+	//       "maximum": "1000",
+	//       "minimum": "1",
+	//       "type": "integer"
+	//     },
+	//     "pageToken": {
+	//       "description": "The pagination token, which is used to page through large result sets. Set this value to the value of the nextPageToken to retrieve the next page of results.",
+	//       "location": "query",
+	//       "type": "string"
+	//     },
+	//     "project": {
+	//       "description": "The project id. The value can be the numeric project ID or string-based project name.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "{project}/metricDescriptors",
+	//   "request": {
+	//     "$ref": "ListMetricRequest"
+	//   },
+	//   "response": {
+	//     "$ref": "ListMetricResponse"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/getwithoutbody.readonly"
+	//   ]
+	// }
+
+}
diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofany.json b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofany.json
new file mode 100644
index 00000000..8253ef15
--- /dev/null
+++ b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofany.json
@@ -0,0 +1,51 @@
+{
+ "kind": "discovery#restDescription",
+ "etag": "\"kEk3sFj6Ef5_yR1-H3bAO6qw9mI/3m5rB86FE5KuW1K3jAl88AxCreg\"",
+ "discoveryVersion": "v1",
+ "id": "mapofany:v1",
+ "name": "mapofany",
+ "version": "v1",
+ "title": "Example API",
+ "description": "The Example API demonstrates an associative array.",
+ "ownerDomain": "google.com",
+ "ownerName": "Google",
+ "protocol": "rest",
+ "schemas": {
+  "TableDataInsertAllRequest": {
+   "id": "TableDataInsertAllRequest",
+   "type": "object",
+   "properties": {
+    "kind": {
+     "type": "string",
+     "description": "The resource type of the response.",
+     "default": "bigquery#tableDataInsertAllRequest"
+    },
+    "rows": {
+     "type": "array",
+     "description": "The rows to insert.",
+     "items": {
+      "type": "object",
+      "properties": {
+       "json": {
+        "$ref": "JsonObject",
+        "description": "[Required] A JSON object that contains a row of data. The object's properties and values must match the destination table's schema."
+       }
+      }
+     }
+    }
+   }
+  },
+  "JsonObject": {
+   "id": "JsonObject",
+   "type": "object",
+   "description": "Represents a single JSON object.",
+   "additionalProperties": {
+    "$ref": "JsonValue"
+   }
+  },
+  "JsonValue": {
+   "id": "JsonValue",
+   "type": "any"
+  }
+ }
+}
diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofany.want b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofany.want
new file mode 100644
index 00000000..3e9ca755
--- /dev/null
+++ b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofany.want
@@ -0,0 +1,68 @@
+// Package mapofany provides access to the Example API.
+//
+// Usage example:
+//
+//   import "google.golang.org/api/mapofany/v1"
+//   ...
+//   mapofanyService, err := mapofany.New(oauthHttpClient)
+package mapofany
+
+import (
+	"bytes"
+	"google.golang.org/api/googleapi"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"strconv"
+	"strings"
+)
+
+// Always reference these packages, just in case the auto-generated code
+// below doesn't.
+var _ = bytes.NewBuffer
+var _ = strconv.Itoa
+var _ = fmt.Sprintf
+var _ = json.NewDecoder
+var _ = io.Copy
+var _ = url.Parse
+var _ = googleapi.Version
+var _ = errors.New
+var _ = strings.Replace
+
+const apiId = "mapofany:v1"
+const apiName = "mapofany"
+const apiVersion = "v1"
+const basePath = "https://www.googleapis.com/discovery/v1/apis"
+
+func New(client *http.Client) (*Service, error) {
+	if client == nil {
+		return nil, errors.New("client is nil")
+	}
+	s := &Service{client: client, BasePath: basePath}
+	return s, nil
+}
+
+type Service struct {
+	client   *http.Client
+	BasePath string // API endpoint base URL
+}
+
+type JsonValue interface{}
+
+type TableDataInsertAllRequest struct {
+	// Kind: The resource type of the response.
+	Kind string `json:"kind,omitempty"`
+
+	// Rows: The rows to insert.
+	Rows []*TableDataInsertAllRequestRows `json:"rows,omitempty"`
+}
+
+type TableDataInsertAllRequestRows struct {
+	// Json: [Required] A JSON object that contains a row of data. The
+	// object's properties and values must match the destination table's
+	// schema.
+	Json map[string]JsonValue `json:"json,omitempty"`
+}
diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofarrayofobjects.json b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofarrayofobjects.json
new file mode 100644
index 00000000..5ab065e2
--- /dev/null
+++ b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofarrayofobjects.json
@@ -0,0 +1,72 @@
+{
+ "kind": "discovery#restDescription",
+ "etag": "\"kEk3sFj6Ef5_yR1-H3bAO6qw9mI/3m5rB86FE5KuW1K3jAl88AxCreg\"",
+ "discoveryVersion": "v1",
+ "id": "additionalprops:v1",
+ "name": "additionalprops",
+ "version": "v1",
+ "title": "Example API",
+ "description": "The Example API demonstrates an associative array.",
+ "ownerDomain": "google.com",
+ "ownerName": "Google",
+ "protocol": "rest",
+ "schemas": {
+  "TimeseriesDescriptor": {
+   "id": "TimeseriesDescriptor",
+   "type": "object",
+   "description": "The descriptions of a time series.",
+   "properties": {
+    "labels": {
+     "type": "object",
+     "description": "The set of key-value pairs that describe this time series, including target-specific labels and metric-specific labels.",
+     "additionalProperties": {
+      "type": "string",
+      "description": "The label's name."
+     }
+    },
+    "metric": {
+     "type": "string",
+     "description": "The name of the metric."
+    },
+    "project": {
+     "type": "string",
+     "description": "The project ID to which this time series belongs."
+    },
+    "tags": {
+     "type": "object",
+     "description": "A map of additional information.",
+     "additionalProperties": {
+      "type": "array",
+      "description": "A string which maps to an array of values.",
+      "items": {
+       "$ref": "Property"
+      }
+     }
+    }
+   }
+  },
+  "GetMapResponse": {
+   "id": "GetMapResponse",
+   "type": "object",
+   "description": "Response of getting a map.",
+   "additionalProperties": {
+    "type": "string"
+   }
+  }
+ },
+ "resources": {
+  "atlas": {
+   "methods": {
+    "getMap": {
+     "id": "mapofstrings.getMap",
+     "path": "map",
+     "httpMethod": "GET",
+     "description": "Get a map.",
+     "response": {
+      "$ref": "GetMapResponse"
+     }
+    }
+   }
+  }
+ }
+}
diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofarrayofobjects.want b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofarrayofobjects.want
new file mode 100644
index 00000000..bacec4fe
--- /dev/null
+++ b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofarrayofobjects.want
@@ -0,0 +1,136 @@
+// Package additionalprops provides access to the Example API.
+//
+// Usage example:
+//
+//   import "google.golang.org/api/additionalprops/v1"
+//   ...
+//   additionalpropsService, err := additionalprops.New(oauthHttpClient)
+package additionalprops
+
+import (
+	"bytes"
+	"google.golang.org/api/googleapi"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"strconv"
+	"strings"
+)
+
+// Always reference these packages, just in case the auto-generated code
+// below doesn't.
+var _ = bytes.NewBuffer
+var _ = strconv.Itoa
+var _ = fmt.Sprintf
+var _ = json.NewDecoder
+var _ = io.Copy
+var _ = url.Parse
+var _ = googleapi.Version
+var _ = errors.New
+var _ = strings.Replace
+
+const apiId = "additionalprops:v1"
+const apiName = "additionalprops"
+const apiVersion = "v1"
+const basePath = "https://www.googleapis.com/discovery/v1/apis"
+
+func New(client *http.Client) (*Service, error) {
+	if client == nil {
+		return nil, errors.New("client is nil")
+	}
+	s := &Service{client: client, BasePath: basePath}
+	s.Atlas = NewAtlasService(s)
+	return s, nil
+}
+
+type Service struct {
+	client   *http.Client
+	BasePath string // API endpoint base URL
+
+	Atlas *AtlasService
+}
+
+func NewAtlasService(s *Service) *AtlasService {
+	rs := &AtlasService{s: s}
+	return rs
+}
+
+type AtlasService struct {
+	s *Service
+}
+
+type TimeseriesDescriptor struct {
+	// Labels: The set of key-value pairs that describe this time series,
+	// including target-specific labels and metric-specific labels.
+	Labels map[string]string `json:"labels,omitempty"`
+
+	// Metric: The name of the metric.
+	Metric string `json:"metric,omitempty"`
+
+	// Project: The project ID to which this time series belongs.
+	Project string `json:"project,omitempty"`
+
+	// Tags: A map of additional information.
+	Tags map[string][]Property `json:"tags,omitempty"`
+}
+
+// method id "mapofstrings.getMap":
+
+type AtlasGetMapCall struct {
+	s    *Service
+	opt_ map[string]interface{}
+}
+
+// GetMap: Get a map.
+func (r *AtlasService) GetMap() *AtlasGetMapCall {
+	c := &AtlasGetMapCall{s: r.s, opt_: make(map[string]interface{})}
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *AtlasGetMapCall) Fields(s ...googleapi.Field) *AtlasGetMapCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *AtlasGetMapCall) Do() (map[string]string, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "map")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.SetOpaque(req.URL)
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret map[string]string
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Get a map.",
+	//   "httpMethod": "GET",
+	//   "id": "mapofstrings.getMap",
+	//   "path": "map",
+	//   "response": {
+	//     "$ref": "GetMapResponse"
+	//   }
+	// }
+
+}
diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofobjects.json b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofobjects.json
new file mode 100644
index 00000000..e447c0f9
--- /dev/null
+++ b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofobjects.json
@@ -0,0 +1,30 @@
+{
+ "kind": "discovery#restDescription",
+ "etag": "\"kEk3sFj6Ef5_yR1-H3bAO6qw9mI/3m5rB86FE5KuW1K3jAl88AxCreg\"",
+ "discoveryVersion": "v1",
+ "id": "additionalpropsobjs:v1",
+ "name": "additionalpropsobjs",
+ "version": "v1",
+ "title": "Example API",
+ "description": "The Example API demonstrates an associative array.",
+ "ownerDomain": "google.com",
+ "ownerName": "Google",
+ "protocol": "rest",
+ "schemas": {
+  "Entity": {
+   "id": "Entity",
+   "type": "object",
+   "externalTypeName": "apphosting.client.datastoreservice.proto.Entity",
+   "properties": {
+    "properties": {
+     "type": "object",
+     "description": "The entity's properties.",
+     "additionalProperties": {
+      "$ref": "Property",
+      "description": "The name of the property. Properties with names matching regex \"__.*__\" are reserved. A reserved property name is forbidden in certain documented contexts. The name cannot be \"\"."
+     }
+    }
+   }
+  }
+ }
+}
diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofobjects.want b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofobjects.want
new file mode 100644
index 00000000..3f0a0fb5
--- /dev/null
+++ b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofobjects.want
@@ -0,0 +1,56 @@
+// Package additionalpropsobjs provides access to the Example API.
+//
+// Usage example:
+//
+//   import "google.golang.org/api/additionalpropsobjs/v1"
+//   ...
+//   additionalpropsobjsService, err := additionalpropsobjs.New(oauthHttpClient)
+package additionalpropsobjs
+
+import (
+	"bytes"
+	"google.golang.org/api/googleapi"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"strconv"
+	"strings"
+)
+
+// Always reference these packages, just in case the auto-generated code
+// below doesn't.
+var _ = bytes.NewBuffer
+var _ = strconv.Itoa
+var _ = fmt.Sprintf
+var _ = json.NewDecoder
+var _ = io.Copy
+var _ = url.Parse
+var _ = googleapi.Version
+var _ = errors.New
+var _ = strings.Replace
+
+const apiId = "additionalpropsobjs:v1"
+const apiName = "additionalpropsobjs"
+const apiVersion = "v1"
+const basePath = "https://www.googleapis.com/discovery/v1/apis"
+
+func New(client *http.Client) (*Service, error) {
+	if client == nil {
+		return nil, errors.New("client is nil")
+	}
+	s := &Service{client: client, BasePath: basePath}
+	return s, nil
+}
+
+type Service struct {
+	client   *http.Client
+	BasePath string // API endpoint base URL
+}
+
+type Entity struct {
+	// Properties: The entity's properties.
+	Properties map[string]Property `json:"properties,omitempty"`
+}
diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofstrings-1.json b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofstrings-1.json
new file mode 100644
index 00000000..d766ed1b
--- /dev/null
+++ b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofstrings-1.json
@@ -0,0 +1,72 @@
+{
+ "kind": "discovery#restDescription",
+ "etag": "\"kEk3sFj6Ef5_yR1-H3bAO6qw9mI/3m5rB86FE5KuW1K3jAl88AxCreg\"",
+ "discoveryVersion": "v1",
+ "id": "additionalprops:v1",
+ "name": "additionalprops",
+ "version": "v1",
+ "title": "Example API",
+ "description": "The Example API demonstrates an associative array.",
+ "ownerDomain": "google.com",
+ "ownerName": "Google",
+ "protocol": "rest",
+ "schemas": {
+  "TimeseriesDescriptor": {
+   "id": "TimeseriesDescriptor",
+   "type": "object",
+   "description": "The descriptions of a time series.",
+   "properties": {
+    "labels": {
+     "type": "object",
+     "description": "The set of key-value pairs that describe this time series, including target-specific labels and metric-specific labels.",
+     "additionalProperties": {
+      "type": "string",
+      "description": "The label's name."
+     }
+    },
+    "metric": {
+     "type": "string",
+     "description": "The name of the metric."
+    },
+    "project": {
+     "type": "string",
+     "description": "The project ID to which this time series belongs."
+    },
+    "tags": {
+     "type": "object",
+     "description": "A map of additional information.",
+     "additionalProperties": {
+      "type": "array",
+      "description": "A string which maps to an array of values.",
+      "items": {
+       "type": "string"
+      }
+     }
+    }
+   }
+  },
+  "GetMapResponse": {
+   "id": "GetMapResponse",
+   "type": "object",
+   "description": "Response of getting a map.",
+   "additionalProperties": {
+    "type": "string"
+   }
+  }
+ },
+ "resources": {
+  "atlas": {
+   "methods": {
+    "getMap": {
+     "id": "mapofstrings.getMap",
+     "path": "map",
+     "httpMethod": "GET",
+     "description": "Get a map.",
+     "response": {
+      "$ref": "GetMapResponse"
+     }
+    }
+   }
+  }
+ }
+}
diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofstrings-1.want b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofstrings-1.want
new file mode 100644
index 00000000..daff0508
--- /dev/null
+++ b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/mapofstrings-1.want
@@ -0,0 +1,136 @@
+// Package additionalprops provides access to the Example API.
+//
+// Usage example:
+//
+//   import "google.golang.org/api/additionalprops/v1"
+//   ...
+//   additionalpropsService, err := additionalprops.New(oauthHttpClient)
+package additionalprops
+
+import (
+	"bytes"
+	"google.golang.org/api/googleapi"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"strconv"
+	"strings"
+)
+
+// Always reference these packages, just in case the auto-generated code
+// below doesn't.
+var _ = bytes.NewBuffer
+var _ = strconv.Itoa
+var _ = fmt.Sprintf
+var _ = json.NewDecoder
+var _ = io.Copy
+var _ = url.Parse
+var _ = googleapi.Version
+var _ = errors.New
+var _ = strings.Replace
+
+const apiId = "additionalprops:v1"
+const apiName = "additionalprops"
+const apiVersion = "v1"
+const basePath = "https://www.googleapis.com/discovery/v1/apis"
+
+func New(client *http.Client) (*Service, error) {
+	if client == nil {
+		return nil, errors.New("client is nil")
+	}
+	s := &Service{client: client, BasePath: basePath}
+	s.Atlas = NewAtlasService(s)
+	return s, nil
+}
+
+type Service struct {
+	client   *http.Client
+	BasePath string // API endpoint base URL
+
+	Atlas *AtlasService
+}
+
+func NewAtlasService(s *Service) *AtlasService {
+	rs := &AtlasService{s: s}
+	return rs
+}
+
+type AtlasService struct {
+	s *Service
+}
+
+type TimeseriesDescriptor struct {
+	// Labels: The set of key-value pairs that describe this time series,
+	// including target-specific labels and metric-specific labels.
+	Labels map[string]string `json:"labels,omitempty"`
+
+	// Metric: The name of the metric.
+	Metric string `json:"metric,omitempty"`
+
+	// Project: The project ID to which this time series belongs.
+	Project string `json:"project,omitempty"`
+
+	// Tags: A map of additional information.
+	Tags map[string][]string `json:"tags,omitempty"`
+}
+
+// method id "mapofstrings.getMap":
+
+type AtlasGetMapCall struct {
+	s    *Service
+	opt_ map[string]interface{}
+}
+
+// GetMap: Get a map.
+func (r *AtlasService) GetMap() *AtlasGetMapCall {
+	c := &AtlasGetMapCall{s: r.s, opt_: make(map[string]interface{})}
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *AtlasGetMapCall) Fields(s ...googleapi.Field) *AtlasGetMapCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *AtlasGetMapCall) Do() (map[string]string, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "map")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.SetOpaque(req.URL)
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret map[string]string
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Get a map.",
+	//   "httpMethod": "GET",
+	//   "id": "mapofstrings.getMap",
+	//   "path": "map",
+	//   "response": {
+	//     "$ref": "GetMapResponse"
+	//   }
+	// }
+
+}
diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/quotednum.json b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/quotednum.json
new file mode 100644
index 00000000..738555e6
--- /dev/null
+++ b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/quotednum.json
@@ -0,0 +1,94 @@
+{
+ "kind": "discovery#restDescription",
+ "etag": "\"DGgqtFnjgu83tuwvvVNNUhOiHWk/1UCG4CqfTBrxPN0MRjUm7GaLJ7Y\"",
+ "discoveryVersion": "v1",
+ "id": "adexchangebuyer:v1.1",
+ "name": "adexchangebuyer",
+ "version": "v1.1",
+ "title": "Ad Exchange Buyer API",
+ "description": "Lets you manage your Ad Exchange Buyer account.",
+ "ownerDomain": "google.com",
+ "ownerName": "Google",
+ "icons": {
+  "x16": "http://www.google.com/images/icons/product/doubleclick-16.gif",
+  "x32": "http://www.google.com/images/icons/product/doubleclick-32.gif"
+ },
+ "documentationLink": "https://developers.google.com/ad-exchange/buyer-rest",
+ "protocol": "rest",
+ "baseUrl": "https://www.googleapis.com/adexchangebuyer/v1.1/",
+ "basePath": "/adexchangebuyer/v1.1/",
+ "rootUrl": "https://www.googleapis.com/",
+ "servicePath": "adexchangebuyer/v1.1/",
+ "batchPath": "batch",
+ "parameters": {
+  "alt": {
+   "type": "string",
+   "description": "Data format for the response.",
+   "default": "json",
+   "enum": [
+    "json"
+   ],
+   "enumDescriptions": [
+    "Responses with Content-Type of application/json"
+   ],
+   "location": "query"
+  },
+  "fields": {
+   "type": "string",
+   "description": "Selector specifying which fields to include in a partial response.",
+   "location": "query"
+  },
+  "key": {
+   "type": "string",
+   "description": "API key. Your API key identifies your project and provides you with API access, quota, and reports. Required unless you provide an OAuth 2.0 token.",
+   "location": "query"
+  },
+  "oauth_token": {
+   "type": "string",
+   "description": "OAuth 2.0 token for the current user.",
+   "location": "query"
+  },
+  "prettyPrint": {
+   "type": "boolean",
+   "description": "Returns response with indentations and line breaks.",
+   "default": "true",
+   "location": "query"
+  },
+  "quotaUser": {
+   "type": "string",
+   "description": "Available to use for quota purposes for server-side applications. Can be any arbitrary string assigned to a user, but should not exceed 40 characters. Overrides userIp if both are provided.",
+   "location": "query"
+  },
+  "userIp": {
+   "type": "string",
+   "description": "IP address of the site where the request originates. Use this if you want to enforce per-user limits.",
+   "location": "query"
+  }
+ },
+ "auth": {
+  "oauth2": {
+   "scopes": {
+    "https://www.googleapis.com/auth/adexchange.buyer": {
+     "description": "Manage your Ad Exchange buyer account configuration"
+    }
+   }
+  }
+ },
+ "schemas": {
+  "Creative": {
+   "id": "Creative",
+   "type": "object",
+   "description": "A creative and its classification data.",
+   "properties": {
+    "advertiserId": {
+     "type": "array",
+     "description": "Detected advertiser id, if any. Read-only. This field should not be set in requests.",
+     "items": {
+      "type": "string",
+      "format": "int64"
+     }
+    }
+   }
+  }
+ }
+}
diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/quotednum.want b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/quotednum.want
new file mode 100644
index 00000000..6efa3968
--- /dev/null
+++ b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/quotednum.want
@@ -0,0 +1,65 @@
+// Package adexchangebuyer provides access to the Ad Exchange Buyer API.
+//
+// See https://developers.google.com/ad-exchange/buyer-rest
+//
+// Usage example:
+//
+//   import "google.golang.org/api/adexchangebuyer/v1.1"
+//   ...
+//   adexchangebuyerService, err := adexchangebuyer.New(oauthHttpClient)
+package adexchangebuyer
+
+import (
+	"bytes"
+	"google.golang.org/api/googleapi"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"strconv"
+	"strings"
+)
+
+// Always reference these packages, just in case the auto-generated code
+// below doesn't.
+var _ = bytes.NewBuffer
+var _ = strconv.Itoa
+var _ = fmt.Sprintf
+var _ = json.NewDecoder
+var _ = io.Copy
+var _ = url.Parse
+var _ = googleapi.Version
+var _ = errors.New
+var _ = strings.Replace
+
+const apiId = "adexchangebuyer:v1.1"
+const apiName = "adexchangebuyer"
+const apiVersion = "v1.1"
+const basePath = "https://www.googleapis.com/adexchangebuyer/v1.1/"
+
+// OAuth2 scopes used by this API.
+const (
+	// Manage your Ad Exchange buyer account configuration
+	AdexchangeBuyerScope = "https://www.googleapis.com/auth/adexchange.buyer"
+)
+
+func New(client *http.Client) (*Service, error) {
+	if client == nil {
+		return nil, errors.New("client is nil")
+	}
+	s := &Service{client: client, BasePath: basePath}
+	return s, nil
+}
+
+type Service struct {
+	client   *http.Client
+	BasePath string // API endpoint base URL
+}
+
+type Creative struct {
+	// AdvertiserId: Detected advertiser id, if any. Read-only. This field
+	// should not be set in requests.
+	AdvertiserId googleapi.Int64s `json:"advertiserId,omitempty"`
+}
diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/resource-named-service.json b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/resource-named-service.json
new file mode 100644
index 00000000..53b7b164
--- /dev/null
+++ b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/resource-named-service.json
@@ -0,0 +1,2199 @@
+{
+ "kind": "discovery#restDescription",
+ "etag": "\"DGgqtFnjgu83tuwvvVNNUhOiHWk/HqXrvEeuZV7fVbX7lTgVYLdSy_g\"",
+ "discoveryVersion": "v1",
+ "id": "blogger:v3",
+ "name": "blogger",
+ "version": "v3",
+ "title": "Blogger API",
+ "description": "API for access to the data within Blogger.",
+ "ownerDomain": "google.com",
+ "ownerName": "Google",
+ "icons": {
+  "x16": "http://www.google.com/images/icons/product/blogger-16.png",
+  "x32": "http://www.google.com/images/icons/product/blogger-32.png"
+ },
+ "documentationLink": "https://developers.google.com/blogger/docs/3.0/getting_started",
+ "labels": [
+  "limited_availability"
+ ],
+ "protocol": "rest",
+ "baseUrl": "https://www.googleapis.com/blogger/v3/",
+ "basePath": "/blogger/v3/",
+ "rootUrl": "https://www.googleapis.com/",
+ "servicePath": "blogger/v3/",
+ "batchPath": "batch",
+ "parameters": {
+  "alt": {
+   "type": "string",
+   "description": "Data format for the response.",
+   "default": "json",
+   "enum": [
+    "json"
+   ],
+   "enumDescriptions": [
+    "Responses with Content-Type of application/json"
+   ],
+   "location": "query"
+  },
+  "fields": {
+   "type": "string",
+   "description": "Selector specifying which fields to include in a partial response.",
+   "location": "query"
+  },
+  "key": {
+   "type": "string",
+   "description": "API key. Your API key identifies your project and provides you with API access, quota, and reports. Required unless you provide an OAuth 2.0 token.",
+   "location": "query"
+  },
+  "oauth_token": {
+   "type": "string",
+   "description": "OAuth 2.0 token for the current user.",
+   "location": "query"
+  },
+  "prettyPrint": {
+   "type": "boolean",
+   "description": "Returns response with indentations and line breaks.",
+   "default": "true",
+   "location": "query"
+  },
+  "quotaUser": {
+   "type": "string",
+   "description": "Available to use for quota purposes for server-side applications. Can be any arbitrary string assigned to a user, but should not exceed 40 characters. Overrides userIp if both are provided.",
+   "location": "query"
+  },
+  "userIp": {
+   "type": "string",
+   "description": "IP address of the site where the request originates. Use this if you want to enforce per-user limits.",
+   "location": "query"
+  }
+ },
+ "auth": {
+  "oauth2": {
+   "scopes": {
+    "https://www.googleapis.com/auth/blogger": {
+     "description": "Manage your Blogger account"
+    },
+    "https://www.googleapis.com/auth/blogger.readonly": {
+     "description": "View your Blogger account"
+    }
+   }
+  }
+ },
+ "schemas": {
+  "Blog": {
+   "id": "Blog",
+   "type": "object",
+   "properties": {
+    "customMetaData": {
+     "type": "string",
+     "description": "The JSON custom meta-data for the Blog"
+    },
+    "description": {
+     "type": "string",
+     "description": "The description of this blog. This is displayed underneath the title."
+    },
+    "id": {
+     "type": "string",
+     "description": "The identifier for this resource."
+    },
+    "kind": {
+     "type": "string",
+     "description": "The kind of this entry. Always blogger#blog",
+     "default": "blogger#blog"
+    },
+    "locale": {
+     "type": "object",
+     "description": "The locale this Blog is set to.",
+     "properties": {
+      "country": {
+       "type": "string",
+       "description": "The country this blog's locale is set to."
+      },
+      "language": {
+       "type": "string",
+       "description": "The language this blog is authored in."
+      },
+      "variant": {
+       "type": "string",
+       "description": "The language variant this blog is authored in."
+      }
+     }
+    },
+    "name": {
+     "type": "string",
+     "description": "The name of this blog. This is displayed as the title."
+    },
+    "pages": {
+     "type": "object",
+     "description": "The container of pages in this blog.",
+     "properties": {
+      "selfLink": {
+       "type": "string",
+       "description": "The URL of the container for pages in this blog."
+      },
+      "totalItems": {
+       "type": "integer",
+       "description": "The count of pages in this blog.",
+       "format": "int32"
+      }
+     }
+    },
+    "posts": {
+     "type": "object",
+     "description": "The container of posts in this blog.",
+     "properties": {
+      "items": {
+       "type": "array",
+       "description": "The List of Posts for this Blog.",
+       "items": {
+        "$ref": "Post"
+       }
+      },
+      "selfLink": {
+       "type": "string",
+       "description": "The URL of the container for posts in this blog."
+      },
+      "totalItems": {
+       "type": "integer",
+       "description": "The count of posts in this blog.",
+       "format": "int32"
+      }
+     }
+    },
+    "published": {
+     "type": "string",
+     "description": "RFC 3339 date-time when this blog was published.",
+     "format": "date-time"
+    },
+    "selfLink": {
+     "type": "string",
+     "description": "The API REST URL to fetch this resource from."
+    },
+    "updated": {
+     "type": "string",
+     "description": "RFC 3339 date-time when this blog was last updated.",
+     "format": "date-time"
+    },
+    "url": {
+     "type": "string",
+     "description": "The URL where this blog is published."
+    }
+   }
+  },
+  "BlogList": {
+   "id": "BlogList",
+   "type": "object",
+   "properties": {
+    "blogUserInfos": {
+     "type": "array",
+     "description": "Admin level list of blog per-user information",
+     "items": {
+      "$ref": "Service"
+     }
+    },
+    "items": {
+     "type": "array",
+     "description": "The list of Blogs this user has Authorship or Admin rights over.",
+     "items": {
+      "$ref": "Blog"
+     }
+    },
+    "kind": {
+     "type": "string",
+     "description": "The kind of this entity. Always blogger#blogList",
+     "default": "blogger#blogList"
+    }
+   }
+  },
+  "BlogPerUserInfo": {
+   "id": "BlogPerUserInfo",
+   "type": "object",
+   "properties": {
+    "blogId": {
+     "type": "string",
+     "description": "ID of the Blog resource"
+    },
+    "hasAdminAccess": {
+     "type": "boolean",
+     "description": "True if the user has Admin level access to the blog."
+    },
+    "kind": {
+     "type": "string",
+     "description": "The kind of this entity. Always blogger#blogPerUserInfo",
+     "default": "blogger#blogPerUserInfo"
+    },
+    "photosAlbumKey": {
+     "type": "string",
+     "description": "The Photo Album Key for the user when adding photos to the blog"
+    },
+    "userId": {
+     "type": "string",
+     "description": "ID of the User"
+    }
+   }
+  },
+  "Service": {
+   "id": "Service",
+   "type": "object",
+   "properties": {
+    "blog": {
+     "$ref": "Blog",
+     "description": "The Blog resource."
+    },
+    "blog_user_info": {
+     "$ref": "BlogPerUserInfo",
+     "description": "Information about a User for the Blog."
+    },
+    "kind": {
+     "type": "string",
+     "description": "The kind of this entity. Always blogger#blogUserInfo",
+     "default": "blogger#blogUserInfo"
+    }
+   }
+  },
+  "Comment": {
+   "id": "Comment",
+   "type": "object",
+   "properties": {
+    "author": {
+     "type": "object",
+     "description": "The author of this Comment.",
+     "properties": {
+      "displayName": {
+       "type": "string",
+       "description": "The display name."
+      },
+      "id": {
+       "type": "string",
+       "description": "The identifier of the Comment creator."
+      },
+      "image": {
+       "type": "object",
+       "description": "The comment creator's avatar.",
+       "properties": {
+        "url": {
+         "type": "string",
+         "description": "The comment creator's avatar URL."
+        }
+       }
+      },
+      "url": {
+       "type": "string",
+       "description": "The URL of the Comment creator's Profile page."
+      }
+     }
+    },
+    "blog": {
+     "type": "object",
+     "description": "Data about the blog containing this comment.",
+     "properties": {
+      "id": {
+       "type": "string",
+       "description": "The identifier of the blog containing this comment."
+      }
+     }
+    },
+    "content": {
+     "type": "string",
+     "description": "The actual content of the comment. May include HTML markup."
+    },
+    "id": {
+     "type": "string",
+     "description": "The identifier for this resource."
+    },
+    "inReplyTo": {
+     "type": "object",
+     "description": "Data about the comment this is in reply to.",
+     "properties": {
+      "id": {
+       "type": "string",
+       "description": "The identified of the parent of this comment."
+      }
+     }
+    },
+    "kind": {
+     "type": "string",
+     "description": "The kind of this entry. Always blogger#comment",
+     "default": "blogger#comment"
+    },
+    "post": {
+     "type": "object",
+     "description": "Data about the post containing this comment.",
+     "properties": {
+      "id": {
+       "type": "string",
+       "description": "The identifier of the post containing this comment."
+      }
+     }
+    },
+    "published": {
+     "type": "string",
+     "description": "RFC 3339 date-time when this comment was published.",
+     "format": "date-time"
+    },
+    "selfLink": {
+     "type": "string",
+     "description": "The API REST URL to fetch this resource from."
+    },
+    "status": {
+     "type": "string",
+     "description": "The status of the comment (only populated for admin users)"
+    },
+    "updated": {
+     "type": "string",
+     "description": "RFC 3339 date-time when this comment was last updated.",
+     "format": "date-time"
+    }
+   }
+  },
+  "CommentList": {
+   "id": "CommentList",
+   "type": "object",
+   "properties": {
+    "items": {
+     "type": "array",
+     "description": "The List of Comments for a Post.",
+     "items": {
+      "$ref": "Comment"
+     }
+    },
+    "kind": {
+     "type": "string",
+     "description": "The kind of this entry. Always blogger#commentList",
+     "default": "blogger#commentList"
+    },
+    "nextPageToken": {
+     "type": "string",
+     "description": "Pagination token to fetch the next page, if one exists."
+    },
+    "prevPageToken": {
+     "type": "string",
+     "description": "Pagination token to fetch the previous page, if one exists."
+    }
+   }
+  },
+  "Page": {
+   "id": "Page",
+   "type": "object",
+   "properties": {
+    "author": {
+     "type": "object",
+     "description": "The author of this Page.",
+     "properties": {
+      "displayName": {
+       "type": "string",
+       "description": "The display name."
+      },
+      "id": {
+       "type": "string",
+       "description": "The identifier of the Page creator."
+      },
+      "image": {
+       "type": "object",
+       "description": "The page author's avatar.",
+       "properties": {
+        "url": {
+         "type": "string",
+         "description": "The page author's avatar URL."
+        }
+       }
+      },
+      "url": {
+       "type": "string",
+       "description": "The URL of the Page creator's Profile page."
+      }
+     }
+    },
+    "blog": {
+     "type": "object",
+     "description": "Data about the blog containing this Page.",
+     "properties": {
+      "id": {
+       "type": "string",
+       "description": "The identifier of the blog containing this page."
+      }
+     }
+    },
+    "content": {
+     "type": "string",
+     "description": "The body content of this Page, in HTML."
+    },
+    "id": {
+     "type": "string",
+     "description": "The identifier for this resource."
+    },
+    "kind": {
+     "type": "string",
+     "description": "The kind of this entity. Always blogger#page",
+     "default": "blogger#page"
+    },
+    "published": {
+     "type": "string",
+     "description": "RFC 3339 date-time when this Page was published.",
+     "format": "date-time"
+    },
+    "selfLink": {
+     "type": "string",
+     "description": "The API REST URL to fetch this resource from."
+    },
+    "status": {
+     "type": "string",
+     "description": "The status of the page for admin resources (either LIVE or DRAFT)."
+    },
+    "title": {
+     "type": "string",
+     "description": "The title of this entity. This is the name displayed in the Admin user interface."
+    },
+    "updated": {
+     "type": "string",
+     "description": "RFC 3339 date-time when this Page was last updated.",
+     "format": "date-time"
+    },
+    "url": {
+     "type": "string",
+     "description": "The URL that this Page is displayed at."
+    }
+   }
+  },
+  "PageList": {
+   "id": "PageList",
+   "type": "object",
+   "properties": {
+    "items": {
+     "type": "array",
+     "description": "The list of Pages for a Blog.",
+     "items": {
+      "$ref": "Page"
+     }
+    },
+    "kind": {
+     "type": "string",
+     "description": "The kind of this entity. Always blogger#pageList",
+     "default": "blogger#pageList"
+    }
+   }
+  },
+  "Pageviews": {
+   "id": "Pageviews",
+   "type": "object",
+   "properties": {
+    "blogId": {
+     "type": "string",
+     "description": "Blog Id",
+     "format": "int64"
+    },
+    "counts": {
+     "type": "array",
+     "description": "The container of posts in this blog.",
+     "items": {
+      "type": "object",
+      "properties": {
+       "count": {
+        "type": "string",
+        "description": "Count of page views for the given time range",
+        "format": "int64"
+       },
+       "timeRange": {
+        "type": "string",
+        "description": "Time range the given count applies to"
+       }
+      }
+     }
+    },
+    "kind": {
+     "type": "string",
+     "description": "The kind of this entry. Always blogger#page_views",
+     "default": "blogger#page_views"
+    }
+   }
+  },
+  "Post": {
+   "id": "Post",
+   "type": "object",
+   "properties": {
+    "author": {
+     "type": "object",
+     "description": "The author of this Post.",
+     "properties": {
+      "displayName": {
+       "type": "string",
+       "description": "The display name."
+      },
+      "id": {
+       "type": "string",
+       "description": "The identifier of the Post creator."
+      },
+      "image": {
+       "type": "object",
+       "description": "The Post author's avatar.",
+       "properties": {
+        "url": {
+         "type": "string",
+         "description": "The Post author's avatar URL."
+        }
+       }
+      },
+      "url": {
+       "type": "string",
+       "description": "The URL of the Post creator's Profile page."
+      }
+     }
+    },
+    "blog": {
+     "type": "object",
+     "description": "Data about the blog containing this Post.",
+     "properties": {
+      "id": {
+       "type": "string",
+       "description": "The identifier of the Blog that contains this Post."
+      }
+     }
+    },
+    "content": {
+     "type": "string",
+     "description": "The content of the Post. May contain HTML markup."
+    },
+    "customMetaData": {
+     "type": "string",
+     "description": "The JSON meta-data for the Post."
+    },
+    "id": {
+     "type": "string",
+     "description": "The identifier of this Post."
+    },
+    "images": {
+     "type": "array",
+     "description": "Display image for the Post.",
+     "items": {
+      "type": "object",
+      "properties": {
+       "url": {
+        "type": "string"
+       }
+      }
+     }
+    },
+    "kind": {
+     "type": "string",
+     "description": "The kind of this entity. Always blogger#post",
+     "default": "blogger#post"
+    },
+    "labels": {
+     "type": "array",
+     "description": "The list of labels this Post was tagged with.",
+     "items": {
+      "type": "string"
+     }
+    },
+    "location": {
+     "type": "object",
+     "description": "The location for geotagged posts.",
+     "properties": {
+      "lat": {
+       "type": "number",
+       "description": "Location's latitude.",
+       "format": "double"
+      },
+      "lng": {
+       "type": "number",
+       "description": "Location's longitude.",
+       "format": "double"
+      },
+      "name": {
+       "type": "string",
+       "description": "Location name."
+      },
+      "span": {
+       "type": "string",
+       "description": "Location's viewport span. Can be used when rendering a map preview."
+      }
+     }
+    },
+    "published": {
+     "type": "string",
+     "description": "RFC 3339 date-time when this Post was published.",
+     "format": "date-time"
+    },
+    "replies": {
+     "type": "object",
+     "description": "The container of comments on this Post.",
+     "properties": {
+      "items": {
+       "type": "array",
+       "description": "The List of Comments for this Post.",
+       "items": {
+        "$ref": "Comment"
+       }
+      },
+      "selfLink": {
+       "type": "string",
+       "description": "The URL of the comments on this post."
+      },
+      "totalItems": {
+       "type": "string",
+       "description": "The count of comments on this post.",
+       "format": "int64"
+      }
+     }
+    },
+    "selfLink": {
+     "type": "string",
+     "description": "The API REST URL to fetch this resource from."
+    },
+    "status": {
+     "type": "string",
+     "description": "Status of the post. Only set for admin-level requests"
+    },
+    "title": {
+     "type": "string",
+     "description": "The title of the Post."
+    },
+    "titleLink": {
+     "type": "string",
+     "description": "The title link URL, similar to atom's related link."
+    },
+    "updated": {
+     "type": "string",
+     "description": "RFC 3339 date-time when this Post was last updated.",
+     "format": "date-time"
+    },
+    "url": {
+     "type": "string",
+     "description": "The URL where this Post is displayed."
+    }
+   }
+  },
+  "PostList": {
+   "id": "PostList",
+   "type": "object",
+   "properties": {
+    "items": {
+     "type": "array",
+     "description": "The list of Posts for this Blog.",
+     "items": {
+      "$ref": "Post"
+     }
+    },
+    "kind": {
+     "type": "string",
+     "description": "The kind of this entity. Always blogger#postList",
+     "default": "blogger#postList"
+    },
+    "nextPageToken": {
+     "type": "string",
+     "description": "Pagination token to fetch the next page, if one exists."
+    }
+   }
+  },
+  "PostPerUserInfo": {
+   "id": "PostPerUserInfo",
+   "type": "object",
+   "properties": {
+    "blogId": {
+     "type": "string",
+     "description": "ID of the Blog that the post resource belongs to."
+    },
+    "hasEditAccess": {
+     "type": "boolean",
+     "description": "True if the user has Author level access to the post."
+    },
+    "kind": {
+     "type": "string",
+     "description": "The kind of this entity. Always blogger#postPerUserInfo",
+     "default": "blogger#postPerUserInfo"
+    },
+    "postId": {
+     "type": "string",
+     "description": "ID of the Post resource."
+    },
+    "userId": {
+     "type": "string",
+     "description": "ID of the User."
+    }
+   }
+  },
+  "PostUserInfo": {
+   "id": "PostUserInfo",
+   "type": "object",
+   "properties": {
+    "kind": {
+     "type": "string",
+     "description": "The kind of this entity. Always blogger#postUserInfo",
+     "default": "blogger#postUserInfo"
+    },
+    "post": {
+     "$ref": "Post",
+     "description": "The Post resource."
+    },
+    "post_user_info": {
+     "$ref": "PostPerUserInfo",
+     "description": "Information about a User for the Post."
+    }
+   }
+  },
+  "PostUserInfosList": {
+   "id": "PostUserInfosList",
+   "type": "object",
+   "properties": {
+    "items": {
+     "type": "array",
+     "description": "The list of Posts with User information for the post, for this Blog.",
+     "items": {
+      "$ref": "PostUserInfo"
+     }
+    },
+    "kind": {
+     "type": "string",
+     "description": "The kind of this entity. Always blogger#postList",
+     "default": "blogger#postUserInfosList"
+    },
+    "nextPageToken": {
+     "type": "string",
+     "description": "Pagination token to fetch the next page, if one exists."
+    }
+   }
+  },
+  "User": {
+   "id": "User",
+   "type": "object",
+   "properties": {
+    "about": {
+     "type": "string",
+     "description": "Profile summary information."
+    },
+    "blogs": {
+     "type": "object",
+     "description": "The container of blogs for this user.",
+     "properties": {
+      "selfLink": {
+       "type": "string",
+       "description": "The URL of the Blogs for this user."
+      }
+     }
+    },
+    "created": {
+     "type": "string",
+     "description": "The timestamp of when this profile was created, in seconds since epoch.",
+     "format": "date-time"
+    },
+    "displayName": {
+     "type": "string",
+     "description": "The display name."
+    },
+    "id": {
+     "type": "string",
+     "description": "The identifier for this User."
+    },
+    "kind": {
+     "type": "string",
+     "description": "The kind of this entity. Always blogger#user",
+     "default": "blogger#user"
+    },
+    "locale": {
+     "type": "object",
+     "description": "This user's locale",
+     "properties": {
+      "country": {
+       "type": "string",
+       "description": "The user's country setting."
+      },
+      "language": {
+       "type": "string",
+       "description": "The user's language setting."
+      },
+      "variant": {
+       "type": "string",
+       "description": "The user's language variant setting."
+      }
+     }
+    },
+    "selfLink": {
+     "type": "string",
+     "description": "The API REST URL to fetch this resource from."
+    },
+    "url": {
+     "type": "string",
+     "description": "The user's profile page."
+    }
+   }
+  }
+ },
+ "resources": {
+  "blogUserInfos": {
+   "methods": {
+    "get": {
+     "id": "blogger.blogUserInfos.get",
+     "path": "users/{userId}/blogs/{blogId}",
+     "httpMethod": "GET",
+     "description": "Gets one blog and user info pair by blogId and userId.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "The ID of the blog to get.",
+       "required": true,
+       "location": "path"
+      },
+      "maxPosts": {
+       "type": "integer",
+       "description": "Maximum number of posts to pull back with the blog.",
+       "format": "uint32",
+       "location": "query"
+      },
+      "userId": {
+       "type": "string",
+       "description": "ID of the user whose blogs are to be fetched. Either the word 'self' (sans quote marks) or the user's profile identifier.",
+       "required": true,
+       "location": "path"
+      }
+     },
+     "parameterOrder": [
+      "userId",
+      "blogId"
+     ],
+     "response": {
+      "$ref": "Service"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger",
+      "https://www.googleapis.com/auth/blogger.readonly"
+     ]
+    }
+   }
+  },
+  "blogs": {
+   "methods": {
+    "get": {
+     "id": "blogger.blogs.get",
+     "path": "blogs/{blogId}",
+     "httpMethod": "GET",
+     "description": "Gets one blog by id.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "The ID of the blog to get.",
+       "required": true,
+       "location": "path"
+      },
+      "maxPosts": {
+       "type": "integer",
+       "description": "Maximum number of posts to pull back with the blog.",
+       "format": "uint32",
+       "location": "query"
+      }
+     },
+     "parameterOrder": [
+      "blogId"
+     ],
+     "response": {
+      "$ref": "Blog"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger",
+      "https://www.googleapis.com/auth/blogger.readonly"
+     ]
+    },
+    "getByUrl": {
+     "id": "blogger.blogs.getByUrl",
+     "path": "blogs/byurl",
+     "httpMethod": "GET",
+     "description": "Retrieve a Blog by URL.",
+     "parameters": {
+      "url": {
+       "type": "string",
+       "description": "The URL of the blog to retrieve.",
+       "required": true,
+       "location": "query"
+      }
+     },
+     "parameterOrder": [
+      "url"
+     ],
+     "response": {
+      "$ref": "Blog"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger",
+      "https://www.googleapis.com/auth/blogger.readonly"
+     ]
+    },
+    "listByUser": {
+     "id": "blogger.blogs.listByUser",
+     "path": "users/{userId}/blogs",
+     "httpMethod": "GET",
+     "description": "Retrieves a list of blogs, possibly filtered.",
+     "parameters": {
+      "fetchUserInfo": {
+       "type": "boolean",
+       "description": "Whether the response is a list of blogs with per-user information instead of just blogs.",
+       "location": "query"
+      },
+      "userId": {
+       "type": "string",
+       "description": "ID of the user whose blogs are to be fetched. Either the word 'self' (sans quote marks) or the user's profile identifier.",
+       "required": true,
+       "location": "path"
+      },
+      "view": {
+       "type": "string",
+       "enum": [
+        "ADMIN",
+        "AUTHOR",
+        "READER"
+       ],
+       "enumDescriptions": [
+        "Admin level detail",
+        "Author level detail",
+        "Admin level detail"
+       ],
+       "location": "query"
+      }
+     },
+     "parameterOrder": [
+      "userId"
+     ],
+     "response": {
+      "$ref": "BlogList"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger",
+      "https://www.googleapis.com/auth/blogger.readonly"
+     ]
+    }
+   }
+  },
+  "comments": {
+   "methods": {
+    "approve": {
+     "id": "blogger.comments.approve",
+     "path": "blogs/{blogId}/posts/{postId}/comments/{commentId}/approve",
+     "httpMethod": "POST",
+     "description": "Marks a comment as not spam.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "The Id of the Blog.",
+       "required": true,
+       "location": "path"
+      },
+      "commentId": {
+       "type": "string",
+       "description": "The ID of the comment to mark as not spam.",
+       "required": true,
+       "location": "path"
+      },
+      "postId": {
+       "type": "string",
+       "description": "The ID of the Post.",
+       "required": true,
+       "location": "path"
+      }
+     },
+     "parameterOrder": [
+      "blogId",
+      "postId",
+      "commentId"
+     ],
+     "response": {
+      "$ref": "Comment"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger"
+     ]
+    },
+    "delete": {
+     "id": "blogger.comments.delete",
+     "path": "blogs/{blogId}/posts/{postId}/comments/{commentId}",
+     "httpMethod": "DELETE",
+     "description": "Delete a comment by id.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "The Id of the Blog.",
+       "required": true,
+       "location": "path"
+      },
+      "commentId": {
+       "type": "string",
+       "description": "The ID of the comment to delete.",
+       "required": true,
+       "location": "path"
+      },
+      "postId": {
+       "type": "string",
+       "description": "The ID of the Post.",
+       "required": true,
+       "location": "path"
+      }
+     },
+     "parameterOrder": [
+      "blogId",
+      "postId",
+      "commentId"
+     ],
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger"
+     ]
+    },
+    "get": {
+     "id": "blogger.comments.get",
+     "path": "blogs/{blogId}/posts/{postId}/comments/{commentId}",
+     "httpMethod": "GET",
+     "description": "Gets one comment by id.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "ID of the blog to containing the comment.",
+       "required": true,
+       "location": "path"
+      },
+      "commentId": {
+       "type": "string",
+       "description": "The ID of the comment to get.",
+       "required": true,
+       "location": "path"
+      },
+      "postId": {
+       "type": "string",
+       "description": "ID of the post to fetch posts from.",
+       "required": true,
+       "location": "path"
+      }
+     },
+     "parameterOrder": [
+      "blogId",
+      "postId",
+      "commentId"
+     ],
+     "response": {
+      "$ref": "Comment"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger",
+      "https://www.googleapis.com/auth/blogger.readonly"
+     ]
+    },
+    "list": {
+     "id": "blogger.comments.list",
+     "path": "blogs/{blogId}/posts/{postId}/comments",
+     "httpMethod": "GET",
+     "description": "Retrieves the comments for a post, possibly filtered.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "ID of the blog to fetch comments from.",
+       "required": true,
+       "location": "path"
+      },
+      "endDate": {
+       "type": "string",
+       "description": "Latest date of comment to fetch, a date-time with RFC 3339 formatting.",
+       "format": "date-time",
+       "location": "query"
+      },
+      "fetchBodies": {
+       "type": "boolean",
+       "description": "Whether the body content of the comments is included.",
+       "location": "query"
+      },
+      "maxResults": {
+       "type": "integer",
+       "description": "Maximum number of comments to include in the result.",
+       "format": "uint32",
+       "location": "query"
+      },
+      "pageToken": {
+       "type": "string",
+       "description": "Continuation token if request is paged.",
+       "location": "query"
+      },
+      "postId": {
+       "type": "string",
+       "description": "ID of the post to fetch posts from.",
+       "required": true,
+       "location": "path"
+      },
+      "startDate": {
+       "type": "string",
+       "description": "Earliest date of comment to fetch, a date-time with RFC 3339 formatting.",
+       "format": "date-time",
+       "location": "query"
+      },
+      "statuses": {
+       "type": "string",
+       "enum": [
+        "emptied",
+        "live",
+        "pending",
+        "spam"
+       ],
+       "enumDescriptions": [
+        "Comments that have had their content removed",
+        "Comments that are publicly visible",
+        "Comments that are awaiting administrator approval",
+        "Comments marked as spam by the administrator"
+       ],
+       "repeated": true,
+       "location": "query"
+      },
+      "view": {
+       "type": "string",
+       "enum": [
+        "ADMIN",
+        "AUTHOR",
+        "READER"
+       ],
+       "enumDescriptions": [
+        "Admin level detail",
+        "Author level detail",
+        "Admin level detail"
+       ],
+       "location": "query"
+      }
+     },
+     "parameterOrder": [
+      "blogId",
+      "postId"
+     ],
+     "response": {
+      "$ref": "CommentList"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger",
+      "https://www.googleapis.com/auth/blogger.readonly"
+     ]
+    },
+    "listByBlog": {
+     "id": "blogger.comments.listByBlog",
+     "path": "blogs/{blogId}/comments",
+     "httpMethod": "GET",
+     "description": "Retrieves the comments for a blog, across all posts, possibly filtered.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "ID of the blog to fetch comments from.",
+       "required": true,
+       "location": "path"
+      },
+      "endDate": {
+       "type": "string",
+       "description": "Latest date of comment to fetch, a date-time with RFC 3339 formatting.",
+       "format": "date-time",
+       "location": "query"
+      },
+      "fetchBodies": {
+       "type": "boolean",
+       "description": "Whether the body content of the comments is included.",
+       "location": "query"
+      },
+      "maxResults": {
+       "type": "integer",
+       "description": "Maximum number of comments to include in the result.",
+       "format": "uint32",
+       "location": "query"
+      },
+      "pageToken": {
+       "type": "string",
+       "description": "Continuation token if request is paged.",
+       "location": "query"
+      },
+      "startDate": {
+       "type": "string",
+       "description": "Earliest date of comment to fetch, a date-time with RFC 3339 formatting.",
+       "format": "date-time",
+       "location": "query"
+      }
+     },
+     "parameterOrder": [
+      "blogId"
+     ],
+     "response": {
+      "$ref": "CommentList"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger",
+      "https://www.googleapis.com/auth/blogger.readonly"
+     ]
+    },
+    "markAsSpam": {
+     "id": "blogger.comments.markAsSpam",
+     "path": "blogs/{blogId}/posts/{postId}/comments/{commentId}/spam",
+     "httpMethod": "POST",
+     "description": "Marks a comment as spam.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "The Id of the Blog.",
+       "required": true,
+       "location": "path"
+      },
+      "commentId": {
+       "type": "string",
+       "description": "The ID of the comment to mark as spam.",
+       "required": true,
+       "location": "path"
+      },
+      "postId": {
+       "type": "string",
+       "description": "The ID of the Post.",
+       "required": true,
+       "location": "path"
+      }
+     },
+     "parameterOrder": [
+      "blogId",
+      "postId",
+      "commentId"
+     ],
+     "response": {
+      "$ref": "Comment"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger"
+     ]
+    },
+    "removeContent": {
+     "id": "blogger.comments.removeContent",
+     "path": "blogs/{blogId}/posts/{postId}/comments/{commentId}/removecontent",
+     "httpMethod": "POST",
+     "description": "Removes the content of a comment.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "The Id of the Blog.",
+       "required": true,
+       "location": "path"
+      },
+      "commentId": {
+       "type": "string",
+       "description": "The ID of the comment to delete content from.",
+       "required": true,
+       "location": "path"
+      },
+      "postId": {
+       "type": "string",
+       "description": "The ID of the Post.",
+       "required": true,
+       "location": "path"
+      }
+     },
+     "parameterOrder": [
+      "blogId",
+      "postId",
+      "commentId"
+     ],
+     "response": {
+      "$ref": "Comment"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger"
+     ]
+    }
+   }
+  },
+  "pageViews": {
+   "methods": {
+    "get": {
+     "id": "blogger.pageViews.get",
+     "path": "blogs/{blogId}/pageviews",
+     "httpMethod": "GET",
+     "description": "Retrieve pageview stats for a Blog.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "The ID of the blog to get.",
+       "required": true,
+       "location": "path"
+      },
+      "range": {
+       "type": "string",
+       "enum": [
+        "30DAYS",
+        "7DAYS",
+        "all"
+       ],
+       "enumDescriptions": [
+        "Page view counts from the last thirty days.",
+        "Page view counts from the last seven days.",
+        "Total page view counts from all time."
+       ],
+       "repeated": true,
+       "location": "query"
+      }
+     },
+     "parameterOrder": [
+      "blogId"
+     ],
+     "response": {
+      "$ref": "Pageviews"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger"
+     ]
+    }
+   }
+  },
+  "pages": {
+   "methods": {
+    "delete": {
+     "id": "blogger.pages.delete",
+     "path": "blogs/{blogId}/pages/{pageId}",
+     "httpMethod": "DELETE",
+     "description": "Delete a page by id.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "The Id of the Blog.",
+       "required": true,
+       "location": "path"
+      },
+      "pageId": {
+       "type": "string",
+       "description": "The ID of the Page.",
+       "required": true,
+       "location": "path"
+      }
+     },
+     "parameterOrder": [
+      "blogId",
+      "pageId"
+     ],
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger"
+     ]
+    },
+    "get": {
+     "id": "blogger.pages.get",
+     "path": "blogs/{blogId}/pages/{pageId}",
+     "httpMethod": "GET",
+     "description": "Gets one blog page by id.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "ID of the blog containing the page.",
+       "required": true,
+       "location": "path"
+      },
+      "pageId": {
+       "type": "string",
+       "description": "The ID of the page to get.",
+       "required": true,
+       "location": "path"
+      },
+      "view": {
+       "type": "string",
+       "enum": [
+        "ADMIN",
+        "AUTHOR",
+        "READER"
+       ],
+       "enumDescriptions": [
+        "Admin level detail",
+        "Author level detail",
+        "Admin level detail"
+       ],
+       "location": "query"
+      }
+     },
+     "parameterOrder": [
+      "blogId",
+      "pageId"
+     ],
+     "response": {
+      "$ref": "Page"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger",
+      "https://www.googleapis.com/auth/blogger.readonly"
+     ]
+    },
+    "insert": {
+     "id": "blogger.pages.insert",
+     "path": "blogs/{blogId}/pages",
+     "httpMethod": "POST",
+     "description": "Add a page.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "ID of the blog to add the page to.",
+       "required": true,
+       "location": "path"
+      }
+     },
+     "parameterOrder": [
+      "blogId"
+     ],
+     "request": {
+      "$ref": "Page"
+     },
+     "response": {
+      "$ref": "Page"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger"
+     ]
+    },
+    "list": {
+     "id": "blogger.pages.list",
+     "path": "blogs/{blogId}/pages",
+     "httpMethod": "GET",
+     "description": "Retrieves the pages for a blog, optionally including non-LIVE statuses.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "ID of the blog to fetch pages from.",
+       "required": true,
+       "location": "path"
+      },
+      "fetchBodies": {
+       "type": "boolean",
+       "description": "Whether to retrieve the Page bodies.",
+       "location": "query"
+      },
+      "statuses": {
+       "type": "string",
+       "enum": [
+        "draft",
+        "imported",
+        "live"
+       ],
+       "enumDescriptions": [
+        "Draft (unpublished) Pages",
+        "Pages that have had their content removed",
+        "Pages that are publicly visible"
+       ],
+       "repeated": true,
+       "location": "query"
+      },
+      "view": {
+       "type": "string",
+       "enum": [
+        "ADMIN",
+        "AUTHOR",
+        "READER"
+       ],
+       "enumDescriptions": [
+        "Admin level detail",
+        "Author level detail",
+        "Admin level detail"
+       ],
+       "location": "query"
+      }
+     },
+     "parameterOrder": [
+      "blogId"
+     ],
+     "response": {
+      "$ref": "PageList"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger",
+      "https://www.googleapis.com/auth/blogger.readonly"
+     ]
+    },
+    "patch": {
+     "id": "blogger.pages.patch",
+     "path": "blogs/{blogId}/pages/{pageId}",
+     "httpMethod": "PATCH",
+     "description": "Update a page. This method supports patch semantics.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "The ID of the Blog.",
+       "required": true,
+       "location": "path"
+      },
+      "pageId": {
+       "type": "string",
+       "description": "The ID of the Page.",
+       "required": true,
+       "location": "path"
+      }
+     },
+     "parameterOrder": [
+      "blogId",
+      "pageId"
+     ],
+     "request": {
+      "$ref": "Page"
+     },
+     "response": {
+      "$ref": "Page"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger"
+     ]
+    },
+    "update": {
+     "id": "blogger.pages.update",
+     "path": "blogs/{blogId}/pages/{pageId}",
+     "httpMethod": "PUT",
+     "description": "Update a page.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "The ID of the Blog.",
+       "required": true,
+       "location": "path"
+      },
+      "pageId": {
+       "type": "string",
+       "description": "The ID of the Page.",
+       "required": true,
+       "location": "path"
+      }
+     },
+     "parameterOrder": [
+      "blogId",
+      "pageId"
+     ],
+     "request": {
+      "$ref": "Page"
+     },
+     "response": {
+      "$ref": "Page"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger"
+     ]
+    }
+   }
+  },
+  "postUserInfos": {
+   "methods": {
+    "get": {
+     "id": "blogger.postUserInfos.get",
+     "path": "users/{userId}/blogs/{blogId}/posts/{postId}",
+     "httpMethod": "GET",
+     "description": "Gets one post and user info pair by postId and userId.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "The ID of the blog.",
+       "required": true,
+       "location": "path"
+      },
+      "maxComments": {
+       "type": "integer",
+       "description": "Maximum number of comments to pull back on a post.",
+       "format": "uint32",
+       "location": "query"
+      },
+      "postId": {
+       "type": "string",
+       "description": "The ID of the post to get.",
+       "required": true,
+       "location": "path"
+      },
+      "userId": {
+       "type": "string",
+       "description": "ID of the user for the per-user information to be fetched. Either the word 'self' (sans quote marks) or the user's profile identifier.",
+       "required": true,
+       "location": "path"
+      }
+     },
+     "parameterOrder": [
+      "userId",
+      "blogId",
+      "postId"
+     ],
+     "response": {
+      "$ref": "PostUserInfo"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger",
+      "https://www.googleapis.com/auth/blogger.readonly"
+     ]
+    },
+    "list": {
+     "id": "blogger.postUserInfos.list",
+     "path": "users/{userId}/blogs/{blogId}/posts",
+     "httpMethod": "GET",
+     "description": "Retrieves a list of post and user info pairs, possibly filtered.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "ID of the blog to fetch posts from.",
+       "required": true,
+       "location": "path"
+      },
+      "endDate": {
+       "type": "string",
+       "description": "Latest post date to fetch, a date-time with RFC 3339 formatting.",
+       "format": "date-time",
+       "location": "query"
+      },
+      "fetchBodies": {
+       "type": "boolean",
+       "description": "Whether the body content of posts is included.",
+       "location": "query"
+      },
+      "labels": {
+       "type": "string",
+       "description": "Comma-separated list of labels to search for.",
+       "location": "query"
+      },
+      "maxResults": {
+       "type": "integer",
+       "description": "Maximum number of posts to fetch.",
+       "format": "uint32",
+       "location": "query"
+      },
+      "orderBy": {
+       "type": "string",
+       "description": "Sort search results",
+       "default": "PUBLISHED",
+       "enum": [
+        "published",
+        "updated"
+       ],
+       "enumDescriptions": [
+        "Order by the date the post was published",
+        "Order by the date the post was last updated"
+       ],
+       "location": "query"
+      },
+      "pageToken": {
+       "type": "string",
+       "description": "Continuation token if the request is paged.",
+       "location": "query"
+      },
+      "startDate": {
+       "type": "string",
+       "description": "Earliest post date to fetch, a date-time with RFC 3339 formatting.",
+       "format": "date-time",
+       "location": "query"
+      },
+      "statuses": {
+       "type": "string",
+       "enum": [
+        "draft",
+        "live",
+        "scheduled"
+       ],
+       "enumDescriptions": [
+        "Draft posts",
+        "Published posts",
+        "Posts that are scheduled to publish in future."
+       ],
+       "repeated": true,
+       "location": "query"
+      },
+      "userId": {
+       "type": "string",
+       "description": "ID of the user for the per-user information to be fetched. Either the word 'self' (sans quote marks) or the user's profile identifier.",
+       "required": true,
+       "location": "path"
+      },
+      "view": {
+       "type": "string",
+       "enum": [
+        "ADMIN",
+        "AUTHOR",
+        "READER"
+       ],
+       "enumDescriptions": [
+        "Admin level detail",
+        "Author level detail",
+        "Reader level detail"
+       ],
+       "location": "query"
+      }
+     },
+     "parameterOrder": [
+      "userId",
+      "blogId"
+     ],
+     "response": {
+      "$ref": "PostUserInfosList"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger",
+      "https://www.googleapis.com/auth/blogger.readonly"
+     ]
+    }
+   }
+  },
+  "posts": {
+   "methods": {
+    "delete": {
+     "id": "blogger.posts.delete",
+     "path": "blogs/{blogId}/posts/{postId}",
+     "httpMethod": "DELETE",
+     "description": "Delete a post by id.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "The Id of the Blog.",
+       "required": true,
+       "location": "path"
+      },
+      "postId": {
+       "type": "string",
+       "description": "The ID of the Post.",
+       "required": true,
+       "location": "path"
+      }
+     },
+     "parameterOrder": [
+      "blogId",
+      "postId"
+     ],
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger"
+     ]
+    },
+    "get": {
+     "id": "blogger.posts.get",
+     "path": "blogs/{blogId}/posts/{postId}",
+     "httpMethod": "GET",
+     "description": "Get a post by id.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "ID of the blog to fetch the post from.",
+       "required": true,
+       "location": "path"
+      },
+      "maxComments": {
+       "type": "integer",
+       "description": "Maximum number of comments to pull back on a post.",
+       "format": "uint32",
+       "location": "query"
+      },
+      "postId": {
+       "type": "string",
+       "description": "The ID of the post",
+       "required": true,
+       "location": "path"
+      },
+      "view": {
+       "type": "string",
+       "enum": [
+        "ADMIN",
+        "AUTHOR",
+        "READER"
+       ],
+       "enumDescriptions": [
+        "Admin level detail",
+        "Author level detail",
+        "Admin level detail"
+       ],
+       "location": "query"
+      }
+     },
+     "parameterOrder": [
+      "blogId",
+      "postId"
+     ],
+     "response": {
+      "$ref": "Post"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger",
+      "https://www.googleapis.com/auth/blogger.readonly"
+     ]
+    },
+    "getByPath": {
+     "id": "blogger.posts.getByPath",
+     "path": "blogs/{blogId}/posts/bypath",
+     "httpMethod": "GET",
+     "description": "Retrieve a Post by Path.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "ID of the blog to fetch the post from.",
+       "required": true,
+       "location": "path"
+      },
+      "maxComments": {
+       "type": "integer",
+       "description": "Maximum number of comments to pull back on a post.",
+       "format": "uint32",
+       "location": "query"
+      },
+      "path": {
+       "type": "string",
+       "description": "Path of the Post to retrieve.",
+       "required": true,
+       "location": "query"
+      },
+      "view": {
+       "type": "string",
+       "enum": [
+        "ADMIN",
+        "AUTHOR",
+        "READER"
+       ],
+       "enumDescriptions": [
+        "Admin level detail",
+        "Author level detail",
+        "Admin level detail"
+       ],
+       "location": "query"
+      }
+     },
+     "parameterOrder": [
+      "blogId",
+      "path"
+     ],
+     "response": {
+      "$ref": "Post"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger",
+      "https://www.googleapis.com/auth/blogger.readonly"
+     ]
+    },
+    "insert": {
+     "id": "blogger.posts.insert",
+     "path": "blogs/{blogId}/posts",
+     "httpMethod": "POST",
+     "description": "Add a post.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "ID of the blog to add the post to.",
+       "required": true,
+       "location": "path"
+      },
+      "isDraft": {
+       "type": "boolean",
+       "description": "Whether to create the post as a draft",
+       "location": "query"
+      }
+     },
+     "parameterOrder": [
+      "blogId"
+     ],
+     "request": {
+      "$ref": "Post"
+     },
+     "response": {
+      "$ref": "Post"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger"
+     ]
+    },
+    "list": {
+     "id": "blogger.posts.list",
+     "path": "blogs/{blogId}/posts",
+     "httpMethod": "GET",
+     "description": "Retrieves a list of posts, possibly filtered.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "ID of the blog to fetch posts from.",
+       "required": true,
+       "location": "path"
+      },
+      "endDate": {
+       "type": "string",
+       "description": "Latest post date to fetch, a date-time with RFC 3339 formatting.",
+       "format": "date-time",
+       "location": "query"
+      },
+      "fetchBodies": {
+       "type": "boolean",
+       "description": "Whether the body content of posts is included (default: true). This should be set to false when the post bodies are not required, to help minimize traffic.",
+       "default": "true",
+       "location": "query"
+      },
+      "fetchImages": {
+       "type": "boolean",
+       "description": "Whether image URL metadata for each post is included.",
+       "location": "query"
+      },
+      "labels": {
+       "type": "string",
+       "description": "Comma-separated list of labels to search for.",
+       "location": "query"
+      },
+      "maxResults": {
+       "type": "integer",
+       "description": "Maximum number of posts to fetch.",
+       "format": "uint32",
+       "location": "query"
+      },
+      "orderBy": {
+       "type": "string",
+       "description": "Sort search results",
+       "default": "PUBLISHED",
+       "enum": [
+        "published",
+        "updated"
+       ],
+       "enumDescriptions": [
+        "Order by the date the post was published",
+        "Order by the date the post was last updated"
+       ],
+       "location": "query"
+      },
+      "pageToken": {
+       "type": "string",
+       "description": "Continuation token if the request is paged.",
+       "location": "query"
+      },
+      "startDate": {
+       "type": "string",
+       "description": "Earliest post date to fetch, a date-time with RFC 3339 formatting.",
+       "format": "date-time",
+       "location": "query"
+      },
+      "statuses": {
+       "type": "string",
+       "enum": [
+        "draft",
+        "live",
+        "scheduled"
+       ],
+       "enumDescriptions": [
+        "Draft posts",
+        "Published posts",
+        "Posts that are scheduled to publish in future."
+       ],
+       "repeated": true,
+       "location": "query"
+      },
+      "view": {
+       "type": "string",
+       "enum": [
+        "ADMIN",
+        "AUTHOR",
+        "READER"
+       ],
+       "enumDescriptions": [
+        "Admin level detail",
+        "Author level detail",
+        "Reader level detail"
+       ],
+       "location": "query"
+      }
+     },
+     "parameterOrder": [
+      "blogId"
+     ],
+     "response": {
+      "$ref": "PostList"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger",
+      "https://www.googleapis.com/auth/blogger.readonly"
+     ]
+    },
+    "patch": {
+     "id": "blogger.posts.patch",
+     "path": "blogs/{blogId}/posts/{postId}",
+     "httpMethod": "PATCH",
+     "description": "Update a post. This method supports patch semantics.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "The ID of the Blog.",
+       "required": true,
+       "location": "path"
+      },
+      "postId": {
+       "type": "string",
+       "description": "The ID of the Post.",
+       "required": true,
+       "location": "path"
+      }
+     },
+     "parameterOrder": [
+      "blogId",
+      "postId"
+     ],
+     "request": {
+      "$ref": "Post"
+     },
+     "response": {
+      "$ref": "Post"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger"
+     ]
+    },
+    "publish": {
+     "id": "blogger.posts.publish",
+     "path": "blogs/{blogId}/posts/{postId}/publish",
+     "httpMethod": "POST",
+     "description": "Publish a draft post.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "The ID of the Blog.",
+       "required": true,
+       "location": "path"
+      },
+      "postId": {
+       "type": "string",
+       "description": "The ID of the Post.",
+       "required": true,
+       "location": "path"
+      },
+      "publishDate": {
+       "type": "string",
+       "description": "The date and time to schedule the publishing of the Blog.",
+       "format": "date-time",
+       "location": "query"
+      }
+     },
+     "parameterOrder": [
+      "blogId",
+      "postId"
+     ],
+     "response": {
+      "$ref": "Post"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger"
+     ]
+    },
+    "revert": {
+     "id": "blogger.posts.revert",
+     "path": "blogs/{blogId}/posts/{postId}/revert",
+     "httpMethod": "POST",
+     "description": "Revert a published or scheduled post to draft state.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "The ID of the Blog.",
+       "required": true,
+       "location": "path"
+      },
+      "postId": {
+       "type": "string",
+       "description": "The ID of the Post.",
+       "required": true,
+       "location": "path"
+      }
+     },
+     "parameterOrder": [
+      "blogId",
+      "postId"
+     ],
+     "response": {
+      "$ref": "Post"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger"
+     ]
+    },
+    "search": {
+     "id": "blogger.posts.search",
+     "path": "blogs/{blogId}/posts/search",
+     "httpMethod": "GET",
+     "description": "Search for a post.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "ID of the blog to fetch the post from.",
+       "required": true,
+       "location": "path"
+      },
+      "fetchBodies": {
+       "type": "boolean",
+       "description": "Whether the body content of posts is included (default: true). This should be set to false when the post bodies are not required, to help minimize traffic.",
+       "default": "true",
+       "location": "query"
+      },
+      "orderBy": {
+       "type": "string",
+       "description": "Sort search results",
+       "default": "PUBLISHED",
+       "enum": [
+        "published",
+        "updated"
+       ],
+       "enumDescriptions": [
+        "Order by the date the post was published",
+        "Order by the date the post was last updated"
+       ],
+       "location": "query"
+      },
+      "q": {
+       "type": "string",
+       "description": "Query terms to search this blog for matching posts.",
+       "required": true,
+       "location": "query"
+      }
+     },
+     "parameterOrder": [
+      "blogId",
+      "q"
+     ],
+     "response": {
+      "$ref": "PostList"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger",
+      "https://www.googleapis.com/auth/blogger.readonly"
+     ]
+    },
+    "update": {
+     "id": "blogger.posts.update",
+     "path": "blogs/{blogId}/posts/{postId}",
+     "httpMethod": "PUT",
+     "description": "Update a post.",
+     "parameters": {
+      "blogId": {
+       "type": "string",
+       "description": "The ID of the Blog.",
+       "required": true,
+       "location": "path"
+      },
+      "postId": {
+       "type": "string",
+       "description": "The ID of the Post.",
+       "required": true,
+       "location": "path"
+      }
+     },
+     "parameterOrder": [
+      "blogId",
+      "postId"
+     ],
+     "request": {
+      "$ref": "Post"
+     },
+     "response": {
+      "$ref": "Post"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger"
+     ]
+    }
+   }
+  },
+  "users": {
+   "methods": {
+    "get": {
+     "id": "blogger.users.get",
+     "path": "users/{userId}",
+     "httpMethod": "GET",
+     "description": "Gets one user by id.",
+     "parameters": {
+      "userId": {
+       "type": "string",
+       "description": "The ID of the user to get.",
+       "required": true,
+       "location": "path"
+      }
+     },
+     "parameterOrder": [
+      "userId"
+     ],
+     "response": {
+      "$ref": "User"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/blogger",
+      "https://www.googleapis.com/auth/blogger.readonly"
+     ]
+    }
+   }
+  }
+ }
+}
diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/resource-named-service.want b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/resource-named-service.want
new file mode 100644
index 00000000..c0602a3c
--- /dev/null
+++ b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/resource-named-service.want
@@ -0,0 +1,4231 @@
+// Package blogger provides access to the Blogger API.
+//
+// See https://developers.google.com/blogger/docs/3.0/getting_started
+//
+// Usage example:
+//
+//   import "google.golang.org/api/blogger/v3"
+//   ...
+//   bloggerService, err := blogger.New(oauthHttpClient)
+package blogger
+
+import (
+	"bytes"
+	"google.golang.org/api/googleapi"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"strconv"
+	"strings"
+)
+
+// Always reference these packages, just in case the auto-generated code
+// below doesn't.
+var _ = bytes.NewBuffer
+var _ = strconv.Itoa
+var _ = fmt.Sprintf
+var _ = json.NewDecoder
+var _ = io.Copy
+var _ = url.Parse
+var _ = googleapi.Version
+var _ = errors.New
+var _ = strings.Replace
+
+const apiId = "blogger:v3"
+const apiName = "blogger"
+const apiVersion = "v3"
+const basePath = "https://www.googleapis.com/blogger/v3/"
+
+// OAuth2 scopes used by this API.
+const (
+	// Manage your Blogger account
+	BloggerScope = "https://www.googleapis.com/auth/blogger"
+
+	// View your Blogger account
+	BloggerReadonlyScope = "https://www.googleapis.com/auth/blogger.readonly"
+)
+
+func New(client *http.Client) (*Service, error) {
+	if client == nil {
+		return nil, errors.New("client is nil")
+	}
+	s := &Service{client: client, BasePath: basePath}
+	s.BlogUserInfos = NewBlogUserInfosService(s)
+	s.Blogs = NewBlogsService(s)
+	s.Comments = NewCommentsService(s)
+	s.PageViews = NewPageViewsService(s)
+	s.Pages = NewPagesService(s)
+	s.PostUserInfos = NewPostUserInfosService(s)
+	s.Posts = NewPostsService(s)
+	s.Users = NewUsersService(s)
+	return s, nil
+}
+
+type Service struct {
+	client   *http.Client
+	BasePath string // API endpoint base URL
+
+	BlogUserInfos *BlogUserInfosService
+
+	Blogs *BlogsService
+
+	Comments *CommentsService
+
+	PageViews *PageViewsService
+
+	Pages *PagesService
+
+	PostUserInfos *PostUserInfosService
+
+	Posts *PostsService
+
+	Users *UsersService
+}
+
+func NewBlogUserInfosService(s *Service) *BlogUserInfosService {
+	rs := &BlogUserInfosService{s: s}
+	return rs
+}
+
+type BlogUserInfosService struct {
+	s *Service
+}
+
+func NewBlogsService(s *Service) *BlogsService {
+	rs := &BlogsService{s: s}
+	return rs
+}
+
+type BlogsService struct {
+	s *Service
+}
+
+func NewCommentsService(s *Service) *CommentsService {
+	rs := &CommentsService{s: s}
+	return rs
+}
+
+type CommentsService struct {
+	s *Service
+}
+
+func NewPageViewsService(s *Service) *PageViewsService {
+	rs := &PageViewsService{s: s}
+	return rs
+}
+
+type PageViewsService struct {
+	s *Service
+}
+
+func NewPagesService(s *Service) *PagesService {
+	rs := &PagesService{s: s}
+	return rs
+}
+
+type PagesService struct {
+	s *Service
+}
+
+func NewPostUserInfosService(s *Service) *PostUserInfosService {
+	rs := &PostUserInfosService{s: s}
+	return rs
+}
+
+type PostUserInfosService struct {
+	s *Service
+}
+
+func NewPostsService(s *Service) *PostsService {
+	rs := &PostsService{s: s}
+	return rs
+}
+
+type PostsService struct {
+	s *Service
+}
+
+func NewUsersService(s *Service) *UsersService {
+	rs := &UsersService{s: s}
+	return rs
+}
+
+type UsersService struct {
+	s *Service
+}
+
+type Blog struct {
+	// CustomMetaData: The JSON custom meta-data for the Blog
+	CustomMetaData string `json:"customMetaData,omitempty"`
+
+	// Description: The description of this blog. This is displayed
+	// underneath the title.
+	Description string `json:"description,omitempty"`
+
+	// Id: The identifier for this resource.
+	Id string `json:"id,omitempty"`
+
+	// Kind: The kind of this entry. Always blogger#blog
+	Kind string `json:"kind,omitempty"`
+
+	// Locale: The locale this Blog is set to.
+	Locale *BlogLocale `json:"locale,omitempty"`
+
+	// Name: The name of this blog. This is displayed as the title.
+	Name string `json:"name,omitempty"`
+
+	// Pages: The container of pages in this blog.
+	Pages *BlogPages `json:"pages,omitempty"`
+
+	// Posts: The container of posts in this blog.
+	Posts *BlogPosts `json:"posts,omitempty"`
+
+	// Published: RFC 3339 date-time when this blog was published.
+	Published string `json:"published,omitempty"`
+
+	// SelfLink: The API REST URL to fetch this resource from.
+	SelfLink string `json:"selfLink,omitempty"`
+
+	// Updated: RFC 3339 date-time when this blog was last updated.
+	Updated string `json:"updated,omitempty"`
+
+	// Url: The URL where this blog is published.
+	Url string `json:"url,omitempty"`
+}
+
+type BlogLocale struct {
+	// Country: The country this blog's locale is set to.
+	Country string `json:"country,omitempty"`
+
+	// Language: The language this blog is authored in.
+	Language string `json:"language,omitempty"`
+
+	// Variant: The language variant this blog is authored in.
+	Variant string `json:"variant,omitempty"`
+}
+
+type BlogPages struct {
+	// SelfLink: The URL of the container for pages in this blog.
+	SelfLink string `json:"selfLink,omitempty"`
+
+	// TotalItems: The count of pages in this blog.
+	TotalItems int64 `json:"totalItems,omitempty"`
+}
+
+type BlogPosts struct {
+	// Items: The List of Posts for this Blog.
+	Items []*Post `json:"items,omitempty"`
+
+	// SelfLink: The URL of the container for posts in this blog.
+	SelfLink string `json:"selfLink,omitempty"`
+
+	// TotalItems: The count of posts in this blog.
+	TotalItems int64 `json:"totalItems,omitempty"`
+}
+
+type BlogList struct {
+	// BlogUserInfos: Admin level list of blog per-user information
+	BlogUserInfos []*Service1 `json:"blogUserInfos,omitempty"`
+
+	// Items: The list of Blogs this user has Authorship or Admin rights
+	// over.
+	Items []*Blog `json:"items,omitempty"`
+
+	// Kind: The kind of this entity. Always blogger#blogList
+	Kind string `json:"kind,omitempty"`
+}
+
+type BlogPerUserInfo struct {
+	// BlogId: ID of the Blog resource
+	BlogId string `json:"blogId,omitempty"`
+
+	// HasAdminAccess: True if the user has Admin level access to the blog.
+	HasAdminAccess bool `json:"hasAdminAccess,omitempty"`
+
+	// Kind: The kind of this entity. Always blogger#blogPerUserInfo
+	Kind string `json:"kind,omitempty"`
+
+	// PhotosAlbumKey: The Photo Album Key for the user when adding photos
+	// to the blog
+	PhotosAlbumKey string `json:"photosAlbumKey,omitempty"`
+
+	// UserId: ID of the User
+	UserId string `json:"userId,omitempty"`
+}
+
+type Comment struct {
+	// Author: The author of this Comment.
+	Author *CommentAuthor `json:"author,omitempty"`
+
+	// Blog: Data about the blog containing this comment.
+	Blog *CommentBlog `json:"blog,omitempty"`
+
+	// Content: The actual content of the comment. May include HTML markup.
+	Content string `json:"content,omitempty"`
+
+	// Id: The identifier for this resource.
+	Id string `json:"id,omitempty"`
+
+	// InReplyTo: Data about the comment this is in reply to.
+	InReplyTo *CommentInReplyTo `json:"inReplyTo,omitempty"`
+
+	// Kind: The kind of this entry. Always blogger#comment
+	Kind string `json:"kind,omitempty"`
+
+	// Post: Data about the post containing this comment.
+	Post *CommentPost `json:"post,omitempty"`
+
+	// Published: RFC 3339 date-time when this comment was published.
+	Published string `json:"published,omitempty"`
+
+	// SelfLink: The API REST URL to fetch this resource from.
+	SelfLink string `json:"selfLink,omitempty"`
+
+	// Status: The status of the comment (only populated for admin users)
+	Status string `json:"status,omitempty"`
+
+	// Updated: RFC 3339 date-time when this comment was last updated.
+	Updated string `json:"updated,omitempty"`
+}
+
+type CommentAuthor struct {
+	// DisplayName: The display name.
+	DisplayName string `json:"displayName,omitempty"`
+
+	// Id: The identifier of the Comment creator.
+	Id string `json:"id,omitempty"`
+
+	// Image: The comment creator's avatar.
+	Image *CommentAuthorImage `json:"image,omitempty"`
+
+	// Url: The URL of the Comment creator's Profile page.
+	Url string `json:"url,omitempty"`
+}
+
+type CommentAuthorImage struct {
+	// Url: The comment creator's avatar URL.
+	Url string `json:"url,omitempty"`
+}
+
+type CommentBlog struct {
+	// Id: The identifier of the blog containing this comment.
+	Id string `json:"id,omitempty"`
+}
+
+type CommentInReplyTo struct {
+	// Id: The identified of the parent of this comment.
+	Id string `json:"id,omitempty"`
+}
+
+type CommentPost struct {
+	// Id: The identifier of the post containing this comment.
+	Id string `json:"id,omitempty"`
+}
+
+type CommentList struct {
+	// Items: The List of Comments for a Post.
+	Items []*Comment `json:"items,omitempty"`
+
+	// Kind: The kind of this entry. Always blogger#commentList
+	Kind string `json:"kind,omitempty"`
+
+	// NextPageToken: Pagination token to fetch the next page, if one
+	// exists.
+	NextPageToken string `json:"nextPageToken,omitempty"`
+
+	// PrevPageToken: Pagination token to fetch the previous page, if one
+	// exists.
+	PrevPageToken string `json:"prevPageToken,omitempty"`
+}
+
+type Page struct {
+	// Author: The author of this Page.
+	Author *PageAuthor `json:"author,omitempty"`
+
+	// Blog: Data about the blog containing this Page.
+	Blog *PageBlog `json:"blog,omitempty"`
+
+	// Content: The body content of this Page, in HTML.
+	Content string `json:"content,omitempty"`
+
+	// Id: The identifier for this resource.
+	Id string `json:"id,omitempty"`
+
+	// Kind: The kind of this entity. Always blogger#page
+	Kind string `json:"kind,omitempty"`
+
+	// Published: RFC 3339 date-time when this Page was published.
+	Published string `json:"published,omitempty"`
+
+	// SelfLink: The API REST URL to fetch this resource from.
+	SelfLink string `json:"selfLink,omitempty"`
+
+	// Status: The status of the page for admin resources (either LIVE or
+	// DRAFT).
+	Status string `json:"status,omitempty"`
+
+	// Title: The title of this entity. This is the name displayed in the
+	// Admin user interface.
+	Title string `json:"title,omitempty"`
+
+	// Updated: RFC 3339 date-time when this Page was last updated.
+	Updated string `json:"updated,omitempty"`
+
+	// Url: The URL that this Page is displayed at.
+	Url string `json:"url,omitempty"`
+}
+
+type PageAuthor struct {
+	// DisplayName: The display name.
+	DisplayName string `json:"displayName,omitempty"`
+
+	// Id: The identifier of the Page creator.
+	Id string `json:"id,omitempty"`
+
+	// Image: The page author's avatar.
+	Image *PageAuthorImage `json:"image,omitempty"`
+
+	// Url: The URL of the Page creator's Profile page.
+	Url string `json:"url,omitempty"`
+}
+
+type PageAuthorImage struct {
+	// Url: The page author's avatar URL.
+	Url string `json:"url,omitempty"`
+}
+
+type PageBlog struct {
+	// Id: The identifier of the blog containing this page.
+	Id string `json:"id,omitempty"`
+}
+
+type PageList struct {
+	// Items: The list of Pages for a Blog.
+	Items []*Page `json:"items,omitempty"`
+
+	// Kind: The kind of this entity. Always blogger#pageList
+	Kind string `json:"kind,omitempty"`
+}
+
+type Pageviews struct {
+	// BlogId: Blog Id
+	BlogId int64 `json:"blogId,omitempty,string"`
+
+	// Counts: The container of posts in this blog.
+	Counts []*PageviewsCounts `json:"counts,omitempty"`
+
+	// Kind: The kind of this entry. Always blogger#page_views
+	Kind string `json:"kind,omitempty"`
+}
+
+type PageviewsCounts struct {
+	// Count: Count of page views for the given time range
+	Count int64 `json:"count,omitempty,string"`
+
+	// TimeRange: Time range the given count applies to
+	TimeRange string `json:"timeRange,omitempty"`
+}
+
+type Post struct {
+	// Author: The author of this Post.
+	Author *PostAuthor `json:"author,omitempty"`
+
+	// Blog: Data about the blog containing this Post.
+	Blog *PostBlog `json:"blog,omitempty"`
+
+	// Content: The content of the Post. May contain HTML markup.
+	Content string `json:"content,omitempty"`
+
+	// CustomMetaData: The JSON meta-data for the Post.
+	CustomMetaData string `json:"customMetaData,omitempty"`
+
+	// Id: The identifier of this Post.
+	Id string `json:"id,omitempty"`
+
+	// Images: Display image for the Post.
+	Images []*PostImages `json:"images,omitempty"`
+
+	// Kind: The kind of this entity. Always blogger#post
+	Kind string `json:"kind,omitempty"`
+
+	// Labels: The list of labels this Post was tagged with.
+	Labels []string `json:"labels,omitempty"`
+
+	// Location: The location for geotagged posts.
+	Location *PostLocation `json:"location,omitempty"`
+
+	// Published: RFC 3339 date-time when this Post was published.
+	Published string `json:"published,omitempty"`
+
+	// Replies: The container of comments on this Post.
+	Replies *PostReplies `json:"replies,omitempty"`
+
+	// SelfLink: The API REST URL to fetch this resource from.
+	SelfLink string `json:"selfLink,omitempty"`
+
+	// Status: Status of the post. Only set for admin-level requests
+	Status string `json:"status,omitempty"`
+
+	// Title: The title of the Post.
+	Title string `json:"title,omitempty"`
+
+	// TitleLink: The title link URL, similar to atom's related link.
+	TitleLink string `json:"titleLink,omitempty"`
+
+	// Updated: RFC 3339 date-time when this Post was last updated.
+	Updated string `json:"updated,omitempty"`
+
+	// Url: The URL where this Post is displayed.
+	Url string `json:"url,omitempty"`
+}
+
+type PostAuthor struct {
+	// DisplayName: The display name.
+	DisplayName string `json:"displayName,omitempty"`
+
+	// Id: The identifier of the Post creator.
+	Id string `json:"id,omitempty"`
+
+	// Image: The Post author's avatar.
+	Image *PostAuthorImage `json:"image,omitempty"`
+
+	// Url: The URL of the Post creator's Profile page.
+	Url string `json:"url,omitempty"`
+}
+
+type PostAuthorImage struct {
+	// Url: The Post author's avatar URL.
+	Url string `json:"url,omitempty"`
+}
+
+type PostBlog struct {
+	// Id: The identifier of the Blog that contains this Post.
+	Id string `json:"id,omitempty"`
+}
+
+type PostImages struct {
+	Url string `json:"url,omitempty"`
+}
+
+type PostLocation struct {
+	// Lat: Location's latitude.
+	Lat float64 `json:"lat,omitempty"`
+
+	// Lng: Location's longitude.
+	Lng float64 `json:"lng,omitempty"`
+
+	// Name: Location name.
+	Name string `json:"name,omitempty"`
+
+	// Span: Location's viewport span. Can be used when rendering a map
+	// preview.
+	Span string `json:"span,omitempty"`
+}
+
+type PostReplies struct {
+	// Items: The List of Comments for this Post.
+	Items []*Comment `json:"items,omitempty"`
+
+	// SelfLink: The URL of the comments on this post.
+	SelfLink string `json:"selfLink,omitempty"`
+
+	// TotalItems: The count of comments on this post.
+	TotalItems int64 `json:"totalItems,omitempty,string"`
+}
+
+type PostList struct {
+	// Items: The list of Posts for this Blog.
+	Items []*Post `json:"items,omitempty"`
+
+	// Kind: The kind of this entity. Always blogger#postList
+	Kind string `json:"kind,omitempty"`
+
+	// NextPageToken: Pagination token to fetch the next page, if one
+	// exists.
+	NextPageToken string `json:"nextPageToken,omitempty"`
+}
+
+type PostPerUserInfo struct {
+	// BlogId: ID of the Blog that the post resource belongs to.
+	BlogId string `json:"blogId,omitempty"`
+
+	// HasEditAccess: True if the user has Author level access to the post.
+	HasEditAccess bool `json:"hasEditAccess,omitempty"`
+
+	// Kind: The kind of this entity. Always blogger#postPerUserInfo
+	Kind string `json:"kind,omitempty"`
+
+	// PostId: ID of the Post resource.
+	PostId string `json:"postId,omitempty"`
+
+	// UserId: ID of the User.
+	UserId string `json:"userId,omitempty"`
+}
+
+type PostUserInfo struct {
+	// Kind: The kind of this entity. Always blogger#postUserInfo
+	Kind string `json:"kind,omitempty"`
+
+	// Post: The Post resource.
+	Post *Post `json:"post,omitempty"`
+
+	// Post_user_info: Information about a User for the Post.
+	Post_user_info *PostPerUserInfo `json:"post_user_info,omitempty"`
+}
+
+type PostUserInfosList struct {
+	// Items: The list of Posts with User information for the post, for this
+	// Blog.
+	Items []*PostUserInfo `json:"items,omitempty"`
+
+	// Kind: The kind of this entity. Always blogger#postList
+	Kind string `json:"kind,omitempty"`
+
+	// NextPageToken: Pagination token to fetch the next page, if one
+	// exists.
+	NextPageToken string `json:"nextPageToken,omitempty"`
+}
+
+type Service1 struct {
+	// Blog: The Blog resource.
+	Blog *Blog `json:"blog,omitempty"`
+
+	// Blog_user_info: Information about a User for the Blog.
+	Blog_user_info *BlogPerUserInfo `json:"blog_user_info,omitempty"`
+
+	// Kind: The kind of this entity. Always blogger#blogUserInfo
+	Kind string `json:"kind,omitempty"`
+}
+
+type User struct {
+	// About: Profile summary information.
+	About string `json:"about,omitempty"`
+
+	// Blogs: The container of blogs for this user.
+	Blogs *UserBlogs `json:"blogs,omitempty"`
+
+	// Created: The timestamp of when this profile was created, in seconds
+	// since epoch.
+	Created string `json:"created,omitempty"`
+
+	// DisplayName: The display name.
+	DisplayName string `json:"displayName,omitempty"`
+
+	// Id: The identifier for this User.
+	Id string `json:"id,omitempty"`
+
+	// Kind: The kind of this entity. Always blogger#user
+	Kind string `json:"kind,omitempty"`
+
+	// Locale: This user's locale
+	Locale *UserLocale `json:"locale,omitempty"`
+
+	// SelfLink: The API REST URL to fetch this resource from.
+	SelfLink string `json:"selfLink,omitempty"`
+
+	// Url: The user's profile page.
+	Url string `json:"url,omitempty"`
+}
+
+type UserBlogs struct {
+	// SelfLink: The URL of the Blogs for this user.
+	SelfLink string `json:"selfLink,omitempty"`
+}
+
+type UserLocale struct {
+	// Country: The user's country setting.
+	Country string `json:"country,omitempty"`
+
+	// Language: The user's language setting.
+	Language string `json:"language,omitempty"`
+
+	// Variant: The user's language variant setting.
+	Variant string `json:"variant,omitempty"`
+}
+
+// method id "blogger.blogUserInfos.get":
+
+type BlogUserInfosGetCall struct {
+	s      *Service
+	userId string
+	blogId string
+	opt_   map[string]interface{}
+}
+
+// Get: Gets one blog and user info pair by blogId and userId.
+func (r *BlogUserInfosService) Get(userId string, blogId string) *BlogUserInfosGetCall {
+	c := &BlogUserInfosGetCall{s: r.s, opt_: make(map[string]interface{})}
+	c.userId = userId
+	c.blogId = blogId
+	return c
+}
+
+// MaxPosts sets the optional parameter "maxPosts": Maximum number of
+// posts to pull back with the blog.
+func (c *BlogUserInfosGetCall) MaxPosts(maxPosts int64) *BlogUserInfosGetCall {
+	c.opt_["maxPosts"] = maxPosts
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *BlogUserInfosGetCall) Fields(s ...googleapi.Field) *BlogUserInfosGetCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *BlogUserInfosGetCall) Do() (*Service1, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["maxPosts"]; ok {
+		params.Set("maxPosts", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "users/{userId}/blogs/{blogId}")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"userId": c.userId,
+		"blogId": c.blogId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *Service1
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Gets one blog and user info pair by blogId and userId.",
+	//   "httpMethod": "GET",
+	//   "id": "blogger.blogUserInfos.get",
+	//   "parameterOrder": [
+	//     "userId",
+	//     "blogId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "The ID of the blog to get.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "maxPosts": {
+	//       "description": "Maximum number of posts to pull back with the blog.",
+	//       "format": "uint32",
+	//       "location": "query",
+	//       "type": "integer"
+	//     },
+	//     "userId": {
+	//       "description": "ID of the user whose blogs are to be fetched. Either the word 'self' (sans quote marks) or the user's profile identifier.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "users/{userId}/blogs/{blogId}",
+	//   "response": {
+	//     "$ref": "Service"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger",
+	//     "https://www.googleapis.com/auth/blogger.readonly"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.blogs.get":
+
+type BlogsGetCall struct {
+	s      *Service
+	blogId string
+	opt_   map[string]interface{}
+}
+
+// Get: Gets one blog by id.
+func (r *BlogsService) Get(blogId string) *BlogsGetCall {
+	c := &BlogsGetCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	return c
+}
+
+// MaxPosts sets the optional parameter "maxPosts": Maximum number of
+// posts to pull back with the blog.
+func (c *BlogsGetCall) MaxPosts(maxPosts int64) *BlogsGetCall {
+	c.opt_["maxPosts"] = maxPosts
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *BlogsGetCall) Fields(s ...googleapi.Field) *BlogsGetCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *BlogsGetCall) Do() (*Blog, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["maxPosts"]; ok {
+		params.Set("maxPosts", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *Blog
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Gets one blog by id.",
+	//   "httpMethod": "GET",
+	//   "id": "blogger.blogs.get",
+	//   "parameterOrder": [
+	//     "blogId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "The ID of the blog to get.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "maxPosts": {
+	//       "description": "Maximum number of posts to pull back with the blog.",
+	//       "format": "uint32",
+	//       "location": "query",
+	//       "type": "integer"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}",
+	//   "response": {
+	//     "$ref": "Blog"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger",
+	//     "https://www.googleapis.com/auth/blogger.readonly"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.blogs.getByUrl":
+
+type BlogsGetByUrlCall struct {
+	s    *Service
+	url  string
+	opt_ map[string]interface{}
+}
+
+// GetByUrl: Retrieve a Blog by URL.
+func (r *BlogsService) GetByUrl(url string) *BlogsGetByUrlCall {
+	c := &BlogsGetByUrlCall{s: r.s, opt_: make(map[string]interface{})}
+	c.url = url
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *BlogsGetByUrlCall) Fields(s ...googleapi.Field) *BlogsGetByUrlCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *BlogsGetByUrlCall) Do() (*Blog, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	params.Set("url", fmt.Sprintf("%v", c.url))
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/byurl")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.SetOpaque(req.URL)
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *Blog
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Retrieve a Blog by URL.",
+	//   "httpMethod": "GET",
+	//   "id": "blogger.blogs.getByUrl",
+	//   "parameterOrder": [
+	//     "url"
+	//   ],
+	//   "parameters": {
+	//     "url": {
+	//       "description": "The URL of the blog to retrieve.",
+	//       "location": "query",
+	//       "required": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/byurl",
+	//   "response": {
+	//     "$ref": "Blog"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger",
+	//     "https://www.googleapis.com/auth/blogger.readonly"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.blogs.listByUser":
+
+type BlogsListByUserCall struct {
+	s      *Service
+	userId string
+	opt_   map[string]interface{}
+}
+
+// ListByUser: Retrieves a list of blogs, possibly filtered.
+func (r *BlogsService) ListByUser(userId string) *BlogsListByUserCall {
+	c := &BlogsListByUserCall{s: r.s, opt_: make(map[string]interface{})}
+	c.userId = userId
+	return c
+}
+
+// FetchUserInfo sets the optional parameter "fetchUserInfo": Whether
+// the response is a list of blogs with per-user information instead of
+// just blogs.
+func (c *BlogsListByUserCall) FetchUserInfo(fetchUserInfo bool) *BlogsListByUserCall {
+	c.opt_["fetchUserInfo"] = fetchUserInfo
+	return c
+}
+
+// View sets the optional parameter "view":
+func (c *BlogsListByUserCall) View(view string) *BlogsListByUserCall {
+	c.opt_["view"] = view
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *BlogsListByUserCall) Fields(s ...googleapi.Field) *BlogsListByUserCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *BlogsListByUserCall) Do() (*BlogList, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fetchUserInfo"]; ok {
+		params.Set("fetchUserInfo", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["view"]; ok {
+		params.Set("view", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "users/{userId}/blogs")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"userId": c.userId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *BlogList
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Retrieves a list of blogs, possibly filtered.",
+	//   "httpMethod": "GET",
+	//   "id": "blogger.blogs.listByUser",
+	//   "parameterOrder": [
+	//     "userId"
+	//   ],
+	//   "parameters": {
+	//     "fetchUserInfo": {
+	//       "description": "Whether the response is a list of blogs with per-user information instead of just blogs.",
+	//       "location": "query",
+	//       "type": "boolean"
+	//     },
+	//     "userId": {
+	//       "description": "ID of the user whose blogs are to be fetched. Either the word 'self' (sans quote marks) or the user's profile identifier.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "view": {
+	//       "enum": [
+	//         "ADMIN",
+	//         "AUTHOR",
+	//         "READER"
+	//       ],
+	//       "enumDescriptions": [
+	//         "Admin level detail",
+	//         "Author level detail",
+	//         "Admin level detail"
+	//       ],
+	//       "location": "query",
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "users/{userId}/blogs",
+	//   "response": {
+	//     "$ref": "BlogList"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger",
+	//     "https://www.googleapis.com/auth/blogger.readonly"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.comments.approve":
+
+type CommentsApproveCall struct {
+	s         *Service
+	blogId    string
+	postId    string
+	commentId string
+	opt_      map[string]interface{}
+}
+
+// Approve: Marks a comment as not spam.
+func (r *CommentsService) Approve(blogId string, postId string, commentId string) *CommentsApproveCall {
+	c := &CommentsApproveCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.postId = postId
+	c.commentId = commentId
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *CommentsApproveCall) Fields(s ...googleapi.Field) *CommentsApproveCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *CommentsApproveCall) Do() (*Comment, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/posts/{postId}/comments/{commentId}/approve")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("POST", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId":    c.blogId,
+		"postId":    c.postId,
+		"commentId": c.commentId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *Comment
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Marks a comment as not spam.",
+	//   "httpMethod": "POST",
+	//   "id": "blogger.comments.approve",
+	//   "parameterOrder": [
+	//     "blogId",
+	//     "postId",
+	//     "commentId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "The Id of the Blog.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "commentId": {
+	//       "description": "The ID of the comment to mark as not spam.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "postId": {
+	//       "description": "The ID of the Post.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/posts/{postId}/comments/{commentId}/approve",
+	//   "response": {
+	//     "$ref": "Comment"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.comments.delete":
+
+type CommentsDeleteCall struct {
+	s         *Service
+	blogId    string
+	postId    string
+	commentId string
+	opt_      map[string]interface{}
+}
+
+// Delete: Delete a comment by id.
+func (r *CommentsService) Delete(blogId string, postId string, commentId string) *CommentsDeleteCall {
+	c := &CommentsDeleteCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.postId = postId
+	c.commentId = commentId
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *CommentsDeleteCall) Fields(s ...googleapi.Field) *CommentsDeleteCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *CommentsDeleteCall) Do() error {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/posts/{postId}/comments/{commentId}")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("DELETE", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId":    c.blogId,
+		"postId":    c.postId,
+		"commentId": c.commentId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return err
+	}
+	return nil
+	// {
+	//   "description": "Delete a comment by id.",
+	//   "httpMethod": "DELETE",
+	//   "id": "blogger.comments.delete",
+	//   "parameterOrder": [
+	//     "blogId",
+	//     "postId",
+	//     "commentId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "The Id of the Blog.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "commentId": {
+	//       "description": "The ID of the comment to delete.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "postId": {
+	//       "description": "The ID of the Post.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/posts/{postId}/comments/{commentId}",
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.comments.get":
+
+type CommentsGetCall struct {
+	s         *Service
+	blogId    string
+	postId    string
+	commentId string
+	opt_      map[string]interface{}
+}
+
+// Get: Gets one comment by id.
+func (r *CommentsService) Get(blogId string, postId string, commentId string) *CommentsGetCall {
+	c := &CommentsGetCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.postId = postId
+	c.commentId = commentId
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *CommentsGetCall) Fields(s ...googleapi.Field) *CommentsGetCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *CommentsGetCall) Do() (*Comment, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/posts/{postId}/comments/{commentId}")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId":    c.blogId,
+		"postId":    c.postId,
+		"commentId": c.commentId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *Comment
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Gets one comment by id.",
+	//   "httpMethod": "GET",
+	//   "id": "blogger.comments.get",
+	//   "parameterOrder": [
+	//     "blogId",
+	//     "postId",
+	//     "commentId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "ID of the blog to containing the comment.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "commentId": {
+	//       "description": "The ID of the comment to get.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "postId": {
+	//       "description": "ID of the post to fetch posts from.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/posts/{postId}/comments/{commentId}",
+	//   "response": {
+	//     "$ref": "Comment"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger",
+	//     "https://www.googleapis.com/auth/blogger.readonly"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.comments.list":
+
+type CommentsListCall struct {
+	s      *Service
+	blogId string
+	postId string
+	opt_   map[string]interface{}
+}
+
+// List: Retrieves the comments for a post, possibly filtered.
+func (r *CommentsService) List(blogId string, postId string) *CommentsListCall {
+	c := &CommentsListCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.postId = postId
+	return c
+}
+
+// EndDate sets the optional parameter "endDate": Latest date of comment
+// to fetch, a date-time with RFC 3339 formatting.
+func (c *CommentsListCall) EndDate(endDate string) *CommentsListCall {
+	c.opt_["endDate"] = endDate
+	return c
+}
+
+// FetchBodies sets the optional parameter "fetchBodies": Whether the
+// body content of the comments is included.
+func (c *CommentsListCall) FetchBodies(fetchBodies bool) *CommentsListCall {
+	c.opt_["fetchBodies"] = fetchBodies
+	return c
+}
+
+// MaxResults sets the optional parameter "maxResults": Maximum number
+// of comments to include in the result.
+func (c *CommentsListCall) MaxResults(maxResults int64) *CommentsListCall {
+	c.opt_["maxResults"] = maxResults
+	return c
+}
+
+// PageToken sets the optional parameter "pageToken": Continuation token
+// if request is paged.
+func (c *CommentsListCall) PageToken(pageToken string) *CommentsListCall {
+	c.opt_["pageToken"] = pageToken
+	return c
+}
+
+// StartDate sets the optional parameter "startDate": Earliest date of
+// comment to fetch, a date-time with RFC 3339 formatting.
+func (c *CommentsListCall) StartDate(startDate string) *CommentsListCall {
+	c.opt_["startDate"] = startDate
+	return c
+}
+
+// Statuses sets the optional parameter "statuses":
+func (c *CommentsListCall) Statuses(statuses string) *CommentsListCall {
+	c.opt_["statuses"] = statuses
+	return c
+}
+
+// View sets the optional parameter "view":
+func (c *CommentsListCall) View(view string) *CommentsListCall {
+	c.opt_["view"] = view
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *CommentsListCall) Fields(s ...googleapi.Field) *CommentsListCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *CommentsListCall) Do() (*CommentList, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["endDate"]; ok {
+		params.Set("endDate", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fetchBodies"]; ok {
+		params.Set("fetchBodies", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["maxResults"]; ok {
+		params.Set("maxResults", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["pageToken"]; ok {
+		params.Set("pageToken", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["startDate"]; ok {
+		params.Set("startDate", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["statuses"]; ok {
+		params.Set("statuses", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["view"]; ok {
+		params.Set("view", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/posts/{postId}/comments")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+		"postId": c.postId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *CommentList
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Retrieves the comments for a post, possibly filtered.",
+	//   "httpMethod": "GET",
+	//   "id": "blogger.comments.list",
+	//   "parameterOrder": [
+	//     "blogId",
+	//     "postId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "ID of the blog to fetch comments from.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "endDate": {
+	//       "description": "Latest date of comment to fetch, a date-time with RFC 3339 formatting.",
+	//       "format": "date-time",
+	//       "location": "query",
+	//       "type": "string"
+	//     },
+	//     "fetchBodies": {
+	//       "description": "Whether the body content of the comments is included.",
+	//       "location": "query",
+	//       "type": "boolean"
+	//     },
+	//     "maxResults": {
+	//       "description": "Maximum number of comments to include in the result.",
+	//       "format": "uint32",
+	//       "location": "query",
+	//       "type": "integer"
+	//     },
+	//     "pageToken": {
+	//       "description": "Continuation token if request is paged.",
+	//       "location": "query",
+	//       "type": "string"
+	//     },
+	//     "postId": {
+	//       "description": "ID of the post to fetch posts from.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "startDate": {
+	//       "description": "Earliest date of comment to fetch, a date-time with RFC 3339 formatting.",
+	//       "format": "date-time",
+	//       "location": "query",
+	//       "type": "string"
+	//     },
+	//     "statuses": {
+	//       "enum": [
+	//         "emptied",
+	//         "live",
+	//         "pending",
+	//         "spam"
+	//       ],
+	//       "enumDescriptions": [
+	//         "Comments that have had their content removed",
+	//         "Comments that are publicly visible",
+	//         "Comments that are awaiting administrator approval",
+	//         "Comments marked as spam by the administrator"
+	//       ],
+	//       "location": "query",
+	//       "repeated": true,
+	//       "type": "string"
+	//     },
+	//     "view": {
+	//       "enum": [
+	//         "ADMIN",
+	//         "AUTHOR",
+	//         "READER"
+	//       ],
+	//       "enumDescriptions": [
+	//         "Admin level detail",
+	//         "Author level detail",
+	//         "Admin level detail"
+	//       ],
+	//       "location": "query",
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/posts/{postId}/comments",
+	//   "response": {
+	//     "$ref": "CommentList"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger",
+	//     "https://www.googleapis.com/auth/blogger.readonly"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.comments.listByBlog":
+
+type CommentsListByBlogCall struct {
+	s      *Service
+	blogId string
+	opt_   map[string]interface{}
+}
+
+// ListByBlog: Retrieves the comments for a blog, across all posts,
+// possibly filtered.
+func (r *CommentsService) ListByBlog(blogId string) *CommentsListByBlogCall {
+	c := &CommentsListByBlogCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	return c
+}
+
+// EndDate sets the optional parameter "endDate": Latest date of comment
+// to fetch, a date-time with RFC 3339 formatting.
+func (c *CommentsListByBlogCall) EndDate(endDate string) *CommentsListByBlogCall {
+	c.opt_["endDate"] = endDate
+	return c
+}
+
+// FetchBodies sets the optional parameter "fetchBodies": Whether the
+// body content of the comments is included.
+func (c *CommentsListByBlogCall) FetchBodies(fetchBodies bool) *CommentsListByBlogCall {
+	c.opt_["fetchBodies"] = fetchBodies
+	return c
+}
+
+// MaxResults sets the optional parameter "maxResults": Maximum number
+// of comments to include in the result.
+func (c *CommentsListByBlogCall) MaxResults(maxResults int64) *CommentsListByBlogCall {
+	c.opt_["maxResults"] = maxResults
+	return c
+}
+
+// PageToken sets the optional parameter "pageToken": Continuation token
+// if request is paged.
+func (c *CommentsListByBlogCall) PageToken(pageToken string) *CommentsListByBlogCall {
+	c.opt_["pageToken"] = pageToken
+	return c
+}
+
+// StartDate sets the optional parameter "startDate": Earliest date of
+// comment to fetch, a date-time with RFC 3339 formatting.
+func (c *CommentsListByBlogCall) StartDate(startDate string) *CommentsListByBlogCall {
+	c.opt_["startDate"] = startDate
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *CommentsListByBlogCall) Fields(s ...googleapi.Field) *CommentsListByBlogCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *CommentsListByBlogCall) Do() (*CommentList, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["endDate"]; ok {
+		params.Set("endDate", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fetchBodies"]; ok {
+		params.Set("fetchBodies", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["maxResults"]; ok {
+		params.Set("maxResults", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["pageToken"]; ok {
+		params.Set("pageToken", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["startDate"]; ok {
+		params.Set("startDate", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/comments")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *CommentList
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Retrieves the comments for a blog, across all posts, possibly filtered.",
+	//   "httpMethod": "GET",
+	//   "id": "blogger.comments.listByBlog",
+	//   "parameterOrder": [
+	//     "blogId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "ID of the blog to fetch comments from.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "endDate": {
+	//       "description": "Latest date of comment to fetch, a date-time with RFC 3339 formatting.",
+	//       "format": "date-time",
+	//       "location": "query",
+	//       "type": "string"
+	//     },
+	//     "fetchBodies": {
+	//       "description": "Whether the body content of the comments is included.",
+	//       "location": "query",
+	//       "type": "boolean"
+	//     },
+	//     "maxResults": {
+	//       "description": "Maximum number of comments to include in the result.",
+	//       "format": "uint32",
+	//       "location": "query",
+	//       "type": "integer"
+	//     },
+	//     "pageToken": {
+	//       "description": "Continuation token if request is paged.",
+	//       "location": "query",
+	//       "type": "string"
+	//     },
+	//     "startDate": {
+	//       "description": "Earliest date of comment to fetch, a date-time with RFC 3339 formatting.",
+	//       "format": "date-time",
+	//       "location": "query",
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/comments",
+	//   "response": {
+	//     "$ref": "CommentList"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger",
+	//     "https://www.googleapis.com/auth/blogger.readonly"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.comments.markAsSpam":
+
+type CommentsMarkAsSpamCall struct {
+	s         *Service
+	blogId    string
+	postId    string
+	commentId string
+	opt_      map[string]interface{}
+}
+
+// MarkAsSpam: Marks a comment as spam.
+func (r *CommentsService) MarkAsSpam(blogId string, postId string, commentId string) *CommentsMarkAsSpamCall {
+	c := &CommentsMarkAsSpamCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.postId = postId
+	c.commentId = commentId
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *CommentsMarkAsSpamCall) Fields(s ...googleapi.Field) *CommentsMarkAsSpamCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *CommentsMarkAsSpamCall) Do() (*Comment, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/posts/{postId}/comments/{commentId}/spam")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("POST", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId":    c.blogId,
+		"postId":    c.postId,
+		"commentId": c.commentId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *Comment
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Marks a comment as spam.",
+	//   "httpMethod": "POST",
+	//   "id": "blogger.comments.markAsSpam",
+	//   "parameterOrder": [
+	//     "blogId",
+	//     "postId",
+	//     "commentId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "The Id of the Blog.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "commentId": {
+	//       "description": "The ID of the comment to mark as spam.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "postId": {
+	//       "description": "The ID of the Post.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/posts/{postId}/comments/{commentId}/spam",
+	//   "response": {
+	//     "$ref": "Comment"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.comments.removeContent":
+
+type CommentsRemoveContentCall struct {
+	s         *Service
+	blogId    string
+	postId    string
+	commentId string
+	opt_      map[string]interface{}
+}
+
+// RemoveContent: Removes the content of a comment.
+func (r *CommentsService) RemoveContent(blogId string, postId string, commentId string) *CommentsRemoveContentCall {
+	c := &CommentsRemoveContentCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.postId = postId
+	c.commentId = commentId
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *CommentsRemoveContentCall) Fields(s ...googleapi.Field) *CommentsRemoveContentCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *CommentsRemoveContentCall) Do() (*Comment, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/posts/{postId}/comments/{commentId}/removecontent")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("POST", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId":    c.blogId,
+		"postId":    c.postId,
+		"commentId": c.commentId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *Comment
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Removes the content of a comment.",
+	//   "httpMethod": "POST",
+	//   "id": "blogger.comments.removeContent",
+	//   "parameterOrder": [
+	//     "blogId",
+	//     "postId",
+	//     "commentId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "The Id of the Blog.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "commentId": {
+	//       "description": "The ID of the comment to delete content from.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "postId": {
+	//       "description": "The ID of the Post.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/posts/{postId}/comments/{commentId}/removecontent",
+	//   "response": {
+	//     "$ref": "Comment"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.pageViews.get":
+
+type PageViewsGetCall struct {
+	s      *Service
+	blogId string
+	opt_   map[string]interface{}
+}
+
+// Get: Retrieve pageview stats for a Blog.
+func (r *PageViewsService) Get(blogId string) *PageViewsGetCall {
+	c := &PageViewsGetCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	return c
+}
+
+// Range sets the optional parameter "range":
+func (c *PageViewsGetCall) Range(range_ string) *PageViewsGetCall {
+	c.opt_["range"] = range_
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *PageViewsGetCall) Fields(s ...googleapi.Field) *PageViewsGetCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *PageViewsGetCall) Do() (*Pageviews, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["range"]; ok {
+		params.Set("range", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/pageviews")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *Pageviews
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Retrieve pageview stats for a Blog.",
+	//   "httpMethod": "GET",
+	//   "id": "blogger.pageViews.get",
+	//   "parameterOrder": [
+	//     "blogId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "The ID of the blog to get.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "range": {
+	//       "enum": [
+	//         "30DAYS",
+	//         "7DAYS",
+	//         "all"
+	//       ],
+	//       "enumDescriptions": [
+	//         "Page view counts from the last thirty days.",
+	//         "Page view counts from the last seven days.",
+	//         "Total page view counts from all time."
+	//       ],
+	//       "location": "query",
+	//       "repeated": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/pageviews",
+	//   "response": {
+	//     "$ref": "Pageviews"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.pages.delete":
+
+type PagesDeleteCall struct {
+	s      *Service
+	blogId string
+	pageId string
+	opt_   map[string]interface{}
+}
+
+// Delete: Delete a page by id.
+func (r *PagesService) Delete(blogId string, pageId string) *PagesDeleteCall {
+	c := &PagesDeleteCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.pageId = pageId
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *PagesDeleteCall) Fields(s ...googleapi.Field) *PagesDeleteCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *PagesDeleteCall) Do() error {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/pages/{pageId}")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("DELETE", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+		"pageId": c.pageId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return err
+	}
+	return nil
+	// {
+	//   "description": "Delete a page by id.",
+	//   "httpMethod": "DELETE",
+	//   "id": "blogger.pages.delete",
+	//   "parameterOrder": [
+	//     "blogId",
+	//     "pageId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "The Id of the Blog.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "pageId": {
+	//       "description": "The ID of the Page.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/pages/{pageId}",
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.pages.get":
+
+type PagesGetCall struct {
+	s      *Service
+	blogId string
+	pageId string
+	opt_   map[string]interface{}
+}
+
+// Get: Gets one blog page by id.
+func (r *PagesService) Get(blogId string, pageId string) *PagesGetCall {
+	c := &PagesGetCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.pageId = pageId
+	return c
+}
+
+// View sets the optional parameter "view":
+func (c *PagesGetCall) View(view string) *PagesGetCall {
+	c.opt_["view"] = view
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *PagesGetCall) Fields(s ...googleapi.Field) *PagesGetCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *PagesGetCall) Do() (*Page, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["view"]; ok {
+		params.Set("view", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/pages/{pageId}")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+		"pageId": c.pageId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *Page
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Gets one blog page by id.",
+	//   "httpMethod": "GET",
+	//   "id": "blogger.pages.get",
+	//   "parameterOrder": [
+	//     "blogId",
+	//     "pageId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "ID of the blog containing the page.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "pageId": {
+	//       "description": "The ID of the page to get.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "view": {
+	//       "enum": [
+	//         "ADMIN",
+	//         "AUTHOR",
+	//         "READER"
+	//       ],
+	//       "enumDescriptions": [
+	//         "Admin level detail",
+	//         "Author level detail",
+	//         "Admin level detail"
+	//       ],
+	//       "location": "query",
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/pages/{pageId}",
+	//   "response": {
+	//     "$ref": "Page"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger",
+	//     "https://www.googleapis.com/auth/blogger.readonly"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.pages.insert":
+
+type PagesInsertCall struct {
+	s      *Service
+	blogId string
+	page   *Page
+	opt_   map[string]interface{}
+}
+
+// Insert: Add a page.
+func (r *PagesService) Insert(blogId string, page *Page) *PagesInsertCall {
+	c := &PagesInsertCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.page = page
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *PagesInsertCall) Fields(s ...googleapi.Field) *PagesInsertCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *PagesInsertCall) Do() (*Page, error) {
+	var body io.Reader = nil
+	body, err := googleapi.WithoutDataWrapper.JSONReader(c.page)
+	if err != nil {
+		return nil, err
+	}
+	ctype := "application/json"
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/pages")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("POST", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+	})
+	req.Header.Set("Content-Type", ctype)
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *Page
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Add a page.",
+	//   "httpMethod": "POST",
+	//   "id": "blogger.pages.insert",
+	//   "parameterOrder": [
+	//     "blogId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "ID of the blog to add the page to.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/pages",
+	//   "request": {
+	//     "$ref": "Page"
+	//   },
+	//   "response": {
+	//     "$ref": "Page"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.pages.list":
+
+type PagesListCall struct {
+	s      *Service
+	blogId string
+	opt_   map[string]interface{}
+}
+
+// List: Retrieves the pages for a blog, optionally including non-LIVE
+// statuses.
+func (r *PagesService) List(blogId string) *PagesListCall {
+	c := &PagesListCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	return c
+}
+
+// FetchBodies sets the optional parameter "fetchBodies": Whether to
+// retrieve the Page bodies.
+func (c *PagesListCall) FetchBodies(fetchBodies bool) *PagesListCall {
+	c.opt_["fetchBodies"] = fetchBodies
+	return c
+}
+
+// Statuses sets the optional parameter "statuses":
+func (c *PagesListCall) Statuses(statuses string) *PagesListCall {
+	c.opt_["statuses"] = statuses
+	return c
+}
+
+// View sets the optional parameter "view":
+func (c *PagesListCall) View(view string) *PagesListCall {
+	c.opt_["view"] = view
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *PagesListCall) Fields(s ...googleapi.Field) *PagesListCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *PagesListCall) Do() (*PageList, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fetchBodies"]; ok {
+		params.Set("fetchBodies", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["statuses"]; ok {
+		params.Set("statuses", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["view"]; ok {
+		params.Set("view", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/pages")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *PageList
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Retrieves the pages for a blog, optionally including non-LIVE statuses.",
+	//   "httpMethod": "GET",
+	//   "id": "blogger.pages.list",
+	//   "parameterOrder": [
+	//     "blogId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "ID of the blog to fetch pages from.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "fetchBodies": {
+	//       "description": "Whether to retrieve the Page bodies.",
+	//       "location": "query",
+	//       "type": "boolean"
+	//     },
+	//     "statuses": {
+	//       "enum": [
+	//         "draft",
+	//         "imported",
+	//         "live"
+	//       ],
+	//       "enumDescriptions": [
+	//         "Draft (unpublished) Pages",
+	//         "Pages that have had their content removed",
+	//         "Pages that are publicly visible"
+	//       ],
+	//       "location": "query",
+	//       "repeated": true,
+	//       "type": "string"
+	//     },
+	//     "view": {
+	//       "enum": [
+	//         "ADMIN",
+	//         "AUTHOR",
+	//         "READER"
+	//       ],
+	//       "enumDescriptions": [
+	//         "Admin level detail",
+	//         "Author level detail",
+	//         "Admin level detail"
+	//       ],
+	//       "location": "query",
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/pages",
+	//   "response": {
+	//     "$ref": "PageList"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger",
+	//     "https://www.googleapis.com/auth/blogger.readonly"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.pages.patch":
+
+type PagesPatchCall struct {
+	s      *Service
+	blogId string
+	pageId string
+	page   *Page
+	opt_   map[string]interface{}
+}
+
+// Patch: Update a page. This method supports patch semantics.
+func (r *PagesService) Patch(blogId string, pageId string, page *Page) *PagesPatchCall {
+	c := &PagesPatchCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.pageId = pageId
+	c.page = page
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *PagesPatchCall) Fields(s ...googleapi.Field) *PagesPatchCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *PagesPatchCall) Do() (*Page, error) {
+	var body io.Reader = nil
+	body, err := googleapi.WithoutDataWrapper.JSONReader(c.page)
+	if err != nil {
+		return nil, err
+	}
+	ctype := "application/json"
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/pages/{pageId}")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("PATCH", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+		"pageId": c.pageId,
+	})
+	req.Header.Set("Content-Type", ctype)
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *Page
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Update a page. This method supports patch semantics.",
+	//   "httpMethod": "PATCH",
+	//   "id": "blogger.pages.patch",
+	//   "parameterOrder": [
+	//     "blogId",
+	//     "pageId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "The ID of the Blog.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "pageId": {
+	//       "description": "The ID of the Page.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/pages/{pageId}",
+	//   "request": {
+	//     "$ref": "Page"
+	//   },
+	//   "response": {
+	//     "$ref": "Page"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.pages.update":
+
+type PagesUpdateCall struct {
+	s      *Service
+	blogId string
+	pageId string
+	page   *Page
+	opt_   map[string]interface{}
+}
+
+// Update: Update a page.
+func (r *PagesService) Update(blogId string, pageId string, page *Page) *PagesUpdateCall {
+	c := &PagesUpdateCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.pageId = pageId
+	c.page = page
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *PagesUpdateCall) Fields(s ...googleapi.Field) *PagesUpdateCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *PagesUpdateCall) Do() (*Page, error) {
+	var body io.Reader = nil
+	body, err := googleapi.WithoutDataWrapper.JSONReader(c.page)
+	if err != nil {
+		return nil, err
+	}
+	ctype := "application/json"
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/pages/{pageId}")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("PUT", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+		"pageId": c.pageId,
+	})
+	req.Header.Set("Content-Type", ctype)
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *Page
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Update a page.",
+	//   "httpMethod": "PUT",
+	//   "id": "blogger.pages.update",
+	//   "parameterOrder": [
+	//     "blogId",
+	//     "pageId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "The ID of the Blog.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "pageId": {
+	//       "description": "The ID of the Page.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/pages/{pageId}",
+	//   "request": {
+	//     "$ref": "Page"
+	//   },
+	//   "response": {
+	//     "$ref": "Page"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.postUserInfos.get":
+
+type PostUserInfosGetCall struct {
+	s      *Service
+	userId string
+	blogId string
+	postId string
+	opt_   map[string]interface{}
+}
+
+// Get: Gets one post and user info pair by postId and userId.
+func (r *PostUserInfosService) Get(userId string, blogId string, postId string) *PostUserInfosGetCall {
+	c := &PostUserInfosGetCall{s: r.s, opt_: make(map[string]interface{})}
+	c.userId = userId
+	c.blogId = blogId
+	c.postId = postId
+	return c
+}
+
+// MaxComments sets the optional parameter "maxComments": Maximum number
+// of comments to pull back on a post.
+func (c *PostUserInfosGetCall) MaxComments(maxComments int64) *PostUserInfosGetCall {
+	c.opt_["maxComments"] = maxComments
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *PostUserInfosGetCall) Fields(s ...googleapi.Field) *PostUserInfosGetCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *PostUserInfosGetCall) Do() (*PostUserInfo, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["maxComments"]; ok {
+		params.Set("maxComments", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "users/{userId}/blogs/{blogId}/posts/{postId}")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"userId": c.userId,
+		"blogId": c.blogId,
+		"postId": c.postId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *PostUserInfo
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Gets one post and user info pair by postId and userId.",
+	//   "httpMethod": "GET",
+	//   "id": "blogger.postUserInfos.get",
+	//   "parameterOrder": [
+	//     "userId",
+	//     "blogId",
+	//     "postId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "The ID of the blog.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "maxComments": {
+	//       "description": "Maximum number of comments to pull back on a post.",
+	//       "format": "uint32",
+	//       "location": "query",
+	//       "type": "integer"
+	//     },
+	//     "postId": {
+	//       "description": "The ID of the post to get.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "userId": {
+	//       "description": "ID of the user for the per-user information to be fetched. Either the word 'self' (sans quote marks) or the user's profile identifier.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "users/{userId}/blogs/{blogId}/posts/{postId}",
+	//   "response": {
+	//     "$ref": "PostUserInfo"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger",
+	//     "https://www.googleapis.com/auth/blogger.readonly"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.postUserInfos.list":
+
+type PostUserInfosListCall struct {
+	s      *Service
+	userId string
+	blogId string
+	opt_   map[string]interface{}
+}
+
+// List: Retrieves a list of post and user info pairs, possibly
+// filtered.
+func (r *PostUserInfosService) List(userId string, blogId string) *PostUserInfosListCall {
+	c := &PostUserInfosListCall{s: r.s, opt_: make(map[string]interface{})}
+	c.userId = userId
+	c.blogId = blogId
+	return c
+}
+
+// EndDate sets the optional parameter "endDate": Latest post date to
+// fetch, a date-time with RFC 3339 formatting.
+func (c *PostUserInfosListCall) EndDate(endDate string) *PostUserInfosListCall {
+	c.opt_["endDate"] = endDate
+	return c
+}
+
+// FetchBodies sets the optional parameter "fetchBodies": Whether the
+// body content of posts is included.
+func (c *PostUserInfosListCall) FetchBodies(fetchBodies bool) *PostUserInfosListCall {
+	c.opt_["fetchBodies"] = fetchBodies
+	return c
+}
+
+// Labels sets the optional parameter "labels": Comma-separated list of
+// labels to search for.
+func (c *PostUserInfosListCall) Labels(labels string) *PostUserInfosListCall {
+	c.opt_["labels"] = labels
+	return c
+}
+
+// MaxResults sets the optional parameter "maxResults": Maximum number
+// of posts to fetch.
+func (c *PostUserInfosListCall) MaxResults(maxResults int64) *PostUserInfosListCall {
+	c.opt_["maxResults"] = maxResults
+	return c
+}
+
+// OrderBy sets the optional parameter "orderBy": Sort search results
+func (c *PostUserInfosListCall) OrderBy(orderBy string) *PostUserInfosListCall {
+	c.opt_["orderBy"] = orderBy
+	return c
+}
+
+// PageToken sets the optional parameter "pageToken": Continuation token
+// if the request is paged.
+func (c *PostUserInfosListCall) PageToken(pageToken string) *PostUserInfosListCall {
+	c.opt_["pageToken"] = pageToken
+	return c
+}
+
+// StartDate sets the optional parameter "startDate": Earliest post date
+// to fetch, a date-time with RFC 3339 formatting.
+func (c *PostUserInfosListCall) StartDate(startDate string) *PostUserInfosListCall {
+	c.opt_["startDate"] = startDate
+	return c
+}
+
+// Statuses sets the optional parameter "statuses":
+func (c *PostUserInfosListCall) Statuses(statuses string) *PostUserInfosListCall {
+	c.opt_["statuses"] = statuses
+	return c
+}
+
+// View sets the optional parameter "view":
+func (c *PostUserInfosListCall) View(view string) *PostUserInfosListCall {
+	c.opt_["view"] = view
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *PostUserInfosListCall) Fields(s ...googleapi.Field) *PostUserInfosListCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *PostUserInfosListCall) Do() (*PostUserInfosList, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["endDate"]; ok {
+		params.Set("endDate", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fetchBodies"]; ok {
+		params.Set("fetchBodies", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["labels"]; ok {
+		params.Set("labels", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["maxResults"]; ok {
+		params.Set("maxResults", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["orderBy"]; ok {
+		params.Set("orderBy", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["pageToken"]; ok {
+		params.Set("pageToken", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["startDate"]; ok {
+		params.Set("startDate", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["statuses"]; ok {
+		params.Set("statuses", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["view"]; ok {
+		params.Set("view", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "users/{userId}/blogs/{blogId}/posts")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"userId": c.userId,
+		"blogId": c.blogId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *PostUserInfosList
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Retrieves a list of post and user info pairs, possibly filtered.",
+	//   "httpMethod": "GET",
+	//   "id": "blogger.postUserInfos.list",
+	//   "parameterOrder": [
+	//     "userId",
+	//     "blogId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "ID of the blog to fetch posts from.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "endDate": {
+	//       "description": "Latest post date to fetch, a date-time with RFC 3339 formatting.",
+	//       "format": "date-time",
+	//       "location": "query",
+	//       "type": "string"
+	//     },
+	//     "fetchBodies": {
+	//       "description": "Whether the body content of posts is included.",
+	//       "location": "query",
+	//       "type": "boolean"
+	//     },
+	//     "labels": {
+	//       "description": "Comma-separated list of labels to search for.",
+	//       "location": "query",
+	//       "type": "string"
+	//     },
+	//     "maxResults": {
+	//       "description": "Maximum number of posts to fetch.",
+	//       "format": "uint32",
+	//       "location": "query",
+	//       "type": "integer"
+	//     },
+	//     "orderBy": {
+	//       "default": "PUBLISHED",
+	//       "description": "Sort search results",
+	//       "enum": [
+	//         "published",
+	//         "updated"
+	//       ],
+	//       "enumDescriptions": [
+	//         "Order by the date the post was published",
+	//         "Order by the date the post was last updated"
+	//       ],
+	//       "location": "query",
+	//       "type": "string"
+	//     },
+	//     "pageToken": {
+	//       "description": "Continuation token if the request is paged.",
+	//       "location": "query",
+	//       "type": "string"
+	//     },
+	//     "startDate": {
+	//       "description": "Earliest post date to fetch, a date-time with RFC 3339 formatting.",
+	//       "format": "date-time",
+	//       "location": "query",
+	//       "type": "string"
+	//     },
+	//     "statuses": {
+	//       "enum": [
+	//         "draft",
+	//         "live",
+	//         "scheduled"
+	//       ],
+	//       "enumDescriptions": [
+	//         "Draft posts",
+	//         "Published posts",
+	//         "Posts that are scheduled to publish in future."
+	//       ],
+	//       "location": "query",
+	//       "repeated": true,
+	//       "type": "string"
+	//     },
+	//     "userId": {
+	//       "description": "ID of the user for the per-user information to be fetched. Either the word 'self' (sans quote marks) or the user's profile identifier.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "view": {
+	//       "enum": [
+	//         "ADMIN",
+	//         "AUTHOR",
+	//         "READER"
+	//       ],
+	//       "enumDescriptions": [
+	//         "Admin level detail",
+	//         "Author level detail",
+	//         "Reader level detail"
+	//       ],
+	//       "location": "query",
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "users/{userId}/blogs/{blogId}/posts",
+	//   "response": {
+	//     "$ref": "PostUserInfosList"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger",
+	//     "https://www.googleapis.com/auth/blogger.readonly"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.posts.delete":
+
+type PostsDeleteCall struct {
+	s      *Service
+	blogId string
+	postId string
+	opt_   map[string]interface{}
+}
+
+// Delete: Delete a post by id.
+func (r *PostsService) Delete(blogId string, postId string) *PostsDeleteCall {
+	c := &PostsDeleteCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.postId = postId
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *PostsDeleteCall) Fields(s ...googleapi.Field) *PostsDeleteCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *PostsDeleteCall) Do() error {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/posts/{postId}")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("DELETE", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+		"postId": c.postId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return err
+	}
+	return nil
+	// {
+	//   "description": "Delete a post by id.",
+	//   "httpMethod": "DELETE",
+	//   "id": "blogger.posts.delete",
+	//   "parameterOrder": [
+	//     "blogId",
+	//     "postId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "The Id of the Blog.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "postId": {
+	//       "description": "The ID of the Post.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/posts/{postId}",
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.posts.get":
+
+type PostsGetCall struct {
+	s      *Service
+	blogId string
+	postId string
+	opt_   map[string]interface{}
+}
+
+// Get: Get a post by id.
+func (r *PostsService) Get(blogId string, postId string) *PostsGetCall {
+	c := &PostsGetCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.postId = postId
+	return c
+}
+
+// MaxComments sets the optional parameter "maxComments": Maximum number
+// of comments to pull back on a post.
+func (c *PostsGetCall) MaxComments(maxComments int64) *PostsGetCall {
+	c.opt_["maxComments"] = maxComments
+	return c
+}
+
+// View sets the optional parameter "view":
+func (c *PostsGetCall) View(view string) *PostsGetCall {
+	c.opt_["view"] = view
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *PostsGetCall) Fields(s ...googleapi.Field) *PostsGetCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *PostsGetCall) Do() (*Post, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["maxComments"]; ok {
+		params.Set("maxComments", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["view"]; ok {
+		params.Set("view", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/posts/{postId}")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+		"postId": c.postId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *Post
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Get a post by id.",
+	//   "httpMethod": "GET",
+	//   "id": "blogger.posts.get",
+	//   "parameterOrder": [
+	//     "blogId",
+	//     "postId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "ID of the blog to fetch the post from.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "maxComments": {
+	//       "description": "Maximum number of comments to pull back on a post.",
+	//       "format": "uint32",
+	//       "location": "query",
+	//       "type": "integer"
+	//     },
+	//     "postId": {
+	//       "description": "The ID of the post",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "view": {
+	//       "enum": [
+	//         "ADMIN",
+	//         "AUTHOR",
+	//         "READER"
+	//       ],
+	//       "enumDescriptions": [
+	//         "Admin level detail",
+	//         "Author level detail",
+	//         "Admin level detail"
+	//       ],
+	//       "location": "query",
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/posts/{postId}",
+	//   "response": {
+	//     "$ref": "Post"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger",
+	//     "https://www.googleapis.com/auth/blogger.readonly"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.posts.getByPath":
+
+type PostsGetByPathCall struct {
+	s      *Service
+	blogId string
+	path   string
+	opt_   map[string]interface{}
+}
+
+// GetByPath: Retrieve a Post by Path.
+func (r *PostsService) GetByPath(blogId string, path string) *PostsGetByPathCall {
+	c := &PostsGetByPathCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.path = path
+	return c
+}
+
+// MaxComments sets the optional parameter "maxComments": Maximum number
+// of comments to pull back on a post.
+func (c *PostsGetByPathCall) MaxComments(maxComments int64) *PostsGetByPathCall {
+	c.opt_["maxComments"] = maxComments
+	return c
+}
+
+// View sets the optional parameter "view":
+func (c *PostsGetByPathCall) View(view string) *PostsGetByPathCall {
+	c.opt_["view"] = view
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *PostsGetByPathCall) Fields(s ...googleapi.Field) *PostsGetByPathCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *PostsGetByPathCall) Do() (*Post, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	params.Set("path", fmt.Sprintf("%v", c.path))
+	if v, ok := c.opt_["maxComments"]; ok {
+		params.Set("maxComments", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["view"]; ok {
+		params.Set("view", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/posts/bypath")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *Post
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Retrieve a Post by Path.",
+	//   "httpMethod": "GET",
+	//   "id": "blogger.posts.getByPath",
+	//   "parameterOrder": [
+	//     "blogId",
+	//     "path"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "ID of the blog to fetch the post from.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "maxComments": {
+	//       "description": "Maximum number of comments to pull back on a post.",
+	//       "format": "uint32",
+	//       "location": "query",
+	//       "type": "integer"
+	//     },
+	//     "path": {
+	//       "description": "Path of the Post to retrieve.",
+	//       "location": "query",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "view": {
+	//       "enum": [
+	//         "ADMIN",
+	//         "AUTHOR",
+	//         "READER"
+	//       ],
+	//       "enumDescriptions": [
+	//         "Admin level detail",
+	//         "Author level detail",
+	//         "Admin level detail"
+	//       ],
+	//       "location": "query",
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/posts/bypath",
+	//   "response": {
+	//     "$ref": "Post"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger",
+	//     "https://www.googleapis.com/auth/blogger.readonly"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.posts.insert":
+
+type PostsInsertCall struct {
+	s      *Service
+	blogId string
+	post   *Post
+	opt_   map[string]interface{}
+}
+
+// Insert: Add a post.
+func (r *PostsService) Insert(blogId string, post *Post) *PostsInsertCall {
+	c := &PostsInsertCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.post = post
+	return c
+}
+
+// IsDraft sets the optional parameter "isDraft": Whether to create the
+// post as a draft
+func (c *PostsInsertCall) IsDraft(isDraft bool) *PostsInsertCall {
+	c.opt_["isDraft"] = isDraft
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *PostsInsertCall) Fields(s ...googleapi.Field) *PostsInsertCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *PostsInsertCall) Do() (*Post, error) {
+	var body io.Reader = nil
+	body, err := googleapi.WithoutDataWrapper.JSONReader(c.post)
+	if err != nil {
+		return nil, err
+	}
+	ctype := "application/json"
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["isDraft"]; ok {
+		params.Set("isDraft", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/posts")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("POST", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+	})
+	req.Header.Set("Content-Type", ctype)
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *Post
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Add a post.",
+	//   "httpMethod": "POST",
+	//   "id": "blogger.posts.insert",
+	//   "parameterOrder": [
+	//     "blogId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "ID of the blog to add the post to.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "isDraft": {
+	//       "description": "Whether to create the post as a draft",
+	//       "location": "query",
+	//       "type": "boolean"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/posts",
+	//   "request": {
+	//     "$ref": "Post"
+	//   },
+	//   "response": {
+	//     "$ref": "Post"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.posts.list":
+
+type PostsListCall struct {
+	s      *Service
+	blogId string
+	opt_   map[string]interface{}
+}
+
+// List: Retrieves a list of posts, possibly filtered.
+func (r *PostsService) List(blogId string) *PostsListCall {
+	c := &PostsListCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	return c
+}
+
+// EndDate sets the optional parameter "endDate": Latest post date to
+// fetch, a date-time with RFC 3339 formatting.
+func (c *PostsListCall) EndDate(endDate string) *PostsListCall {
+	c.opt_["endDate"] = endDate
+	return c
+}
+
+// FetchBodies sets the optional parameter "fetchBodies": Whether the
+// body content of posts is included (default: true). This should be set
+// to false when the post bodies are not required, to help minimize
+// traffic.
+func (c *PostsListCall) FetchBodies(fetchBodies bool) *PostsListCall {
+	c.opt_["fetchBodies"] = fetchBodies
+	return c
+}
+
+// FetchImages sets the optional parameter "fetchImages": Whether image
+// URL metadata for each post is included.
+func (c *PostsListCall) FetchImages(fetchImages bool) *PostsListCall {
+	c.opt_["fetchImages"] = fetchImages
+	return c
+}
+
+// Labels sets the optional parameter "labels": Comma-separated list of
+// labels to search for.
+func (c *PostsListCall) Labels(labels string) *PostsListCall {
+	c.opt_["labels"] = labels
+	return c
+}
+
+// MaxResults sets the optional parameter "maxResults": Maximum number
+// of posts to fetch.
+func (c *PostsListCall) MaxResults(maxResults int64) *PostsListCall {
+	c.opt_["maxResults"] = maxResults
+	return c
+}
+
+// OrderBy sets the optional parameter "orderBy": Sort search results
+func (c *PostsListCall) OrderBy(orderBy string) *PostsListCall {
+	c.opt_["orderBy"] = orderBy
+	return c
+}
+
+// PageToken sets the optional parameter "pageToken": Continuation token
+// if the request is paged.
+func (c *PostsListCall) PageToken(pageToken string) *PostsListCall {
+	c.opt_["pageToken"] = pageToken
+	return c
+}
+
+// StartDate sets the optional parameter "startDate": Earliest post date
+// to fetch, a date-time with RFC 3339 formatting.
+func (c *PostsListCall) StartDate(startDate string) *PostsListCall {
+	c.opt_["startDate"] = startDate
+	return c
+}
+
+// Statuses sets the optional parameter "statuses":
+func (c *PostsListCall) Statuses(statuses string) *PostsListCall {
+	c.opt_["statuses"] = statuses
+	return c
+}
+
+// View sets the optional parameter "view":
+func (c *PostsListCall) View(view string) *PostsListCall {
+	c.opt_["view"] = view
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *PostsListCall) Fields(s ...googleapi.Field) *PostsListCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *PostsListCall) Do() (*PostList, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["endDate"]; ok {
+		params.Set("endDate", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fetchBodies"]; ok {
+		params.Set("fetchBodies", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fetchImages"]; ok {
+		params.Set("fetchImages", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["labels"]; ok {
+		params.Set("labels", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["maxResults"]; ok {
+		params.Set("maxResults", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["orderBy"]; ok {
+		params.Set("orderBy", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["pageToken"]; ok {
+		params.Set("pageToken", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["startDate"]; ok {
+		params.Set("startDate", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["statuses"]; ok {
+		params.Set("statuses", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["view"]; ok {
+		params.Set("view", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/posts")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *PostList
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Retrieves a list of posts, possibly filtered.",
+	//   "httpMethod": "GET",
+	//   "id": "blogger.posts.list",
+	//   "parameterOrder": [
+	//     "blogId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "ID of the blog to fetch posts from.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "endDate": {
+	//       "description": "Latest post date to fetch, a date-time with RFC 3339 formatting.",
+	//       "format": "date-time",
+	//       "location": "query",
+	//       "type": "string"
+	//     },
+	//     "fetchBodies": {
+	//       "default": "true",
+	//       "description": "Whether the body content of posts is included (default: true). This should be set to false when the post bodies are not required, to help minimize traffic.",
+	//       "location": "query",
+	//       "type": "boolean"
+	//     },
+	//     "fetchImages": {
+	//       "description": "Whether image URL metadata for each post is included.",
+	//       "location": "query",
+	//       "type": "boolean"
+	//     },
+	//     "labels": {
+	//       "description": "Comma-separated list of labels to search for.",
+	//       "location": "query",
+	//       "type": "string"
+	//     },
+	//     "maxResults": {
+	//       "description": "Maximum number of posts to fetch.",
+	//       "format": "uint32",
+	//       "location": "query",
+	//       "type": "integer"
+	//     },
+	//     "orderBy": {
+	//       "default": "PUBLISHED",
+	//       "description": "Sort search results",
+	//       "enum": [
+	//         "published",
+	//         "updated"
+	//       ],
+	//       "enumDescriptions": [
+	//         "Order by the date the post was published",
+	//         "Order by the date the post was last updated"
+	//       ],
+	//       "location": "query",
+	//       "type": "string"
+	//     },
+	//     "pageToken": {
+	//       "description": "Continuation token if the request is paged.",
+	//       "location": "query",
+	//       "type": "string"
+	//     },
+	//     "startDate": {
+	//       "description": "Earliest post date to fetch, a date-time with RFC 3339 formatting.",
+	//       "format": "date-time",
+	//       "location": "query",
+	//       "type": "string"
+	//     },
+	//     "statuses": {
+	//       "enum": [
+	//         "draft",
+	//         "live",
+	//         "scheduled"
+	//       ],
+	//       "enumDescriptions": [
+	//         "Draft posts",
+	//         "Published posts",
+	//         "Posts that are scheduled to publish in future."
+	//       ],
+	//       "location": "query",
+	//       "repeated": true,
+	//       "type": "string"
+	//     },
+	//     "view": {
+	//       "enum": [
+	//         "ADMIN",
+	//         "AUTHOR",
+	//         "READER"
+	//       ],
+	//       "enumDescriptions": [
+	//         "Admin level detail",
+	//         "Author level detail",
+	//         "Reader level detail"
+	//       ],
+	//       "location": "query",
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/posts",
+	//   "response": {
+	//     "$ref": "PostList"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger",
+	//     "https://www.googleapis.com/auth/blogger.readonly"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.posts.patch":
+
+type PostsPatchCall struct {
+	s      *Service
+	blogId string
+	postId string
+	post   *Post
+	opt_   map[string]interface{}
+}
+
+// Patch: Update a post. This method supports patch semantics.
+func (r *PostsService) Patch(blogId string, postId string, post *Post) *PostsPatchCall {
+	c := &PostsPatchCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.postId = postId
+	c.post = post
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *PostsPatchCall) Fields(s ...googleapi.Field) *PostsPatchCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *PostsPatchCall) Do() (*Post, error) {
+	var body io.Reader = nil
+	body, err := googleapi.WithoutDataWrapper.JSONReader(c.post)
+	if err != nil {
+		return nil, err
+	}
+	ctype := "application/json"
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/posts/{postId}")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("PATCH", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+		"postId": c.postId,
+	})
+	req.Header.Set("Content-Type", ctype)
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *Post
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Update a post. This method supports patch semantics.",
+	//   "httpMethod": "PATCH",
+	//   "id": "blogger.posts.patch",
+	//   "parameterOrder": [
+	//     "blogId",
+	//     "postId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "The ID of the Blog.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "postId": {
+	//       "description": "The ID of the Post.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/posts/{postId}",
+	//   "request": {
+	//     "$ref": "Post"
+	//   },
+	//   "response": {
+	//     "$ref": "Post"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.posts.publish":
+
+type PostsPublishCall struct {
+	s      *Service
+	blogId string
+	postId string
+	opt_   map[string]interface{}
+}
+
+// Publish: Publish a draft post.
+func (r *PostsService) Publish(blogId string, postId string) *PostsPublishCall {
+	c := &PostsPublishCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.postId = postId
+	return c
+}
+
+// PublishDate sets the optional parameter "publishDate": The date and
+// time to schedule the publishing of the Blog.
+func (c *PostsPublishCall) PublishDate(publishDate string) *PostsPublishCall {
+	c.opt_["publishDate"] = publishDate
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *PostsPublishCall) Fields(s ...googleapi.Field) *PostsPublishCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *PostsPublishCall) Do() (*Post, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["publishDate"]; ok {
+		params.Set("publishDate", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/posts/{postId}/publish")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("POST", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+		"postId": c.postId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *Post
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Publish a draft post.",
+	//   "httpMethod": "POST",
+	//   "id": "blogger.posts.publish",
+	//   "parameterOrder": [
+	//     "blogId",
+	//     "postId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "The ID of the Blog.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "postId": {
+	//       "description": "The ID of the Post.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "publishDate": {
+	//       "description": "The date and time to schedule the publishing of the Blog.",
+	//       "format": "date-time",
+	//       "location": "query",
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/posts/{postId}/publish",
+	//   "response": {
+	//     "$ref": "Post"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.posts.revert":
+
+type PostsRevertCall struct {
+	s      *Service
+	blogId string
+	postId string
+	opt_   map[string]interface{}
+}
+
+// Revert: Revert a published or scheduled post to draft state.
+func (r *PostsService) Revert(blogId string, postId string) *PostsRevertCall {
+	c := &PostsRevertCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.postId = postId
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *PostsRevertCall) Fields(s ...googleapi.Field) *PostsRevertCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *PostsRevertCall) Do() (*Post, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/posts/{postId}/revert")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("POST", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+		"postId": c.postId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *Post
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Revert a published or scheduled post to draft state.",
+	//   "httpMethod": "POST",
+	//   "id": "blogger.posts.revert",
+	//   "parameterOrder": [
+	//     "blogId",
+	//     "postId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "The ID of the Blog.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "postId": {
+	//       "description": "The ID of the Post.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/posts/{postId}/revert",
+	//   "response": {
+	//     "$ref": "Post"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.posts.search":
+
+type PostsSearchCall struct {
+	s      *Service
+	blogId string
+	q      string
+	opt_   map[string]interface{}
+}
+
+// Search: Search for a post.
+func (r *PostsService) Search(blogId string, q string) *PostsSearchCall {
+	c := &PostsSearchCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.q = q
+	return c
+}
+
+// FetchBodies sets the optional parameter "fetchBodies": Whether the
+// body content of posts is included (default: true). This should be set
+// to false when the post bodies are not required, to help minimize
+// traffic.
+func (c *PostsSearchCall) FetchBodies(fetchBodies bool) *PostsSearchCall {
+	c.opt_["fetchBodies"] = fetchBodies
+	return c
+}
+
+// OrderBy sets the optional parameter "orderBy": Sort search results
+func (c *PostsSearchCall) OrderBy(orderBy string) *PostsSearchCall {
+	c.opt_["orderBy"] = orderBy
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *PostsSearchCall) Fields(s ...googleapi.Field) *PostsSearchCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *PostsSearchCall) Do() (*PostList, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	params.Set("q", fmt.Sprintf("%v", c.q))
+	if v, ok := c.opt_["fetchBodies"]; ok {
+		params.Set("fetchBodies", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["orderBy"]; ok {
+		params.Set("orderBy", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/posts/search")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *PostList
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Search for a post.",
+	//   "httpMethod": "GET",
+	//   "id": "blogger.posts.search",
+	//   "parameterOrder": [
+	//     "blogId",
+	//     "q"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "ID of the blog to fetch the post from.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "fetchBodies": {
+	//       "default": "true",
+	//       "description": "Whether the body content of posts is included (default: true). This should be set to false when the post bodies are not required, to help minimize traffic.",
+	//       "location": "query",
+	//       "type": "boolean"
+	//     },
+	//     "orderBy": {
+	//       "default": "PUBLISHED",
+	//       "description": "Sort search results",
+	//       "enum": [
+	//         "published",
+	//         "updated"
+	//       ],
+	//       "enumDescriptions": [
+	//         "Order by the date the post was published",
+	//         "Order by the date the post was last updated"
+	//       ],
+	//       "location": "query",
+	//       "type": "string"
+	//     },
+	//     "q": {
+	//       "description": "Query terms to search this blog for matching posts.",
+	//       "location": "query",
+	//       "required": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/posts/search",
+	//   "response": {
+	//     "$ref": "PostList"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger",
+	//     "https://www.googleapis.com/auth/blogger.readonly"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.posts.update":
+
+type PostsUpdateCall struct {
+	s      *Service
+	blogId string
+	postId string
+	post   *Post
+	opt_   map[string]interface{}
+}
+
+// Update: Update a post.
+func (r *PostsService) Update(blogId string, postId string, post *Post) *PostsUpdateCall {
+	c := &PostsUpdateCall{s: r.s, opt_: make(map[string]interface{})}
+	c.blogId = blogId
+	c.postId = postId
+	c.post = post
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *PostsUpdateCall) Fields(s ...googleapi.Field) *PostsUpdateCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *PostsUpdateCall) Do() (*Post, error) {
+	var body io.Reader = nil
+	body, err := googleapi.WithoutDataWrapper.JSONReader(c.post)
+	if err != nil {
+		return nil, err
+	}
+	ctype := "application/json"
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "blogs/{blogId}/posts/{postId}")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("PUT", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"blogId": c.blogId,
+		"postId": c.postId,
+	})
+	req.Header.Set("Content-Type", ctype)
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *Post
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Update a post.",
+	//   "httpMethod": "PUT",
+	//   "id": "blogger.posts.update",
+	//   "parameterOrder": [
+	//     "blogId",
+	//     "postId"
+	//   ],
+	//   "parameters": {
+	//     "blogId": {
+	//       "description": "The ID of the Blog.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     },
+	//     "postId": {
+	//       "description": "The ID of the Post.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "blogs/{blogId}/posts/{postId}",
+	//   "request": {
+	//     "$ref": "Post"
+	//   },
+	//   "response": {
+	//     "$ref": "Post"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger"
+	//   ]
+	// }
+
+}
+
+// method id "blogger.users.get":
+
+type UsersGetCall struct {
+	s      *Service
+	userId string
+	opt_   map[string]interface{}
+}
+
+// Get: Gets one user by id.
+func (r *UsersService) Get(userId string) *UsersGetCall {
+	c := &UsersGetCall{s: r.s, opt_: make(map[string]interface{})}
+	c.userId = userId
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *UsersGetCall) Fields(s ...googleapi.Field) *UsersGetCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *UsersGetCall) Do() (*User, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "users/{userId}")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"userId": c.userId,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *User
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Gets one user by id.",
+	//   "httpMethod": "GET",
+	//   "id": "blogger.users.get",
+	//   "parameterOrder": [
+	//     "userId"
+	//   ],
+	//   "parameters": {
+	//     "userId": {
+	//       "description": "The ID of the user to get.",
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "users/{userId}",
+	//   "response": {
+	//     "$ref": "User"
+	//   },
+	//   "scopes": [
+	//     "https://www.googleapis.com/auth/blogger",
+	//     "https://www.googleapis.com/auth/blogger.readonly"
+	//   ]
+	// }
+
+}
diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/variants.json b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/variants.json
new file mode 100644
index 00000000..ae2fbb99
--- /dev/null
+++ b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/variants.json
@@ -0,0 +1,418 @@
+{
+ "kind": "discovery#restDescription",
+ "etag": "\"kEk3sFj6Ef5_yR1-H3bAO6qw9mI/3m5rB86FE5KuW1K3jAl88AxCreg\"",
+ "discoveryVersion": "v1",
+ "id": "additionalpropsobjs:v1",
+ "name": "additionalpropsobjs",
+ "version": "v1",
+ "title": "Example API",
+ "description": "The Example API demonstrates an associative array.",
+ "ownerDomain": "google.com",
+ "ownerName": "Google",
+ "protocol": "rest",
+ "schemas": {
+  "GeoJsonGeometry": {
+   "id": "GeoJsonGeometry",
+   "type": "object",
+   "variant": {
+    "discriminant": "type",
+    "map": [
+     {
+      "type_value": "GeometryCollection",
+      "$ref": "GeoJsonGeometryCollection"
+     },
+     {
+      "type_value": "LineString",
+      "$ref": "GeoJsonLineString"
+     },
+     {
+      "type_value": "MultiLineString",
+      "$ref": "GeoJsonMultiLineString"
+     },
+     {
+      "type_value": "MultiPoint",
+      "$ref": "GeoJsonMultiPoint"
+     },
+     {
+      "type_value": "MultiPolygon",
+      "$ref": "GeoJsonMultiPolygon"
+     },
+     {
+      "type_value": "Point",
+      "$ref": "GeoJsonPoint"
+     },
+     {
+      "type_value": "Polygon",
+      "$ref": "GeoJsonPolygon"
+     }
+    ]
+   }
+  },
+  "GeoJsonGeometryCollection": {
+   "id": "GeoJsonGeometryCollection",
+   "type": "object",
+   "description": "A heterogenous collection of GeoJsonGeometry objects.",
+   "properties": {
+    "geometries": {
+     "type": "array",
+     "description": "An array of geometry objects. There must be at least 2 different types of geometries in the array.",
+     "items": {
+      "$ref": "GeoJsonGeometry"
+     }
+    },
+    "type": {
+     "type": "string",
+     "description": "Identifies this object as a GeoJsonGeometryCollection.",
+     "enum": [
+      "GeometryCollection"
+     ],
+     "enumDescriptions": [
+      ""
+     ]
+    }
+   }
+  },
+  "GeoJsonLineString": {
+   "id": "GeoJsonLineString",
+   "type": "object",
+   "properties": {
+    "coordinates": {
+     "type": "array",
+     "description": "An array of two or more positions, representing a line.",
+     "items": {
+      "$ref": "GeoJsonPosition"
+     }
+    },
+    "type": {
+     "type": "string",
+     "description": "Identifies this object as a GeoJsonLineString.",
+     "enum": [
+      "LineString"
+     ],
+     "enumDescriptions": [
+      ""
+     ]
+    }
+   }
+  },
+  "GeoJsonMultiLineString": {
+   "id": "GeoJsonMultiLineString",
+   "type": "object",
+   "description": "Multi Line String",
+   "properties": {
+    "coordinates": {
+     "type": "array",
+     "description": "An array of at least two GeoJsonLineString coordinate arrays.",
+     "items": {
+      "type": "array",
+      "items": {
+       "$ref": "GeoJsonPosition"
+      }
+     }
+    },
+    "type": {
+     "type": "string",
+     "description": "Identifies this object as a GeoJsonMultiLineString.",
+     "enum": [
+      "MultiLineString"
+     ],
+     "enumDescriptions": [
+      ""
+     ]
+    }
+   }
+  },
+  "GeoJsonMultiPoint": {
+   "id": "GeoJsonMultiPoint",
+   "type": "object",
+   "properties": {
+    "coordinates": {
+     "type": "array",
+     "description": "An array of at least two GeoJsonPoint coordinate arrays.",
+     "items": {
+      "$ref": "GeoJsonPosition"
+     }
+    },
+    "type": {
+     "type": "string",
+     "description": "Identifies this object as a GeoJsonMultiPoint.",
+     "enum": [
+      "MultiPoint"
+     ],
+     "enumDescriptions": [
+      ""
+     ]
+    }
+   }
+  },
+  "GeoJsonMultiPolygon": {
+   "id": "GeoJsonMultiPolygon",
+   "type": "object",
+   "properties": {
+    "coordinates": {
+     "type": "array",
+     "description": "An array of at least two GeoJsonPolygon coordinate arrays.",
+     "items": {
+      "type": "array",
+      "items": {
+       "type": "array",
+       "items": {
+        "$ref": "GeoJsonPosition"
+       }
+      }
+     }
+    },
+    "type": {
+     "type": "string",
+     "description": "Identifies this object as a GeoJsonMultiPolygon.",
+     "enum": [
+      "MultiPolygon"
+     ],
+     "enumDescriptions": [
+      ""
+     ]
+    }
+   }
+  },
+  "GeoJsonPoint": {
+   "id": "GeoJsonPoint",
+   "type": "object",
+   "properties": {
+    "coordinates": {
+     "$ref": "GeoJsonPosition",
+     "description": "A single GeoJsonPosition, specifying the location of the point."
+    },
+    "type": {
+     "type": "string",
+     "description": "Identifies this object as a GeoJsonPoint.",
+     "enum": [
+      "Point"
+     ],
+     "enumDescriptions": [
+      ""
+     ]
+    }
+   }
+  },
+  "GeoJsonPolygon": {
+   "id": "GeoJsonPolygon",
+   "type": "object",
+   "properties": {
+    "coordinates": {
+     "type": "array",
+     "description": "An array of LinearRings, each of which is an array of four or more GeoJsonPositions. The first and last coordinates in each LinearRing must be the same. For polygons with multiple rings, the first LinearRing is the external ring, with subsequent rings being interior rings (i.e. hole). All LinearRings must contain GeoJsonPositions in counter-clockwise order.",
+     "items": {
+      "type": "array",
+      "items": {
+       "$ref": "GeoJsonPosition"
+      }
+     }
+    },
+    "type": {
+     "type": "string",
+     "description": "Identifies this object as a GeoJsonPolygon.",
+     "enum": [
+      "Polygon"
+     ],
+     "enumDescriptions": [
+      ""
+     ]
+    }
+   }
+  },
+  "GeoJsonPosition": {
+   "id": "GeoJsonPosition",
+   "type": "array",
+   "description": "A position represents a geographical position as an array containing a longitude and a latitude, and optionally an altitude, in that order. All Geometry objects make use of positions to represent geometries as nested arrays. The structure of the array is governed by the type of the geometry.",
+   "items": {
+    "type": "number",
+    "format": "double"
+   }
+  },
+  "MapFolder": {
+   "id": "MapFolder",
+   "type": "object",
+   "properties": {
+    "contents": {
+     "type": "array",
+     "items": {
+      "$ref": "MapItem"
+     }
+    },
+    "defaultViewport": {
+     "type": "array",
+     "description": "An array of four numbers (west, south, east, north) which defines the rectangular bounding box of the default viewport. The numbers represent latitude and longitude in decimal degrees.",
+     "items": {
+      "type": "number",
+      "format": "double"
+     }
+    },
+    "expandable": {
+     "type": "boolean",
+     "description": "The expandability setting of this MapFolder. If true, the folder can be expanded."
+    },
+    "key": {
+     "type": "string",
+     "description": "A user defined alias for this MapFolder, specific to this Map."
+    },
+    "name": {
+     "type": "string",
+     "description": "The name of this MapFolder.",
+     "annotations": {
+      "required": [
+       "mapsengine.maps.create",
+       "mapsengine.maps.patch"
+      ]
+     }
+    },
+    "type": {
+     "type": "string",
+     "description": "Identifies this object as a MapFolder.",
+     "enum": [
+      "folder"
+     ],
+     "enumDescriptions": [
+      ""
+     ],
+     "annotations": {
+      "required": [
+       "mapsengine.maps.create",
+       "mapsengine.maps.patch"
+      ]
+     }
+    },
+    "visibility": {
+     "type": "string",
+     "description": "The visibility setting of this MapFolder. One of \"defaultOn\" or \"defaultOff\"."
+    }
+   }
+  },
+  "MapItem": {
+   "id": "MapItem",
+   "type": "object",
+   "variant": {
+    "discriminant": "type",
+    "map": [
+     {
+      "type_value": "folder",
+      "$ref": "MapFolder"
+     },
+     {
+      "type_value": "kmlLink",
+      "$ref": "MapKmlLink"
+     },
+     {
+      "type_value": "layer",
+      "$ref": "MapLayer"
+     }
+    ]
+   }
+  },
+  "MapKmlLink": {
+   "id": "MapKmlLink",
+   "type": "object",
+   "properties": {
+    "defaultViewport": {
+     "type": "array",
+     "description": "An array of four numbers (west, south, east, north) which defines the rectangular bounding box of the default viewport. The numbers represent latitude and longitude in decimal degrees.",
+     "items": {
+      "type": "number",
+      "format": "double"
+     }
+    },
+    "kmlUrl": {
+     "type": "string",
+     "description": "The URL to the KML file represented by this MapKmlLink.",
+     "annotations": {
+      "required": [
+       "mapsengine.maps.create",
+       "mapsengine.maps.patch"
+      ]
+     }
+    },
+    "name": {
+     "type": "string",
+     "description": "The name of this MapKmlLink.",
+     "annotations": {
+      "required": [
+       "mapsengine.maps.create",
+       "mapsengine.maps.patch"
+      ]
+     }
+    },
+    "type": {
+     "type": "string",
+     "description": "Identifies this object as a MapKmlLink.",
+     "enum": [
+      "kmlLink"
+     ],
+     "enumDescriptions": [
+      ""
+     ],
+     "annotations": {
+      "required": [
+       "mapsengine.maps.create",
+       "mapsengine.maps.patch"
+      ]
+     }
+    },
+    "visibility": {
+     "type": "string",
+     "description": "The visibility setting of this MapKmlLink. One of \"defaultOn\" or \"defaultOff\"."
+    }
+   }
+  },
+  "MapLayer": {
+   "id": "MapLayer",
+   "type": "object",
+   "properties": {
+    "defaultViewport": {
+     "type": "array",
+     "description": "An array of four numbers (west, south, east, north) which defines the rectangular bounding box of the default viewport. The numbers represent latitude and longitude in decimal degrees.",
+     "items": {
+      "type": "number",
+      "format": "double"
+     }
+    },
+    "id": {
+     "type": "string",
+     "description": "The ID of this MapLayer. This ID can be used to request more details about the layer.",
+     "annotations": {
+      "required": [
+       "mapsengine.maps.create",
+       "mapsengine.maps.patch"
+      ]
+     }
+    },
+    "key": {
+     "type": "string",
+     "description": "A user defined alias for this MapLayer, specific to this Map."
+    },
+    "name": {
+     "type": "string",
+     "description": "The name of this MapLayer."
+    },
+    "type": {
+     "type": "string",
+     "description": "Identifies this object as a MapLayer.",
+     "enum": [
+      "layer"
+     ],
+     "enumDescriptions": [
+      ""
+     ],
+     "annotations": {
+      "required": [
+       "mapsengine.maps.create",
+       "mapsengine.maps.patch"
+      ]
+     }
+    },
+    "visibility": {
+     "type": "string",
+     "description": "The visibility setting of this MapLayer. One of \"defaultOn\" or \"defaultOff\"."
+    }
+   }
+  }
+ }
+}
diff --git a/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/variants.want b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/variants.want
new file mode 100644
index 00000000..e6506161
--- /dev/null
+++ b/Godeps/_workspace/src/google.golang.org/api/google-api-go-generator/testdata/variants.want
@@ -0,0 +1,278 @@
+// Package additionalpropsobjs provides access to the Example API.
+//
+// Usage example:
+//
+//   import "google.golang.org/api/additionalpropsobjs/v1"
+//   ...
+//   additionalpropsobjsService, err := additionalpropsobjs.New(oauthHttpClient)
+package additionalpropsobjs
+
+import (
+	"bytes"
+	"google.golang.org/api/googleapi"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"strconv"
+	"strings"
+)
+
+// Always reference these packages, just in case the auto-generated code
+// below doesn't.
+var _ = bytes.NewBuffer
+var _ = strconv.Itoa
+var _ = fmt.Sprintf
+var _ = json.NewDecoder
+var _ = io.Copy
+var _ = url.Parse
+var _ = googleapi.Version
+var _ = errors.New
+var _ = strings.Replace
+
+const apiId = "additionalpropsobjs:v1"
+const apiName = "additionalpropsobjs"
+const apiVersion = "v1"
+const basePath = "https://www.googleapis.com/discovery/v1/apis"
+
+func New(client *http.Client) (*Service, error) {
+	if client == nil {
+		return nil, errors.New("client is nil")
+	}
+	s := &Service{client: client, BasePath: basePath}
+	return s, nil
+}
+
+type Service struct {
+	client   *http.Client
+	BasePath string // API endpoint base URL
+}
+
+type GeoJsonGeometry map[string]interface{}
+
+func (t GeoJsonGeometry) Type() string {
+	return googleapi.VariantType(t)
+}
+
+func (t GeoJsonGeometry) GeometryCollection() (r GeoJsonGeometryCollection, ok bool) {
+	if t.Type() != "GeometryCollection" {
+		return r, false
+	}
+	ok = googleapi.ConvertVariant(map[string]interface{}(t), &r)
+	return r, ok
+}
+
+func (t GeoJsonGeometry) LineString() (r GeoJsonLineString, ok bool) {
+	if t.Type() != "LineString" {
+		return r, false
+	}
+	ok = googleapi.ConvertVariant(map[string]interface{}(t), &r)
+	return r, ok
+}
+
+func (t GeoJsonGeometry) MultiLineString() (r GeoJsonMultiLineString, ok bool) {
+	if t.Type() != "MultiLineString" {
+		return r, false
+	}
+	ok = googleapi.ConvertVariant(map[string]interface{}(t), &r)
+	return r, ok
+}
+
+func (t GeoJsonGeometry) MultiPoint() (r GeoJsonMultiPoint, ok bool) {
+	if t.Type() != "MultiPoint" {
+		return r, false
+	}
+	ok = googleapi.ConvertVariant(map[string]interface{}(t), &r)
+	return r, ok
+}
+
+func (t GeoJsonGeometry) MultiPolygon() (r GeoJsonMultiPolygon, ok bool) {
+	if t.Type() != "MultiPolygon" {
+		return r, false
+	}
+	ok = googleapi.ConvertVariant(map[string]interface{}(t), &r)
+	return r, ok
+}
+
+func (t GeoJsonGeometry) Point() (r GeoJsonPoint, ok bool) {
+	if t.Type() != "Point" {
+		return r, false
+	}
+	ok = googleapi.ConvertVariant(map[string]interface{}(t), &r)
+	return r, ok
+}
+
+func (t GeoJsonGeometry) Polygon() (r GeoJsonPolygon, ok bool) {
+	if t.Type() != "Polygon" {
+		return r, false
+	}
+	ok = googleapi.ConvertVariant(map[string]interface{}(t), &r)
+	return r, ok
+}
+
+type GeoJsonGeometryCollection struct {
+	// Geometries: An array of geometry objects. There must be at least 2
+	// different types of geometries in the array.
+	Geometries []GeoJsonGeometry `json:"geometries,omitempty"`
+
+	// Type: Identifies this object as a GeoJsonGeometryCollection.
+	Type string `json:"type,omitempty"`
+}
+
+type GeoJsonLineString struct {
+	// Coordinates: An array of two or more positions, representing a line.
+	Coordinates [][]float64 `json:"coordinates,omitempty"`
+
+	// Type: Identifies this object as a GeoJsonLineString.
+	Type string `json:"type,omitempty"`
+}
+
+type GeoJsonMultiLineString struct {
+	// Coordinates: An array of at least two GeoJsonLineString coordinate
+	// arrays.
+	Coordinates [][][]float64 `json:"coordinates,omitempty"`
+
+	// Type: Identifies this object as a GeoJsonMultiLineString.
+	Type string `json:"type,omitempty"`
+}
+
+type GeoJsonMultiPoint struct {
+	// Coordinates: An array of at least two GeoJsonPoint coordinate arrays.
+	Coordinates [][]float64 `json:"coordinates,omitempty"`
+
+	// Type: Identifies this object as a GeoJsonMultiPoint.
+	Type string `json:"type,omitempty"`
+}
+
+type GeoJsonMultiPolygon struct {
+	// Coordinates: An array of at least two GeoJsonPolygon coordinate
+	// arrays.
+	Coordinates [][][][]float64 `json:"coordinates,omitempty"`
+
+	// Type: Identifies this object as a GeoJsonMultiPolygon.
+	Type string `json:"type,omitempty"`
+}
+
+type GeoJsonPoint struct {
+	// Coordinates: A single GeoJsonPosition, specifying the location of the
+	// point.
+	Coordinates []float64 `json:"coordinates,omitempty"`
+
+	// Type: Identifies this object as a GeoJsonPoint.
+	Type string `json:"type,omitempty"`
+}
+
+type GeoJsonPolygon struct {
+	// Coordinates: An array of LinearRings, each of which is an array of
+	// four or more GeoJsonPositions. The first and last coordinates in each
+	// LinearRing must be the same. For polygons with multiple rings, the
+	// first LinearRing is the external ring, with subsequent rings being
+	// interior rings (i.e. hole). All LinearRings must contain
+	// GeoJsonPositions in counter-clockwise order.
+	Coordinates [][][]float64 `json:"coordinates,omitempty"`
+
+	// Type: Identifies this object as a GeoJsonPolygon.
+	Type string `json:"type,omitempty"`
+}
+
+type MapFolder struct {
+	Contents []MapItem `json:"contents,omitempty"`
+
+	// DefaultViewport: An array of four numbers (west, south, east, north)
+	// which defines the rectangular bounding box of the default viewport.
+	// The numbers represent latitude and longitude in decimal degrees.
+	DefaultViewport []float64 `json:"defaultViewport,omitempty"`
+
+	// Expandable: The expandability setting of this MapFolder. If true, the
+	// folder can be expanded.
+	Expandable bool `json:"expandable,omitempty"`
+
+	// Key: A user defined alias for this MapFolder, specific to this Map.
+	Key string `json:"key,omitempty"`
+
+	// Name: The name of this MapFolder.
+	Name string `json:"name,omitempty"`
+
+	// Type: Identifies this object as a MapFolder.
+	Type string `json:"type,omitempty"`
+
+	// Visibility: The visibility setting of this MapFolder. One of
+	// "defaultOn" or "defaultOff".
+	Visibility string `json:"visibility,omitempty"`
+}
+
+type MapItem map[string]interface{}
+
+func (t MapItem) Type() string {
+	return googleapi.VariantType(t)
+}
+
+func (t MapItem) Folder() (r MapFolder, ok bool) {
+	if t.Type() != "Folder" {
+		return r, false
+	}
+	ok = googleapi.ConvertVariant(map[string]interface{}(t), &r)
+	return r, ok
+}
+
+func (t MapItem) KmlLink() (r MapKmlLink, ok bool) {
+	if t.Type() != "KmlLink" {
+		return r, false
+	}
+	ok = googleapi.ConvertVariant(map[string]interface{}(t), &r)
+	return r, ok
+}
+
+func (t MapItem) Layer() (r MapLayer, ok bool) {
+	if t.Type() != "Layer" {
+		return r, false
+	}
+	ok = googleapi.ConvertVariant(map[string]interface{}(t), &r)
+	return r, ok
+}
+
+type MapKmlLink struct {
+	// DefaultViewport: An array of four numbers (west, south, east, north)
+	// which defines the rectangular bounding box of the default viewport.
+	// The numbers represent latitude and longitude in decimal degrees.
+	DefaultViewport []float64 `json:"defaultViewport,omitempty"`
+
+	// KmlUrl: The URL to the KML file represented by this MapKmlLink.
+	KmlUrl string `json:"kmlUrl,omitempty"`
+
+	// Name: The name of this MapKmlLink.
+	Name string `json:"name,omitempty"`
+
+	// Type: Identifies this object as a MapKmlLink.
+	Type string `json:"type,omitempty"`
+
+	// Visibility: The visibility setting of this MapKmlLink. One of
+	// "defaultOn" or "defaultOff".
+	Visibility string `json:"visibility,omitempty"`
+}
+
+type MapLayer struct {
+	// DefaultViewport: An array of four numbers (west, south, east, north)
+	// which defines the rectangular bounding box of the default viewport.
+	// The numbers represent latitude and longitude in decimal degrees.
+	DefaultViewport []float64 `json:"defaultViewport,omitempty"`
+
+	// Id: The ID of this MapLayer. This ID can be used to request more
+	// details about the layer.
+	Id string `json:"id,omitempty"`
+
+	// Key: A user defined alias for this MapLayer, specific to this Map.
+	Key string `json:"key,omitempty"`
+
+	// Name: The name of this MapLayer.
+	Name string `json:"name,omitempty"`
+
+	// Type: Identifies this object as a MapLayer.
+	Type string `json:"type,omitempty"`
+
+	// Visibility: The visibility setting of this MapLayer. One of
+	// "defaultOn" or "defaultOff".
+	Visibility string `json:"visibility,omitempty"`
+}
diff --git a/Godeps/_workspace/src/google.golang.org/api/googleapi/googleapi.go b/Godeps/_workspace/src/google.golang.org/api/googleapi/googleapi.go
new file mode 100644
index 00000000..af3442eb
--- /dev/null
+++ b/Godeps/_workspace/src/google.golang.org/api/googleapi/googleapi.go
@@ -0,0 +1,401 @@
+// Copyright 2011 Google Inc. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package googleapi contains the common code shared by all Google API
+// libraries.
+package googleapi
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"mime/multipart"
+	"net/http"
+	"net/textproto"
+	"net/url"
+	"os"
+	"strings"
+
+	"google.golang.org/api/googleapi/internal/uritemplates"
+)
+
+// ContentTyper is an interface for Readers which know (or would like
+// to override) their Content-Type. If a media body doesn't implement
+// ContentTyper, the type is sniffed from the content using
+// http.DetectContentType.
+type ContentTyper interface {
+	ContentType() string
+}
+
+const Version = "0.5"
+
+// Error contains an error response from the server.
+type Error struct {
+	// Code is the HTTP response status code and will always be populated.
+	Code int `json:"code"`
+	// Message is the server response message and is only populated when
+	// explicitly referenced by the JSON server response.
+	Message string `json:"message"`
+	// Body is the raw response returned by the server.
+	// It is often but not always JSON, depending on how the request fails.
+	Body string
+
+	Errors []ErrorItem
+}
+
+// ErrorItem is a detailed error code & message from the Google API frontend.
+type ErrorItem struct {
+	// Reason is the typed error code. For example: "some_example".
+	Reason string `json:"reason"`
+	// Message is the human-readable description of the error.
+	Message string `json:"message"`
+}
+
+func (e *Error) Error() string {
+	if len(e.Errors) == 0 && e.Message == "" {
+		return fmt.Sprintf("googleapi: got HTTP response code %d with body: %v", e.Code, e.Body)
+	}
+	var buf bytes.Buffer
+	fmt.Fprintf(&buf, "googleapi: Error %d: ", e.Code)
+	if e.Message != "" {
+		fmt.Fprintf(&buf, "%s", e.Message)
+	}
+	if len(e.Errors) == 0 {
+		return strings.TrimSpace(buf.String())
+	}
+	if len(e.Errors) == 1 && e.Errors[0].Message == e.Message {
+		fmt.Fprintf(&buf, ", %s", e.Errors[0].Reason)
+		return buf.String()
+	}
+	fmt.Fprintln(&buf, "\nMore details:")
+	for _, v := range e.Errors {
+		fmt.Fprintf(&buf, "Reason: %s, Message: %s\n", v.Reason, v.Message)
+	}
+	return buf.String()
+}
+
+type errorReply struct {
+	Error *Error `json:"error"`
+}
+
+// CheckResponse returns an error (of type *Error) if the response
+// status code is not 2xx.
+func CheckResponse(res *http.Response) error {
+	if res.StatusCode >= 200 && res.StatusCode <= 299 {
+		return nil
+	}
+	slurp, err := ioutil.ReadAll(res.Body)
+	if err == nil {
+		jerr := new(errorReply)
+		err = json.Unmarshal(slurp, jerr)
+		if err == nil && jerr.Error != nil {
+			if jerr.Error.Code == 0 {
+				jerr.Error.Code = res.StatusCode
+			}
+			jerr.Error.Body = string(slurp)
+			return jerr.Error
+		}
+	}
+	return &Error{
+		Code: res.StatusCode,
+		Body: string(slurp),
+	}
+}
+
+type MarshalStyle bool
+
+var WithDataWrapper = MarshalStyle(true)
+var WithoutDataWrapper = MarshalStyle(false)
+
+func (wrap MarshalStyle) JSONReader(v interface{}) (io.Reader, error) {
+	buf := new(bytes.Buffer)
+	if wrap {
+		buf.Write([]byte(`{"data": `))
+	}
+	err := json.NewEncoder(buf).Encode(v)
+	if err != nil {
+		return nil, err
+	}
+	if wrap {
+		buf.Write([]byte(`}`))
+	}
+	return buf, nil
+}
+
+func getMediaType(media io.Reader) (io.Reader, string) {
+	if typer, ok := media.(ContentTyper); ok {
+		return media, typer.ContentType()
+	}
+
+	typ := "application/octet-stream"
+	buf := make([]byte, 1024)
+	n, err := media.Read(buf)
+	buf = buf[:n]
+	if err == nil {
+		typ = http.DetectContentType(buf)
+	}
+	return io.MultiReader(bytes.NewBuffer(buf), media), typ
+}
+
+type Lengther interface {
+	Len() int
+}
+
+// endingWithErrorReader from r until it returns an error.  If the
+// final error from r is os.EOF and e is non-nil, e is used instead.
+type endingWithErrorReader struct {
+	r io.Reader
+	e error
+}
+
+func (er endingWithErrorReader) Read(p []byte) (n int, err error) {
+	n, err = er.r.Read(p)
+	if err == io.EOF && er.e != nil {
+		err = er.e
+	}
+	return
+}
+
+func getReaderSize(r io.Reader) (io.Reader, int64) {
+	// Ideal case, the reader knows its own size.
+	if lr, ok := r.(Lengther); ok {
+		return r, int64(lr.Len())
+	}
+
+	// But maybe it's a seeker and we can seek to the end to find its size.
+	if s, ok := r.(io.Seeker); ok {
+		pos0, err := s.Seek(0, os.SEEK_CUR)
+		if err == nil {
+			posend, err := s.Seek(0, os.SEEK_END)
+			if err == nil {
+				_, err = s.Seek(pos0, os.SEEK_SET)
+				if err == nil {
+					return r, posend - pos0
+				} else {
+					// We moved it forward but can't restore it.
+					// Seems unlikely, but can't really restore now.
+					return endingWithErrorReader{strings.NewReader(""), err}, posend - pos0
+				}
+			}
+		}
+	}
+
+	// Otherwise we have to make a copy to calculate how big the reader is.
+	buf := new(bytes.Buffer)
+	// TODO(bradfitz): put a cap on this copy? spill to disk after
+	// a certain point?
+	_, err := io.Copy(buf, r)
+	return endingWithErrorReader{buf, err}, int64(buf.Len())
+}
+
+func typeHeader(contentType string) textproto.MIMEHeader {
+	h := make(textproto.MIMEHeader)
+	h.Set("Content-Type", contentType)
+	return h
+}
+
+// countingWriter counts the number of bytes it receives to write, but
+// discards them.
+type countingWriter struct {
+	n *int64
+}
+
+func (w countingWriter) Write(p []byte) (int, error) {
+	*w.n += int64(len(p))
+	return len(p), nil
+}
+
+// ConditionallyIncludeMedia does nothing if media is nil.
+//
+// bodyp is an in/out parameter.  It should initially point to the
+// reader of the application/json (or whatever) payload to send in the
+// API request.  It's updated to point to the multipart body reader.
+//
+// ctypep is an in/out parameter.  It should initially point to the
+// content type of the bodyp, usually "application/json".  It's updated
+// to the "multipart/related" content type, with random boundary.
+//
+// The return value is the content-length of the entire multpart body.
+func ConditionallyIncludeMedia(media io.Reader, bodyp *io.Reader, ctypep *string) (totalContentLength int64, ok bool) {
+	if media == nil {
+		return
+	}
+	// Get the media type and size. The type check might return a
+	// different reader instance, so do the size check first,
+	// which looks at the specific type of the io.Reader.
+	var mediaType string
+	if typer, ok := media.(ContentTyper); ok {
+		mediaType = typer.ContentType()
+	}
+	media, mediaSize := getReaderSize(media)
+	if mediaType == "" {
+		media, mediaType = getMediaType(media)
+	}
+	body, bodyType := *bodyp, *ctypep
+	body, bodySize := getReaderSize(body)
+
+	// Calculate how big the the multipart will be.
+	{
+		totalContentLength = bodySize + mediaSize
+		mpw := multipart.NewWriter(countingWriter{&totalContentLength})
+		mpw.CreatePart(typeHeader(bodyType))
+		mpw.CreatePart(typeHeader(mediaType))
+		mpw.Close()
+	}
+
+	pr, pw := io.Pipe()
+	mpw := multipart.NewWriter(pw)
+	*bodyp = pr
+	*ctypep = "multipart/related; boundary=" + mpw.Boundary()
+	go func() {
+		defer pw.Close()
+		defer mpw.Close()
+
+		w, err := mpw.CreatePart(typeHeader(bodyType))
+		if err != nil {
+			return
+		}
+		_, err = io.Copy(w, body)
+		if err != nil {
+			return
+		}
+
+		w, err = mpw.CreatePart(typeHeader(mediaType))
+		if err != nil {
+			return
+		}
+		_, err = io.Copy(w, media)
+		if err != nil {
+			return
+		}
+	}()
+	return totalContentLength, true
+}
+
+func ResolveRelative(basestr, relstr string) string {
+	u, _ := url.Parse(basestr)
+	rel, _ := url.Parse(relstr)
+	u = u.ResolveReference(rel)
+	us := u.String()
+	us = strings.Replace(us, "%7B", "{", -1)
+	us = strings.Replace(us, "%7D", "}", -1)
+	return us
+}
+
+// has4860Fix is whether this Go environment contains the fix for
+// http://golang.org/issue/4860
+var has4860Fix bool
+
+// init initializes has4860Fix by checking the behavior of the net/http package.
+func init() {
+	r := http.Request{
+		URL: &url.URL{
+			Scheme: "http",
+			Opaque: "//opaque",
+		},
+	}
+	b := &bytes.Buffer{}
+	r.Write(b)
+	has4860Fix = bytes.HasPrefix(b.Bytes(), []byte("GET http"))
+}
+
+// SetOpaque sets u.Opaque from u.Path such that HTTP requests to it
+// don't alter any hex-escaped characters in u.Path.
+func SetOpaque(u *url.URL) {
+	u.Opaque = "//" + u.Host + u.Path
+	if !has4860Fix {
+		u.Opaque = u.Scheme + ":" + u.Opaque
+	}
+}
+
+// Expand subsitutes any {encoded} strings in the URL passed in using
+// the map supplied.
+//
+// This calls SetOpaque to avoid encoding of the parameters in the URL path.
+func Expand(u *url.URL, expansions map[string]string) {
+	expanded, err := uritemplates.Expand(u.Path, expansions)
+	if err == nil {
+		u.Path = expanded
+		SetOpaque(u)
+	}
+}
+
+// CloseBody is used to close res.Body.
+// Prior to calling Close, it also tries to Read a small amount to see an EOF.
+// Not seeing an EOF can prevent HTTP Transports from reusing connections.
+func CloseBody(res *http.Response) {
+	if res == nil || res.Body == nil {
+		return
+	}
+	// Justification for 3 byte reads: two for up to "\r\n" after
+	// a JSON/XML document, and then 1 to see EOF if we haven't yet.
+	// TODO(bradfitz): detect Go 1.3+ and skip these reads.
+	// See https://codereview.appspot.com/58240043
+	// and https://codereview.appspot.com/49570044
+	buf := make([]byte, 1)
+	for i := 0; i < 3; i++ {
+		_, err := res.Body.Read(buf)
+		if err != nil {
+			break
+		}
+	}
+	res.Body.Close()
+
+}
+
+// VariantType returns the type name of the given variant.
+// If the map doesn't contain the named key or the value is not a []interface{}, "" is returned.
+// This is used to support "variant" APIs that can return one of a number of different types.
+func VariantType(t map[string]interface{}) string {
+	s, _ := t["type"].(string)
+	return s
+}
+
+// ConvertVariant uses the JSON encoder/decoder to fill in the struct 'dst' with the fields found in variant 'v'.
+// This is used to support "variant" APIs that can return one of a number of different types.
+// It reports whether the conversion was successful.
+func ConvertVariant(v map[string]interface{}, dst interface{}) bool {
+	var buf bytes.Buffer
+	err := json.NewEncoder(&buf).Encode(v)
+	if err != nil {
+		return false
+	}
+	return json.Unmarshal(buf.Bytes(), dst) == nil
+}
+
+// A Field names a field to be retrieved with a partial response.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+//
+// Partial responses can dramatically reduce the amount of data that must be sent to your application.
+// In order to request partial responses, you can specify the full list of fields
+// that your application needs by adding the Fields option to your request.
+//
+// Field strings use camelCase with leading lower-case characters to identify fields within the response.
+//
+// For example, if your response has a "NextPageToken" and a slice of "Items" with "Id" fields,
+// you could request just those fields like this:
+//
+//     svc.Events.List().Fields("nextPageToken", "items/id").Do()
+//
+// or if you were also interested in each Item's "Updated" field, you can combine them like this:
+//
+//     svc.Events.List().Fields("nextPageToken", "items(id,updated)").Do()
+//
+// More information about field formatting can be found here:
+// https://developers.google.com/+/api/#fields-syntax
+//
+// Another way to find field names is through the Google API explorer:
+// https://developers.google.com/apis-explorer/#p/
+type Field string
+
+// CombineFields combines fields into a single string.
+func CombineFields(s []Field) string {
+	r := make([]string, len(s))
+	for i, v := range s {
+		r[i] = string(v)
+	}
+	return strings.Join(r, ",")
+}
diff --git a/Godeps/_workspace/src/google.golang.org/api/googleapi/googleapi_test.go b/Godeps/_workspace/src/google.golang.org/api/googleapi/googleapi_test.go
new file mode 100644
index 00000000..abc51850
--- /dev/null
+++ b/Godeps/_workspace/src/google.golang.org/api/googleapi/googleapi_test.go
@@ -0,0 +1,361 @@
+// Copyright 2011 Google Inc. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package googleapi
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"net/url"
+	"reflect"
+	"strings"
+	"testing"
+)
+
+type SetOpaqueTest struct {
+	in             *url.URL
+	wantRequestURI string
+}
+
+var setOpaqueTests = []SetOpaqueTest{
+	// no path
+	{
+		&url.URL{
+			Scheme: "http",
+			Host:   "www.golang.org",
+		},
+		"http://www.golang.org",
+	},
+	// path
+	{
+		&url.URL{
+			Scheme: "http",
+			Host:   "www.golang.org",
+			Path:   "/",
+		},
+		"http://www.golang.org/",
+	},
+	// file with hex escaping
+	{
+		&url.URL{
+			Scheme: "https",
+			Host:   "www.golang.org",
+			Path:   "/file%20one&two",
+		},
+		"https://www.golang.org/file%20one&two",
+	},
+	// query
+	{
+		&url.URL{
+			Scheme:   "http",
+			Host:     "www.golang.org",
+			Path:     "/",
+			RawQuery: "q=go+language",
+		},
+		"http://www.golang.org/?q=go+language",
+	},
+	// file with hex escaping in path plus query
+	{
+		&url.URL{
+			Scheme:   "https",
+			Host:     "www.golang.org",
+			Path:     "/file%20one&two",
+			RawQuery: "q=go+language",
+		},
+		"https://www.golang.org/file%20one&two?q=go+language",
+	},
+	// query with hex escaping
+	{
+		&url.URL{
+			Scheme:   "http",
+			Host:     "www.golang.org",
+			Path:     "/",
+			RawQuery: "q=go%20language",
+		},
+		"http://www.golang.org/?q=go%20language",
+	},
+}
+
+// prefixTmpl is a template for the expected prefix of the output of writing
+// an HTTP request.
+const prefixTmpl = "GET %v HTTP/1.1\r\nHost: %v\r\n"
+
+func TestSetOpaque(t *testing.T) {
+	for _, test := range setOpaqueTests {
+		u := *test.in
+		SetOpaque(&u)
+
+		w := &bytes.Buffer{}
+		r := &http.Request{URL: &u}
+		if err := r.Write(w); err != nil {
+			t.Errorf("write request: %v", err)
+			continue
+		}
+
+		prefix := fmt.Sprintf(prefixTmpl, test.wantRequestURI, test.in.Host)
+		if got := string(w.Bytes()); !strings.HasPrefix(got, prefix) {
+			t.Errorf("got %q expected prefix %q", got, prefix)
+		}
+	}
+}
+
+type ExpandTest struct {
+	in         string
+	expansions map[string]string
+	want       string
+}
+
+var expandTests = []ExpandTest{
+	// no expansions
+	{
+		"http://www.golang.org/",
+		map[string]string{},
+		"http://www.golang.org/",
+	},
+	// one expansion, no escaping
+	{
+		"http://www.golang.org/{bucket}/delete",
+		map[string]string{
+			"bucket": "red",
+		},
+		"http://www.golang.org/red/delete",
+	},
+	// one expansion, with hex escapes
+	{
+		"http://www.golang.org/{bucket}/delete",
+		map[string]string{
+			"bucket": "red/blue",
+		},
+		"http://www.golang.org/red%2Fblue/delete",
+	},
+	// one expansion, with space
+	{
+		"http://www.golang.org/{bucket}/delete",
+		map[string]string{
+			"bucket": "red or blue",
+		},
+		"http://www.golang.org/red%20or%20blue/delete",
+	},
+	// expansion not found
+	{
+		"http://www.golang.org/{object}/delete",
+		map[string]string{
+			"bucket": "red or blue",
+		},
+		"http://www.golang.org//delete",
+	},
+	// multiple expansions
+	{
+		"http://www.golang.org/{one}/{two}/{three}/get",
+		map[string]string{
+			"one":   "ONE",
+			"two":   "TWO",
+			"three": "THREE",
+		},
+		"http://www.golang.org/ONE/TWO/THREE/get",
+	},
+	// utf-8 characters
+	{
+		"http://www.golang.org/{bucket}/get",
+		map[string]string{
+			"bucket": "£100",
+		},
+		"http://www.golang.org/%C2%A3100/get",
+	},
+	// punctuations
+	{
+		"http://www.golang.org/{bucket}/get",
+		map[string]string{
+			"bucket": `/\@:,.`,
+		},
+		"http://www.golang.org/%2F%5C%40%3A%2C./get",
+	},
+	// mis-matched brackets
+	{
+		"http://www.golang.org/{bucket/get",
+		map[string]string{
+			"bucket": "red",
+		},
+		"http://www.golang.org/{bucket/get",
+	},
+	// "+" prefix for suppressing escape
+	// See also: http://tools.ietf.org/html/rfc6570#section-3.2.3
+	{
+		"http://www.golang.org/{+topic}",
+		map[string]string{
+			"topic": "/topics/myproject/mytopic",
+		},
+		// The double slashes here look weird, but it's intentional
+		"http://www.golang.org//topics/myproject/mytopic",
+	},
+}
+
+func TestExpand(t *testing.T) {
+	for i, test := range expandTests {
+		u := url.URL{
+			Path: test.in,
+		}
+		Expand(&u, test.expansions)
+		got := u.Path
+		if got != test.want {
+			t.Errorf("got %q expected %q in test %d", got, test.want, i+1)
+		}
+	}
+}
+
+type CheckResponseTest struct {
+	in       *http.Response
+	bodyText string
+	want     error
+	errText  string
+}
+
+var checkResponseTests = []CheckResponseTest{
+	{
+		&http.Response{
+			StatusCode: http.StatusOK,
+		},
+		"",
+		nil,
+		"",
+	},
+	{
+		&http.Response{
+			StatusCode: http.StatusInternalServerError,
+		},
+		`{"error":{}}`,
+		&Error{
+			Code: http.StatusInternalServerError,
+			Body: `{"error":{}}`,
+		},
+		`googleapi: got HTTP response code 500 with body: {"error":{}}`,
+	},
+	{
+		&http.Response{
+			StatusCode: http.StatusNotFound,
+		},
+		`{"error":{"message":"Error message for StatusNotFound."}}`,
+		&Error{
+			Code:    http.StatusNotFound,
+			Message: "Error message for StatusNotFound.",
+			Body:    `{"error":{"message":"Error message for StatusNotFound."}}`,
+		},
+		"googleapi: Error 404: Error message for StatusNotFound.",
+	},
+	{
+		&http.Response{
+			StatusCode: http.StatusBadRequest,
+		},
+		`{"error":"invalid_token","error_description":"Invalid Value"}`,
+		&Error{
+			Code: http.StatusBadRequest,
+			Body: `{"error":"invalid_token","error_description":"Invalid Value"}`,
+		},
+		`googleapi: got HTTP response code 400 with body: {"error":"invalid_token","error_description":"Invalid Value"}`,
+	},
+	{
+		&http.Response{
+			StatusCode: http.StatusBadRequest,
+		},
+		`{"error":{"errors":[{"domain":"usageLimits","reason":"keyInvalid","message":"Bad Request"}],"code":400,"message":"Bad Request"}}`,
+		&Error{
+			Code: http.StatusBadRequest,
+			Errors: []ErrorItem{
+				{
+					Reason:  "keyInvalid",
+					Message: "Bad Request",
+				},
+			},
+			Body:    `{"error":{"errors":[{"domain":"usageLimits","reason":"keyInvalid","message":"Bad Request"}],"code":400,"message":"Bad Request"}}`,
+			Message: "Bad Request",
+		},
+		"googleapi: Error 400: Bad Request, keyInvalid",
+	},
+}
+
+func TestCheckResponse(t *testing.T) {
+	for _, test := range checkResponseTests {
+		res := test.in
+		if test.bodyText != "" {
+			res.Body = ioutil.NopCloser(strings.NewReader(test.bodyText))
+		}
+		g := CheckResponse(res)
+		if !reflect.DeepEqual(g, test.want) {
+			t.Errorf("CheckResponse: got %v, want %v", g, test.want)
+			gotJson, err := json.Marshal(g)
+			if err != nil {
+				t.Error(err)
+			}
+			wantJson, err := json.Marshal(test.want)
+			if err != nil {
+				t.Error(err)
+			}
+			t.Errorf("json(got):  %q\njson(want): %q", string(gotJson), string(wantJson))
+		}
+		if g != nil && g.Error() != test.errText {
+			t.Errorf("CheckResponse: unexpected error message.\nGot:  %q\nwant: %q", g, test.errText)
+		}
+	}
+}
+
+type VariantPoint struct {
+	Type        string
+	Coordinates []float64
+}
+
+type VariantTest struct {
+	in     map[string]interface{}
+	result bool
+	want   VariantPoint
+}
+
+var coords = []interface{}{1.0, 2.0}
+
+var variantTests = []VariantTest{
+	{
+		in: map[string]interface{}{
+			"type":        "Point",
+			"coordinates": coords,
+		},
+		result: true,
+		want: VariantPoint{
+			Type:        "Point",
+			Coordinates: []float64{1.0, 2.0},
+		},
+	},
+	{
+		in: map[string]interface{}{
+			"type":  "Point",
+			"bogus": coords,
+		},
+		result: true,
+		want: VariantPoint{
+			Type: "Point",
+		},
+	},
+}
+
+func TestVariantType(t *testing.T) {
+	for _, test := range variantTests {
+		if g := VariantType(test.in); g != test.want.Type {
+			t.Errorf("VariantType(%v): got %v, want %v", test.in, g, test.want.Type)
+		}
+	}
+}
+
+func TestConvertVariant(t *testing.T) {
+	for _, test := range variantTests {
+		g := VariantPoint{}
+		r := ConvertVariant(test.in, &g)
+		if r != test.result {
+			t.Errorf("ConvertVariant(%v): got %v, want %v", test.in, r, test.result)
+		}
+		if !reflect.DeepEqual(g, test.want) {
+			t.Errorf("ConvertVariant(%v): got %v, want %v", test.in, g, test.want)
+		}
+	}
+}
diff --git a/Godeps/_workspace/src/google.golang.org/api/googleapi/internal/uritemplates/LICENSE b/Godeps/_workspace/src/google.golang.org/api/googleapi/internal/uritemplates/LICENSE
new file mode 100644
index 00000000..de9c88cb
--- /dev/null
+++ b/Godeps/_workspace/src/google.golang.org/api/googleapi/internal/uritemplates/LICENSE
@@ -0,0 +1,18 @@
+Copyright (c) 2013 Joshua Tacoma
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/Godeps/_workspace/src/google.golang.org/api/googleapi/internal/uritemplates/uritemplates.go b/Godeps/_workspace/src/google.golang.org/api/googleapi/internal/uritemplates/uritemplates.go
new file mode 100644
index 00000000..8a84813f
--- /dev/null
+++ b/Godeps/_workspace/src/google.golang.org/api/googleapi/internal/uritemplates/uritemplates.go
@@ -0,0 +1,359 @@
+// Copyright 2013 Joshua Tacoma. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package uritemplates is a level 4 implementation of RFC 6570 (URI
+// Template, http://tools.ietf.org/html/rfc6570).
+//
+// To use uritemplates, parse a template string and expand it with a value
+// map:
+//
+//	template, _ := uritemplates.Parse("https://api.github.com/repos{/user,repo}")
+//	values := make(map[string]interface{})
+//	values["user"] = "jtacoma"
+//	values["repo"] = "uritemplates"
+//	expanded, _ := template.ExpandString(values)
+//	fmt.Printf(expanded)
+//
+package uritemplates
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"reflect"
+	"regexp"
+	"strconv"
+	"strings"
+)
+
+var (
+	unreserved = regexp.MustCompile("[^A-Za-z0-9\\-._~]")
+	reserved   = regexp.MustCompile("[^A-Za-z0-9\\-._~:/?#[\\]@!$&'()*+,;=]")
+	validname  = regexp.MustCompile("^([A-Za-z0-9_\\.]|%[0-9A-Fa-f][0-9A-Fa-f])+$")
+	hex        = []byte("0123456789ABCDEF")
+)
+
+func pctEncode(src []byte) []byte {
+	dst := make([]byte, len(src)*3)
+	for i, b := range src {
+		buf := dst[i*3 : i*3+3]
+		buf[0] = 0x25
+		buf[1] = hex[b/16]
+		buf[2] = hex[b%16]
+	}
+	return dst
+}
+
+func escape(s string, allowReserved bool) (escaped string) {
+	if allowReserved {
+		escaped = string(reserved.ReplaceAllFunc([]byte(s), pctEncode))
+	} else {
+		escaped = string(unreserved.ReplaceAllFunc([]byte(s), pctEncode))
+	}
+	return escaped
+}
+
+// A UriTemplate is a parsed representation of a URI template.
+type UriTemplate struct {
+	raw   string
+	parts []templatePart
+}
+
+// Parse parses a URI template string into a UriTemplate object.
+func Parse(rawtemplate string) (template *UriTemplate, err error) {
+	template = new(UriTemplate)
+	template.raw = rawtemplate
+	split := strings.Split(rawtemplate, "{")
+	template.parts = make([]templatePart, len(split)*2-1)
+	for i, s := range split {
+		if i == 0 {
+			if strings.Contains(s, "}") {
+				err = errors.New("unexpected }")
+				break
+			}
+			template.parts[i].raw = s
+		} else {
+			subsplit := strings.Split(s, "}")
+			if len(subsplit) != 2 {
+				err = errors.New("malformed template")
+				break
+			}
+			expression := subsplit[0]
+			template.parts[i*2-1], err = parseExpression(expression)
+			if err != nil {
+				break
+			}
+			template.parts[i*2].raw = subsplit[1]
+		}
+	}
+	if err != nil {
+		template = nil
+	}
+	return template, err
+}
+
+type templatePart struct {
+	raw           string
+	terms         []templateTerm
+	first         string
+	sep           string
+	named         bool
+	ifemp         string
+	allowReserved bool
+}
+
+type templateTerm struct {
+	name     string
+	explode  bool
+	truncate int
+}
+
+func parseExpression(expression string) (result templatePart, err error) {
+	switch expression[0] {
+	case '+':
+		result.sep = ","
+		result.allowReserved = true
+		expression = expression[1:]
+	case '.':
+		result.first = "."
+		result.sep = "."
+		expression = expression[1:]
+	case '/':
+		result.first = "/"
+		result.sep = "/"
+		expression = expression[1:]
+	case ';':
+		result.first = ";"
+		result.sep = ";"
+		result.named = true
+		expression = expression[1:]
+	case '?':
+		result.first = "?"
+		result.sep = "&"
+		result.named = true
+		result.ifemp = "="
+		expression = expression[1:]
+	case '&':
+		result.first = "&"
+		result.sep = "&"
+		result.named = true
+		result.ifemp = "="
+		expression = expression[1:]
+	case '#':
+		result.first = "#"
+		result.sep = ","
+		result.allowReserved = true
+		expression = expression[1:]
+	default:
+		result.sep = ","
+	}
+	rawterms := strings.Split(expression, ",")
+	result.terms = make([]templateTerm, len(rawterms))
+	for i, raw := range rawterms {
+		result.terms[i], err = parseTerm(raw)
+		if err != nil {
+			break
+		}
+	}
+	return result, err
+}
+
+func parseTerm(term string) (result templateTerm, err error) {
+	if strings.HasSuffix(term, "*") {
+		result.explode = true
+		term = term[:len(term)-1]
+	}
+	split := strings.Split(term, ":")
+	if len(split) == 1 {
+		result.name = term
+	} else if len(split) == 2 {
+		result.name = split[0]
+		var parsed int64
+		parsed, err = strconv.ParseInt(split[1], 10, 0)
+		result.truncate = int(parsed)
+	} else {
+		err = errors.New("multiple colons in same term")
+	}
+	if !validname.MatchString(result.name) {
+		err = errors.New("not a valid name: " + result.name)
+	}
+	if result.explode && result.truncate > 0 {
+		err = errors.New("both explode and prefix modifers on same term")
+	}
+	return result, err
+}
+
+// Expand expands a URI template with a set of values to produce a string.
+func (self *UriTemplate) Expand(value interface{}) (string, error) {
+	values, ismap := value.(map[string]interface{})
+	if !ismap {
+		if m, ismap := struct2map(value); !ismap {
+			return "", errors.New("expected map[string]interface{}, struct, or pointer to struct.")
+		} else {
+			return self.Expand(m)
+		}
+	}
+	var buf bytes.Buffer
+	for _, p := range self.parts {
+		err := p.expand(&buf, values)
+		if err != nil {
+			return "", err
+		}
+	}
+	return buf.String(), nil
+}
+
+func (self *templatePart) expand(buf *bytes.Buffer, values map[string]interface{}) error {
+	if len(self.raw) > 0 {
+		buf.WriteString(self.raw)
+		return nil
+	}
+	var zeroLen = buf.Len()
+	buf.WriteString(self.first)
+	var firstLen = buf.Len()
+	for _, term := range self.terms {
+		value, exists := values[term.name]
+		if !exists {
+			continue
+		}
+		if buf.Len() != firstLen {
+			buf.WriteString(self.sep)
+		}
+		switch v := value.(type) {
+		case string:
+			self.expandString(buf, term, v)
+		case []interface{}:
+			self.expandArray(buf, term, v)
+		case map[string]interface{}:
+			if term.truncate > 0 {
+				return errors.New("cannot truncate a map expansion")
+			}
+			self.expandMap(buf, term, v)
+		default:
+			if m, ismap := struct2map(value); ismap {
+				if term.truncate > 0 {
+					return errors.New("cannot truncate a map expansion")
+				}
+				self.expandMap(buf, term, m)
+			} else {
+				str := fmt.Sprintf("%v", value)
+				self.expandString(buf, term, str)
+			}
+		}
+	}
+	if buf.Len() == firstLen {
+		original := buf.Bytes()[:zeroLen]
+		buf.Reset()
+		buf.Write(original)
+	}
+	return nil
+}
+
+func (self *templatePart) expandName(buf *bytes.Buffer, name string, empty bool) {
+	if self.named {
+		buf.WriteString(name)
+		if empty {
+			buf.WriteString(self.ifemp)
+		} else {
+			buf.WriteString("=")
+		}
+	}
+}
+
+func (self *templatePart) expandString(buf *bytes.Buffer, t templateTerm, s string) {
+	if len(s) > t.truncate && t.truncate > 0 {
+		s = s[:t.truncate]
+	}
+	self.expandName(buf, t.name, len(s) == 0)
+	buf.WriteString(escape(s, self.allowReserved))
+}
+
+func (self *templatePart) expandArray(buf *bytes.Buffer, t templateTerm, a []interface{}) {
+	if len(a) == 0 {
+		return
+	} else if !t.explode {
+		self.expandName(buf, t.name, false)
+	}
+	for i, value := range a {
+		if t.explode && i > 0 {
+			buf.WriteString(self.sep)
+		} else if i > 0 {
+			buf.WriteString(",")
+		}
+		var s string
+		switch v := value.(type) {
+		case string:
+			s = v
+		default:
+			s = fmt.Sprintf("%v", v)
+		}
+		if len(s) > t.truncate && t.truncate > 0 {
+			s = s[:t.truncate]
+		}
+		if self.named && t.explode {
+			self.expandName(buf, t.name, len(s) == 0)
+		}
+		buf.WriteString(escape(s, self.allowReserved))
+	}
+}
+
+func (self *templatePart) expandMap(buf *bytes.Buffer, t templateTerm, m map[string]interface{}) {
+	if len(m) == 0 {
+		return
+	}
+	if !t.explode {
+		self.expandName(buf, t.name, len(m) == 0)
+	}
+	var firstLen = buf.Len()
+	for k, value := range m {
+		if firstLen != buf.Len() {
+			if t.explode {
+				buf.WriteString(self.sep)
+			} else {
+				buf.WriteString(",")
+			}
+		}
+		var s string
+		switch v := value.(type) {
+		case string:
+			s = v
+		default:
+			s = fmt.Sprintf("%v", v)
+		}
+		if t.explode {
+			buf.WriteString(escape(k, self.allowReserved))
+			buf.WriteRune('=')
+			buf.WriteString(escape(s, self.allowReserved))
+		} else {
+			buf.WriteString(escape(k, self.allowReserved))
+			buf.WriteRune(',')
+			buf.WriteString(escape(s, self.allowReserved))
+		}
+	}
+}
+
+func struct2map(v interface{}) (map[string]interface{}, bool) {
+	value := reflect.ValueOf(v)
+	switch value.Type().Kind() {
+	case reflect.Ptr:
+		return struct2map(value.Elem().Interface())
+	case reflect.Struct:
+		m := make(map[string]interface{})
+		for i := 0; i < value.NumField(); i++ {
+			tag := value.Type().Field(i).Tag
+			var name string
+			if strings.Contains(string(tag), ":") {
+				name = tag.Get("uri")
+			} else {
+				name = strings.TrimSpace(string(tag))
+			}
+			if len(name) == 0 {
+				name = value.Type().Field(i).Name
+			}
+			m[name] = value.Field(i).Interface()
+		}
+		return m, true
+	}
+	return nil, false
+}
diff --git a/Godeps/_workspace/src/google.golang.org/api/googleapi/internal/uritemplates/utils.go b/Godeps/_workspace/src/google.golang.org/api/googleapi/internal/uritemplates/utils.go
new file mode 100644
index 00000000..399ef462
--- /dev/null
+++ b/Godeps/_workspace/src/google.golang.org/api/googleapi/internal/uritemplates/utils.go
@@ -0,0 +1,13 @@
+package uritemplates
+
+func Expand(path string, expansions map[string]string) (string, error) {
+	template, err := Parse(path)
+	if err != nil {
+		return "", err
+	}
+	values := make(map[string]interface{})
+	for k, v := range expansions {
+		values[k] = v
+	}
+	return template.Expand(values)
+}
diff --git a/Godeps/_workspace/src/google.golang.org/api/googleapi/transport/apikey.go b/Godeps/_workspace/src/google.golang.org/api/googleapi/transport/apikey.go
new file mode 100644
index 00000000..eca1ea25
--- /dev/null
+++ b/Godeps/_workspace/src/google.golang.org/api/googleapi/transport/apikey.go
@@ -0,0 +1,38 @@
+// Copyright 2012 Google Inc. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package transport contains HTTP transports used to make
+// authenticated API requests.
+package transport
+
+import (
+	"errors"
+	"net/http"
+)
+
+// APIKey is an HTTP Transport which wraps an underlying transport and
+// appends an API Key "key" parameter to the URL of outgoing requests.
+type APIKey struct {
+	// Key is the API Key to set on requests.
+	Key string
+
+	// Transport is the underlying HTTP transport.
+	// If nil, http.DefaultTransport is used.
+	Transport http.RoundTripper
+}
+
+func (t *APIKey) RoundTrip(req *http.Request) (*http.Response, error) {
+	rt := t.Transport
+	if rt == nil {
+		rt = http.DefaultTransport
+		if rt == nil {
+			return nil, errors.New("googleapi/transport: no Transport specified or available")
+		}
+	}
+	newReq := *req
+	args := newReq.URL.Query()
+	args.Set("key", t.Key)
+	newReq.URL.RawQuery = args.Encode()
+	return rt.RoundTrip(&newReq)
+}
diff --git a/Godeps/_workspace/src/google.golang.org/api/googleapi/types.go b/Godeps/_workspace/src/google.golang.org/api/googleapi/types.go
new file mode 100644
index 00000000..7ed7dd98
--- /dev/null
+++ b/Godeps/_workspace/src/google.golang.org/api/googleapi/types.go
@@ -0,0 +1,150 @@
+// Copyright 2013 Google Inc. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package googleapi
+
+import (
+	"encoding/json"
+	"strconv"
+)
+
+// Int64s is a slice of int64s that marshal as quoted strings in JSON.
+type Int64s []int64
+
+func (q *Int64s) UnmarshalJSON(raw []byte) error {
+	*q = (*q)[:0]
+	var ss []string
+	if err := json.Unmarshal(raw, &ss); err != nil {
+		return err
+	}
+	for _, s := range ss {
+		v, err := strconv.ParseInt(s, 10, 64)
+		if err != nil {
+			return err
+		}
+		*q = append(*q, int64(v))
+	}
+	return nil
+}
+
+// Int32s is a slice of int32s that marshal as quoted strings in JSON.
+type Int32s []int32
+
+func (q *Int32s) UnmarshalJSON(raw []byte) error {
+	*q = (*q)[:0]
+	var ss []string
+	if err := json.Unmarshal(raw, &ss); err != nil {
+		return err
+	}
+	for _, s := range ss {
+		v, err := strconv.ParseInt(s, 10, 32)
+		if err != nil {
+			return err
+		}
+		*q = append(*q, int32(v))
+	}
+	return nil
+}
+
+// Uint64s is a slice of uint64s that marshal as quoted strings in JSON.
+type Uint64s []uint64
+
+func (q *Uint64s) UnmarshalJSON(raw []byte) error {
+	*q = (*q)[:0]
+	var ss []string
+	if err := json.Unmarshal(raw, &ss); err != nil {
+		return err
+	}
+	for _, s := range ss {
+		v, err := strconv.ParseUint(s, 10, 64)
+		if err != nil {
+			return err
+		}
+		*q = append(*q, uint64(v))
+	}
+	return nil
+}
+
+// Uint32s is a slice of uint32s that marshal as quoted strings in JSON.
+type Uint32s []uint32
+
+func (q *Uint32s) UnmarshalJSON(raw []byte) error {
+	*q = (*q)[:0]
+	var ss []string
+	if err := json.Unmarshal(raw, &ss); err != nil {
+		return err
+	}
+	for _, s := range ss {
+		v, err := strconv.ParseUint(s, 10, 32)
+		if err != nil {
+			return err
+		}
+		*q = append(*q, uint32(v))
+	}
+	return nil
+}
+
+// Float64s is a slice of float64s that marshal as quoted strings in JSON.
+type Float64s []float64
+
+func (q *Float64s) UnmarshalJSON(raw []byte) error {
+	*q = (*q)[:0]
+	var ss []string
+	if err := json.Unmarshal(raw, &ss); err != nil {
+		return err
+	}
+	for _, s := range ss {
+		v, err := strconv.ParseFloat(s, 64)
+		if err != nil {
+			return err
+		}
+		*q = append(*q, float64(v))
+	}
+	return nil
+}
+
+func quotedList(n int, fn func(dst []byte, i int) []byte) ([]byte, error) {
+	dst := make([]byte, 0, 2+n*10) // somewhat arbitrary
+	dst = append(dst, '[')
+	for i := 0; i < n; i++ {
+		if i > 0 {
+			dst = append(dst, ',')
+		}
+		dst = append(dst, '"')
+		dst = fn(dst, i)
+		dst = append(dst, '"')
+	}
+	dst = append(dst, ']')
+	return dst, nil
+}
+
+func (s Int64s) MarshalJSON() ([]byte, error) {
+	return quotedList(len(s), func(dst []byte, i int) []byte {
+		return strconv.AppendInt(dst, s[i], 10)
+	})
+}
+
+func (s Int32s) MarshalJSON() ([]byte, error) {
+	return quotedList(len(s), func(dst []byte, i int) []byte {
+		return strconv.AppendInt(dst, int64(s[i]), 10)
+	})
+}
+
+func (s Uint64s) MarshalJSON() ([]byte, error) {
+	return quotedList(len(s), func(dst []byte, i int) []byte {
+		return strconv.AppendUint(dst, s[i], 10)
+	})
+}
+
+func (s Uint32s) MarshalJSON() ([]byte, error) {
+	return quotedList(len(s), func(dst []byte, i int) []byte {
+		return strconv.AppendUint(dst, uint64(s[i]), 10)
+	})
+}
+
+func (s Float64s) MarshalJSON() ([]byte, error) {
+	return quotedList(len(s), func(dst []byte, i int) []byte {
+		return strconv.AppendFloat(dst, s[i], 'g', -1, 64)
+	})
+}
diff --git a/Godeps/_workspace/src/google.golang.org/api/googleapi/types_test.go b/Godeps/_workspace/src/google.golang.org/api/googleapi/types_test.go
new file mode 100644
index 00000000..a6b20451
--- /dev/null
+++ b/Godeps/_workspace/src/google.golang.org/api/googleapi/types_test.go
@@ -0,0 +1,44 @@
+// Copyright 2013 Google Inc. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package googleapi
+
+import (
+	"encoding/json"
+	"reflect"
+	"testing"
+)
+
+func TestTypes(t *testing.T) {
+	type T struct {
+		I32 Int32s
+		I64 Int64s
+		U32 Uint32s
+		U64 Uint64s
+		F64 Float64s
+	}
+	v := &T{
+		I32: Int32s{-1, 2, 3},
+		I64: Int64s{-1, 2, 1 << 33},
+		U32: Uint32s{1, 2},
+		U64: Uint64s{1, 2, 1 << 33},
+		F64: Float64s{1.5, 3.33},
+	}
+	got, err := json.Marshal(v)
+	if err != nil {
+		t.Fatal(err)
+	}
+	want := `{"I32":["-1","2","3"],"I64":["-1","2","8589934592"],"U32":["1","2"],"U64":["1","2","8589934592"],"F64":["1.5","3.33"]}`
+	if string(got) != want {
+		t.Fatalf("Marshal mismatch.\n got: %s\nwant: %s\n", got, want)
+	}
+
+	v2 := new(T)
+	if err := json.Unmarshal(got, v2); err != nil {
+		t.Fatalf("Unmarshal: %v", err)
+	}
+	if !reflect.DeepEqual(v, v2) {
+		t.Fatalf("Unmarshal didn't produce same results.\n got: %#v\nwant: %#v\n", v, v2)
+	}
+}
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 00000000..e06d2081
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,202 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/MAINTAINERS b/MAINTAINERS
new file mode 100644
index 00000000..dbf5d8c0
--- /dev/null
+++ b/MAINTAINERS
@@ -0,0 +1,3 @@
+Brian Waldon <brian.waldon@coreos.com> (@bcwaldon)
+Ed Rooth <ed.rooth@coreos.com> (@sym3tri)
+Bobby Rullo <bobby.rullo@coreos.com> (@bobbyrullo)
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 00000000..b39ddfa5
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,5 @@
+CoreOS Project
+Copyright 2014 CoreOS, Inc
+
+This product includes software developed at CoreOS, Inc.
+(http://www.coreos.com/).
diff --git a/README.md b/README.md
index d084c148..976892db 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,155 @@
-# Dex
+dex
+=====
+
+[![Build Status](https://semaphoreci.com/api/v1/projects/52d56c45-8487-42ac-b124-056df1630122/411983/badge.svg)](https://semaphoreci.com/coreos/dex)
+[![Docker Repository on Quay.io](https://quay.io/repository/coreos/dex/status?token=64f952fa-9aa9-4f8e-ab8d-93bfbe770d25 "Docker Repository on Quay.io")](https://quay.io/repository/coreos/dex)
+
+
+dex is a federated identity management service.
+It provides OpenID Connect (OIDC) to users, while it proxies to multiple remote identity providers (IdP) to drive actual authentication.
+
+## Architecture
+
+dex consists of multiple components:
+
+- **dex-worker** is the primary server component of dex
+	- host a user-facing API that drives the OIDC protocol
+	- proxy to remote identity providers via "connectors"
+- **dex-overlord** is an auxiliary process responsible for two things:
+	- rotation of keys used by the workers to sign identity tokens
+	- garbage collection of stale data in the database
+- **dexctl** is CLI tool used to manage an dex deployment
+	- configure identity provider connectors
+	- administer OIDC client identities
+
+A typical dex deployment consists of N dex-workers behind a load balanacer, and one dex-overlord.
+The dex-workers directly handle user requests, so the loss of all workers can result in service downtime.
+The single dex-overlord runs its tasks periodically, so it does not need to maintain 100% uptime.
+
+## Connectors
+
+Remote IdPs could implement any auth-N protocol.
+*connectors* contain protocol-specific logic and are used to communicate with remote IdPs.
+Possible examples of connectors could be: OIDC, LDAP, Local Memory, Basic Auth, etc.
+dex ships with an OIDC connector, and a basic "local" connector for in-memory testing purposes.
+Future connectors can be developed and added as future interoperability requirements emerge.
+
+## Relevant Specifications
+
+These specs are referenced and implemented to some degree in the `jose` package of this project.
+
+- [JWK](https://tools.ietf.org/html/draft-ietf-jose-json-web-key-36)
+- [JWT](https://tools.ietf.org/html/draft-ietf-oauth-json-web-token-30)
+- [JWS](https://tools.ietf.org/html/draft-jones-json-web-signature-04)
+
+OpenID Connect (OIDC) is broken up into several specifications. The following (amongst others) are relevant:
+
+- [OpenID Connect Core 1.0](https://openid.net/specs/openid-connect-core-1_0.html)
+- [OpenID Connect Discovery 1.0](https://openid.net/specs/openid-connect-discovery-1_0.html)
+- [OAuth 2.0 RFC](https://tools.ietf.org/html/rfc6749)
+
+## Example OIDC Discovery Endpoints
+
+- https://accounts.google.com/.well-known/openid-configuration
+- https://login.salesforce.com/.well-known/openid-configuration
+
+# Building
+
+## With Host Go Environment
+
+`./build`
+
+## With Docker
+
+`./go-docker ./build`
+
+## Docker Build and Push
+
+Binaries must be compiled first.
+Builds a docker image and pushes it to the quay repo.
+The image is tagged with the git sha and 'latest'.
+
+```
+export QUAY_USER=xxx
+export QUAY_PASSWORD=yyy
+./build-docker-push
+```
+
+## Rebuild API from JSON schema
+
+Go API bindings are generated from a JSON Discovery file.
+To regenerate run:
+
+```
+./schema/generator
+```
+
+For updating generator dependencies see docs in: `schema/generator_import.go`.
+
+## Runing Tests
+
+Run all tests: `./test`
+
+Single package only: `PKG=<pkgname> ./test`
+
+Functional tests: `./test-functional`
+
+Run with docker:
+
+```
+./go-docker ./test
+./go-docker ./test-functional
+```
+
+# Running
+
+Run the main dex server:
+
+After building, run `./bin/dex` and provider the required arguments.
+Additionally start `./bin/dex-overlord` for key rotation and database garbage collection.
+
+# Deploying
+
+Generate systemd unit files by injecting secrets into the unit file templates located in: `./static/...`.
+
+```
+source <path-to-secure>/prod/dex.env.txt
+./build-units
+```
+
+Resulting unit files are output to: `./deploy`
+
+# Registering Clients
+
+Like all OAuth2 servers clients must be registered with a callback url.
+New clients can be registered with the dexctl CLI tool:
+```
+dexctl --db-url=postgres://localhost/auth?sslmode=disable new-client http://example.com/auth/callback
+```
+
+The tool will print the `client-id` and `client-secret` to stdout; you must save these for use in your client application. The output of this command is "KEY=VALUE" format, so If you `eval` it in your shell, the relevant variables are available to use.
+
+Note that for the initial invocation of `dexctl` you need to provide a DSN URL to create a new-client. Once you have created this initial client, you can use its client-id and client-secret as credentials to dexctl, and make requests via the HTTP API instead of the DB:
+
+```
+dexctl --endpoint=http://your-issuer-url --client-id=your_client_id --client-secret=your_client_secret new-client
+```
+
+or, if you want to go the eval route:
+```
+eval "$(dexctl --endpoint=http://your-issuer-url --client-id=your_client_id --client-secret=your_client_secret new-client)"
+```
+
+The latter form makes the variables `DEX_APP_CLIENT_ID`, `DEX_APP_CLIENT_SECRET` and `DEX_APP_REDIRECTURL_0` available to your shell.
+
+This will allow you to create new clients from machines that cannot hit the database.
+
+# Standup Dev Script
+
+A script which will create a database, create a client, start an overlord and a worker and start the example app exists at `contrib/standup-db.sh`.
+
+# Coming Soon
+
+- Multiple backing Identity Providers
+- Identity Management
+- Authorization
diff --git a/admin/api.go b/admin/api.go
new file mode 100644
index 00000000..2b875405
--- /dev/null
+++ b/admin/api.go
@@ -0,0 +1,120 @@
+// package admin provides an implementation of the API described in auth/schema/adminschema.
+package admin
+
+import (
+	"net/http"
+
+	"github.com/coreos/dex/schema/adminschema"
+	"github.com/coreos/dex/user"
+)
+
+// AdminAPI provides the logic necessary to implement the Admin API.
+type AdminAPI struct {
+	userManager      *user.Manager
+	userRepo         user.UserRepo
+	passwordInfoRepo user.PasswordInfoRepo
+	localConnectorID string
+}
+
+func NewAdminAPI(userManager *user.Manager, userRepo user.UserRepo, pwiRepo user.PasswordInfoRepo, localConnectorID string) *AdminAPI {
+	if localConnectorID == "" {
+		panic("must specify non-blank localConnectorID")
+	}
+
+	return &AdminAPI{
+		userManager:      userManager,
+		userRepo:         userRepo,
+		passwordInfoRepo: pwiRepo,
+		localConnectorID: localConnectorID,
+	}
+}
+
+// Error is the error type returned by AdminAPI methods.
+type Error struct {
+	Type string
+
+	// The HTTP Code to return for this type of error.
+	Code int
+
+	Desc string
+
+	// The underlying error - not to be consumed by external users.
+	Internal error
+}
+
+func (e Error) Error() string {
+	return e.Type
+}
+
+func errorMaker(typ string, desc string, code int) func(internal error) Error {
+	return func(internal error) Error {
+		return Error{
+			Type:     typ,
+			Code:     code,
+			Desc:     desc,
+			Internal: internal,
+		}
+	}
+}
+
+var (
+	errorMap = map[error]func(error) Error{
+		user.ErrorNotFound:       errorMaker("resource_not_found", "Resource could not be found.", http.StatusNotFound),
+		user.ErrorDuplicateEmail: errorMaker("bad_request", "Email already in use.", http.StatusBadRequest),
+		user.ErrorInvalidEmail:   errorMaker("bad_request", "invalid email.", http.StatusBadRequest),
+	}
+)
+
+func (a *AdminAPI) GetAdmin(id string) (adminschema.Admin, error) {
+	usr, err := a.userRepo.Get(nil, id)
+
+	if err != nil {
+		return adminschema.Admin{}, mapError(err)
+	}
+
+	pwi, err := a.passwordInfoRepo.Get(nil, id)
+	if err != nil {
+		return adminschema.Admin{}, mapError(err)
+	}
+
+	return adminschema.Admin{
+		Id:       id,
+		Email:    usr.Email,
+		Password: string(pwi.Password),
+	}, nil
+}
+
+func (a *AdminAPI) CreateAdmin(admn adminschema.Admin) (string, error) {
+	userID, err := a.userManager.CreateUser(user.User{
+		Email: admn.Email,
+		Admin: true}, user.Password(admn.Password), a.localConnectorID)
+	if err != nil {
+		return "", mapError(err)
+	}
+	return userID, nil
+}
+
+func (a *AdminAPI) GetState() (adminschema.State, error) {
+	state := adminschema.State{}
+
+	admins, err := a.userRepo.GetAdminCount(nil)
+	if err != nil {
+		return adminschema.State{}, err
+	}
+
+	state.AdminUserCreated = admins > 0
+
+	return state, nil
+}
+
+func mapError(e error) error {
+	if mapped, ok := errorMap[e]; ok {
+		return mapped(e)
+	}
+	return Error{
+		Code:     http.StatusInternalServerError,
+		Type:     "server_error",
+		Desc:     "",
+		Internal: e,
+	}
+}
diff --git a/admin/api_test.go b/admin/api_test.go
new file mode 100644
index 00000000..4f270367
--- /dev/null
+++ b/admin/api_test.go
@@ -0,0 +1,196 @@
+package admin
+
+import (
+	"net/http"
+	"testing"
+
+	"github.com/coreos/dex/schema/adminschema"
+	"github.com/coreos/dex/user"
+
+	"github.com/kylelemons/godebug/pretty"
+)
+
+type testFixtures struct {
+	ur    user.UserRepo
+	pwr   user.PasswordInfoRepo
+	adAPI *AdminAPI
+}
+
+func makeTestFixtures() *testFixtures {
+	f := &testFixtures{}
+
+	f.ur = user.NewUserRepoFromUsers([]user.UserWithRemoteIdentities{
+		{
+			User: user.User{
+				ID:   "ID-1",
+				Name: "Name-1",
+			},
+		},
+	})
+	f.pwr = user.NewPasswordInfoRepoFromPasswordInfos([]user.PasswordInfo{
+		{
+			UserID:   "ID-1",
+			Password: []byte("hi."),
+		},
+	})
+
+	f.adAPI = NewAdminAPI(f.ur, f.pwr)
+
+	return f
+}
+
+func TestGetAdmin(t *testing.T) {
+	tests := []struct {
+		id      string
+		errCode int
+	}{
+		{
+			id:      "ID-1",
+			errCode: -1,
+		},
+		{
+			id:      "ID-2",
+			errCode: http.StatusNotFound,
+		},
+	}
+
+	for i, tt := range tests {
+		f := makeTestFixtures()
+
+		admn, err := f.adAPI.GetAdmin(tt.id)
+		if tt.errCode != -1 {
+			if err == nil {
+				t.Errorf("case %d: err was nil", i)
+				continue
+			}
+			aErr, ok := err.(Error)
+			if !ok {
+				t.Errorf("case %d: not an admin.Error: %q", i, err)
+				continue
+			}
+
+			if aErr.Code != tt.errCode {
+				t.Errorf("case %d: want=%d, got=%d", i, tt.errCode, aErr.Code)
+				continue
+			}
+		} else {
+			if err != nil {
+				t.Errorf("case %d: err != nil: %q", i, err)
+			}
+			continue
+
+			if admn.Id != "ID-1" {
+				t.Errorf("case %d: want=%q, got=%q", i, tt.id, admn.Id)
+			}
+		}
+
+	}
+
+}
+
+func TestCreateAdmin(t *testing.T) {
+	tests := []struct {
+		admn    adminschema.Admin
+		errCode int
+	}{
+		{
+			admn: adminschema.Admin{
+				Name:         "foo",
+				PasswordHash: user.Password([]byte("foopass")).EncodeBase64(),
+			},
+			errCode: -1,
+		},
+		{
+			// duplicate Name
+			admn: adminschema.Admin{
+				Name:         "Name-1",
+				PasswordHash: user.Password([]byte("foopass")).EncodeBase64(),
+			},
+			errCode: http.StatusBadRequest,
+		},
+		{
+			// missing Name
+			admn: adminschema.Admin{
+				PasswordHash: user.Password([]byte("foopass")).EncodeBase64(),
+			},
+			errCode: http.StatusBadRequest,
+		},
+	}
+	for i, tt := range tests {
+		f := makeTestFixtures()
+
+		id, err := f.adAPI.CreateAdmin(tt.admn)
+		if tt.errCode != -1 {
+			if err == nil {
+				t.Errorf("case %d: err was nil", i)
+				continue
+			}
+			aErr, ok := err.(Error)
+			if !ok {
+				t.Errorf("case %d: not a admin.Error: %#v", i, err)
+				continue
+			}
+
+			if aErr.Code != tt.errCode {
+				t.Errorf("case %d: want=%d, got=%d", i, tt.errCode, aErr.Code)
+				continue
+			}
+		} else {
+			if err != nil {
+				t.Errorf("case %d: err != nil: %q", i, err)
+			}
+
+			gotAdmn, err := f.adAPI.GetAdmin(id)
+			if err != nil {
+				t.Errorf("case %d: err != nil: %q", i, err)
+			}
+
+			tt.admn.Id = id
+			if diff := pretty.Compare(tt.admn, gotAdmn); diff != "" {
+				t.Errorf("case %d: Compare(want, got) = %v", i, diff)
+			}
+		}
+	}
+}
+
+func TestGetState(t *testing.T) {
+	tests := []struct {
+		addUsers []user.User
+		want     adminschema.State
+	}{
+		{
+			addUsers: []user.User{
+				user.User{
+					Name:  "Admin",
+					Admin: true,
+				},
+			},
+			want: adminschema.State{
+				AdminUserCreated: true,
+			},
+		},
+		{
+			want: adminschema.State{
+				AdminUserCreated: false,
+			},
+		},
+	}
+	for i, tt := range tests {
+		f := makeTestFixtures()
+		for _, usr := range tt.addUsers {
+			_, err := f.ur.Create(usr)
+			if err != nil {
+				t.Fatalf("case %d: err != nil", i, err)
+			}
+		}
+
+		got, err := f.adAPI.GetState()
+		if err != nil {
+			t.Errorf("case %d: err != nil", i, err)
+		}
+
+		if diff := pretty.Compare(tt.want, got); diff != "" {
+			t.Errorf("case %d: Compare(want, got) = %v", i, diff)
+		}
+	}
+}
diff --git a/build b/build
new file mode 100755
index 00000000..ba9e9d5d
--- /dev/null
+++ b/build
@@ -0,0 +1,15 @@
+#!/bin/bash -e
+
+export GOPATH=${PWD}/Godeps/_workspace
+export GOBIN=${PWD}/bin
+
+rm -rf $GOPATH/src/github.com/coreos/dex
+mkdir -p $GOPATH/src/github.com/coreos/
+ln -s ${PWD} $GOPATH/src/github.com/coreos/dex
+
+LD_FLAGS="-X main.version $(git rev-parse HEAD)"
+go build -o bin/dex-worker -ldflags="$LD_FLAGS" github.com/coreos/dex/cmd/dex-worker
+go build -o bin/dexctl github.com/coreos/dex/cmd/dexctl
+go build -o bin/dex-overlord -ldflags="$LD_FLAGS" github.com/coreos/dex/cmd/dex-overlord
+go build -o bin/example-app github.com/coreos/dex/examples/app
+go build -o bin/example-cli github.com/coreos/dex/examples/cli
diff --git a/build-docker-push b/build-docker-push
new file mode 100755
index 00000000..aa97a9ea
--- /dev/null
+++ b/build-docker-push
@@ -0,0 +1,18 @@
+#!/bin/bash -e
+
+registry=quay.io
+repo=$registry/coreos/dex
+
+if [ -v $DOCKER_USER ] || [ -v $DOCKER_PASSWORD ]; then
+    echo "env variables not set: DOCKER_USER, DOCKER_PASSWORD. skipping login, assuming creds in .dockercfg"
+else
+    echo logging in as $DOCKER_USER
+    docker login --username="$DOCKER_USER" --password="$DOCKER_PASSWORD" --email="docker.login@coreos.com" $registry
+fi
+
+git_sha=$(git rev-parse HEAD)
+
+docker build -q --rm=true -t $repo:$git_sha .
+docker tag -f $repo:$git_sha $repo:latest
+docker push $repo:$git_sha
+docker push $repo:latest
diff --git a/build-units b/build-units
new file mode 100755
index 00000000..19bbf4cf
--- /dev/null
+++ b/build-units
@@ -0,0 +1,20 @@
+#!/bin/bash -e
+
+mkdir -p deploy
+
+required=(
+  ${DEX_OVERLORD_DB_URL:?"missing"}
+  ${DEX_OVERLORD_KEY_SECRET:?"missing"}
+  ${DEX_WORKER_DB_URL:?"missing"}
+  ${DEX_WORKER_KEY_SECRET:?"missing"}
+)
+
+eval "cat <<EOF
+$(<static/dex-worker.service.tmpl)
+EOF
+" 1> deploy/dex-worker.service
+
+eval "cat <<EOF
+$(<static/dex-overlord.service.tmpl)
+EOF
+" 1> deploy/dex-overlord.service
diff --git a/client/client.go b/client/client.go
new file mode 100644
index 00000000..d08e73e6
--- /dev/null
+++ b/client/client.go
@@ -0,0 +1,212 @@
+package client
+
+import (
+	"encoding/base64"
+	"encoding/json"
+	"errors"
+	"io"
+	"io/ioutil"
+	"net/url"
+	"reflect"
+	"sort"
+
+	pcrypto "github.com/coreos/dex/pkg/crypto"
+	"github.com/coreos/go-oidc/oidc"
+)
+
+var (
+	ErrorInvalidRedirectURL    = errors.New("not a valid redirect url for the given client")
+	ErrorCantChooseRedirectURL = errors.New("must provide a redirect url; client has many")
+	ErrorNoValidRedirectURLs   = errors.New("no valid redirect URLs for this client.")
+	ErrorNotFound              = errors.New("no data found")
+)
+
+type ClientIdentityRepo interface {
+	// Metadata returns one matching ClientMetadata if the given client
+	// exists, otherwise nil. The returned error will be non-nil only
+	// if the repo was unable to determine client existence.
+	Metadata(clientID string) (*oidc.ClientMetadata, error)
+
+	// Authenticate asserts that a client with the given ID exists and
+	// that the provided secret matches. If either of these assertions
+	// fail, (false, nil) will be returned. Only if the repo is unable
+	// to make these assertions will a non-nil error be returned.
+	Authenticate(creds oidc.ClientCredentials) (bool, error)
+
+	// All returns all registered Client Identities.
+	All() ([]oidc.ClientIdentity, error)
+
+	// New registers a ClientIdentity with the repo for the given metadata.
+	// An unused ID must be provided. A corresponding secret will be returned
+	// in a ClientCredentials struct along with the provided ID.
+	New(id string, meta oidc.ClientMetadata) (*oidc.ClientCredentials, error)
+
+	SetDexAdmin(clientID string, isAdmin bool) error
+
+	IsDexAdmin(clientID string) (bool, error)
+}
+
+func NewClientIdentityRepo(cs []oidc.ClientIdentity) ClientIdentityRepo {
+	cr := memClientIdentityRepo{
+		idents: make(map[string]oidc.ClientIdentity, len(cs)),
+		admins: make(map[string]bool),
+	}
+
+	for _, c := range cs {
+		c := c
+		cr.idents[c.Credentials.ID] = c
+	}
+
+	return &cr
+}
+
+type memClientIdentityRepo struct {
+	idents map[string]oidc.ClientIdentity
+	admins map[string]bool
+}
+
+func (cr *memClientIdentityRepo) New(id string, meta oidc.ClientMetadata) (*oidc.ClientCredentials, error) {
+	if _, ok := cr.idents[id]; ok {
+		return nil, errors.New("client ID already exists")
+	}
+
+	secret, err := pcrypto.RandBytes(32)
+	if err != nil {
+		return nil, err
+	}
+
+	cc := oidc.ClientCredentials{
+		ID:     id,
+		Secret: base64.URLEncoding.EncodeToString(secret),
+	}
+
+	cr.idents[id] = oidc.ClientIdentity{
+		Metadata:    meta,
+		Credentials: cc,
+	}
+
+	return &cc, nil
+}
+
+func (cr *memClientIdentityRepo) Metadata(clientID string) (*oidc.ClientMetadata, error) {
+	ci, ok := cr.idents[clientID]
+	if !ok {
+		return nil, ErrorNotFound
+	}
+	return &ci.Metadata, nil
+}
+
+func (cr *memClientIdentityRepo) Authenticate(creds oidc.ClientCredentials) (bool, error) {
+	ci, ok := cr.idents[creds.ID]
+	ok = ok && ci.Credentials.Secret == creds.Secret
+	return ok, nil
+}
+
+func (cr *memClientIdentityRepo) All() ([]oidc.ClientIdentity, error) {
+	cs := make(sortableClientIdentities, 0, len(cr.idents))
+	for _, ci := range cr.idents {
+		ci := ci
+		cs = append(cs, ci)
+	}
+	sort.Sort(cs)
+	return cs, nil
+}
+
+func (cr *memClientIdentityRepo) SetDexAdmin(clientID string, isAdmin bool) error {
+	cr.admins[clientID] = isAdmin
+	return nil
+}
+
+func (cr *memClientIdentityRepo) IsDexAdmin(clientID string) (bool, error) {
+	return cr.admins[clientID], nil
+}
+
+type sortableClientIdentities []oidc.ClientIdentity
+
+func (s sortableClientIdentities) Len() int {
+	return len([]oidc.ClientIdentity(s))
+}
+
+func (s sortableClientIdentities) Less(i, j int) bool {
+	return s[i].Credentials.ID < s[j].Credentials.ID
+}
+
+func (s sortableClientIdentities) Swap(i, j int) {
+	s[i], s[j] = s[j], s[i]
+}
+
+func NewClientIdentityRepoFromReader(r io.Reader) (ClientIdentityRepo, error) {
+	b, err := ioutil.ReadAll(r)
+	if err != nil {
+		return nil, err
+	}
+
+	var cs []clientIdentity
+	if err = json.Unmarshal(b, &cs); err != nil {
+		return nil, err
+	}
+
+	ocs := make([]oidc.ClientIdentity, len(cs))
+	for i, c := range cs {
+		ocs[i] = oidc.ClientIdentity(c)
+	}
+
+	return NewClientIdentityRepo(ocs), nil
+}
+
+type clientIdentity oidc.ClientIdentity
+
+func (ci *clientIdentity) UnmarshalJSON(data []byte) error {
+	c := struct {
+		ID           string   `json:"id"`
+		Secret       string   `json:"secret"`
+		RedirectURLs []string `json:"redirectURLs"`
+	}{}
+
+	if err := json.Unmarshal(data, &c); err != nil {
+		return err
+	}
+
+	ci.Credentials = oidc.ClientCredentials{
+		ID:     c.ID,
+		Secret: c.Secret,
+	}
+	ci.Metadata = oidc.ClientMetadata{
+		RedirectURLs: make([]url.URL, len(c.RedirectURLs)),
+	}
+
+	for i, us := range c.RedirectURLs {
+		up, err := url.Parse(us)
+		if err != nil {
+			return err
+		}
+		ci.Metadata.RedirectURLs[i] = *up
+	}
+
+	return nil
+}
+
+// ValidRedirectURL returns the passed in URL if it is present in the redirectURLs list, and returns an error otherwise.
+// If nil is passed in as the rURL and there is only one URL in redirectURLs,
+// that URL will be returned. If nil is passed but theres >1 URL in the slice,
+// then an error is returned.
+func ValidRedirectURL(rURL *url.URL, redirectURLs []url.URL) (url.URL, error) {
+	if len(redirectURLs) == 0 {
+		return url.URL{}, ErrorNoValidRedirectURLs
+	}
+
+	if rURL == nil {
+		if len(redirectURLs) > 1 {
+			return url.URL{}, ErrorCantChooseRedirectURL
+		}
+
+		return redirectURLs[0], nil
+	}
+
+	for _, ru := range redirectURLs {
+		if reflect.DeepEqual(ru, *rURL) {
+			return ru, nil
+		}
+	}
+	return url.URL{}, ErrorInvalidRedirectURL
+}
diff --git a/client/client_test.go b/client/client_test.go
new file mode 100644
index 00000000..d018b466
--- /dev/null
+++ b/client/client_test.go
@@ -0,0 +1,190 @@
+package client
+
+import (
+	"encoding/json"
+	"net/url"
+	"reflect"
+	"sort"
+	"testing"
+
+	"github.com/coreos/go-oidc/oidc"
+)
+
+func TestMemClientIdentityRepoNew(t *testing.T) {
+	tests := []struct {
+		id   string
+		meta oidc.ClientMetadata
+	}{
+		{
+			id: "foo",
+			meta: oidc.ClientMetadata{
+				RedirectURLs: []url.URL{
+					url.URL{
+						Scheme: "https",
+						Host:   "example.com",
+					},
+				},
+			},
+		},
+		{
+			id: "bar",
+			meta: oidc.ClientMetadata{
+				RedirectURLs: []url.URL{
+					url.URL{Scheme: "https", Host: "example.com/foo"},
+					url.URL{Scheme: "https", Host: "example.com/bar"},
+				},
+			},
+		},
+	}
+
+	for i, tt := range tests {
+		cr := NewClientIdentityRepo(nil)
+		creds, err := cr.New(tt.id, tt.meta)
+		if err != nil {
+			t.Errorf("case %d: unexpected error: %v", i, err)
+		}
+
+		if creds.ID != tt.id {
+			t.Errorf("case %d: expected non-empty Client ID", i)
+		}
+
+		if creds.Secret == "" {
+			t.Errorf("case %d: expected non-empty Client Secret", i)
+		}
+
+		all, err := cr.All()
+		if err != nil {
+			t.Errorf("case %d: unexpected error: %v", i, err)
+		}
+		if len(all) != 1 {
+			t.Errorf("case %d: expected repo to contain newly created Client", i)
+		}
+
+		wantURLs := tt.meta.RedirectURLs
+		gotURLs := all[0].Metadata.RedirectURLs
+		if !reflect.DeepEqual(wantURLs, gotURLs) {
+			t.Errorf("case %d: redirect url mismatch, want=%v, got=%v", i, wantURLs, gotURLs)
+		}
+	}
+}
+
+func TestMemClientIdentityRepoNewDuplicate(t *testing.T) {
+	cr := NewClientIdentityRepo(nil)
+
+	meta1 := oidc.ClientMetadata{
+		RedirectURLs: []url.URL{
+			url.URL{Scheme: "https", Host: "foo.example.com"},
+		},
+	}
+
+	if _, err := cr.New("foo", meta1); err != nil {
+		t.Errorf("unexpected error: %v", err)
+	}
+
+	meta2 := oidc.ClientMetadata{
+		RedirectURLs: []url.URL{
+			url.URL{Scheme: "https", Host: "bar.example.com"},
+		},
+	}
+
+	if _, err := cr.New("foo", meta2); err == nil {
+		t.Errorf("expected non-nil error")
+	}
+}
+
+func TestMemClientIdentityRepoAll(t *testing.T) {
+	tests := []struct {
+		ids []string
+	}{
+		{
+			ids: nil,
+		},
+		{
+			ids: []string{"foo"},
+		},
+		{
+			ids: []string{"foo", "bar"},
+		},
+	}
+
+	for i, tt := range tests {
+		cs := make([]oidc.ClientIdentity, len(tt.ids))
+		for i, s := range tt.ids {
+			cs[i] = oidc.ClientIdentity{
+				Credentials: oidc.ClientCredentials{
+					ID: s,
+				},
+			}
+		}
+
+		cr := NewClientIdentityRepo(cs)
+
+		all, err := cr.All()
+		if err != nil {
+			t.Errorf("case %d: unexpected error: %v", i, err)
+		}
+
+		want := sortableClientIdentities(cs)
+		sort.Sort(want)
+		got := sortableClientIdentities(all)
+		sort.Sort(got)
+
+		if len(got) != len(want) {
+			t.Errorf("case %d: wrong length: %d", i, len(got))
+		}
+
+		if !reflect.DeepEqual(want, got) {
+			t.Errorf("case %d: want=%#v, got=%#v", i, want, got)
+		}
+	}
+}
+
+func TestClientIdentityUnmarshalJSON(t *testing.T) {
+	for i, test := range []struct {
+		json           string
+		expectedID     string
+		expectedSecret string
+		expectedURLs   []string
+	}{
+		{
+			json:           `{"id":"12345","secret":"rosebud","redirectURLs":["https://redirectone.com", "https://redirecttwo.com"]}`,
+			expectedID:     "12345",
+			expectedSecret: "rosebud",
+			expectedURLs: []string{
+				"https://redirectone.com",
+				"https://redirecttwo.com",
+			},
+		},
+	} {
+		var actual clientIdentity
+		err := json.Unmarshal([]byte(test.json), &actual)
+		if err != nil {
+			t.Errorf("case %d: error unmarshalling: %v", i, err)
+			continue
+		}
+
+		if actual.Credentials.ID != test.expectedID {
+			t.Errorf("case %d: actual.Credentials.ID == %v, want %v", i, actual.Credentials.ID, test.expectedID)
+		}
+
+		if actual.Credentials.Secret != test.expectedSecret {
+			t.Errorf("case %d: actual.Credentials.Secret == %v, want %v", i, actual.Credentials.Secret, test.expectedSecret)
+		}
+		expectedURLs := test.expectedURLs
+		sort.Strings(expectedURLs)
+
+		actualURLs := make([]string, 0)
+		for _, u := range actual.Metadata.RedirectURLs {
+			actualURLs = append(actualURLs, u.String())
+		}
+		sort.Strings(actualURLs)
+		if len(actualURLs) != len(expectedURLs) {
+			t.Errorf("case %d: len(actualURLs) == %v, want %v", i, len(actualURLs), len(expectedURLs))
+		}
+		for ui, actualURL := range actualURLs {
+			if actualURL != expectedURLs[ui] {
+				t.Errorf("case %d: actualURLs[%d] == %q, want %q", i, ui, actualURL, expectedURLs[ui])
+			}
+		}
+	}
+}
diff --git a/cmd/dex-overlord/main.go b/cmd/dex-overlord/main.go
new file mode 100644
index 00000000..263297b1
--- /dev/null
+++ b/cmd/dex-overlord/main.go
@@ -0,0 +1,104 @@
+package main
+
+import (
+	"expvar"
+	"flag"
+	"fmt"
+	"net/http"
+	"net/url"
+	"os"
+	"time"
+
+	"github.com/coreos/go-oidc/key"
+
+	"github.com/coreos/dex/admin"
+	"github.com/coreos/dex/db"
+	pflag "github.com/coreos/dex/pkg/flag"
+	"github.com/coreos/dex/pkg/log"
+	"github.com/coreos/dex/server"
+	"github.com/coreos/dex/user"
+)
+
+var version = "DEV"
+
+func init() {
+	expvar.NewString("dex.version").Set(version)
+}
+
+func main() {
+	fs := flag.NewFlagSet("dex-overlord", flag.ExitOnError)
+	secret := fs.String("key-secret", "", "symmetric key used to encrypt/decrypt signing key data in DB")
+	dbURL := fs.String("db-url", "", "DSN-formatted database connection string")
+	keyPeriod := fs.Duration("key-period", 24*time.Hour, "length of time for-which a given key will be valid")
+	gcInterval := fs.Duration("gc-interval", time.Hour, "length of time between garbage collection runs")
+
+	adminListen := fs.String("admin-listen", "http://0.0.0.0:5557", "scheme, host and port for listening for administrative operation requests ")
+
+	logDebug := fs.Bool("log-debug", false, "log debug-level information")
+	logTimestamps := fs.Bool("log-timestamps", false, "prefix log lines with timestamps")
+	localConnectorID := fs.String("local-connector", "local", "ID of the local connector")
+
+	if err := fs.Parse(os.Args[1:]); err != nil {
+		fmt.Fprintln(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+
+	if err := pflag.SetFlagsFromEnv(fs, "DEX_OVERLORD"); err != nil {
+		fmt.Fprintln(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+
+	if *logDebug {
+		log.EnableDebug()
+	}
+	if *logTimestamps {
+		log.EnableTimestamps()
+	}
+
+	if len(*secret) == 0 {
+		log.Fatalf("--key-secret unset")
+	}
+
+	adminURL, err := url.Parse(*adminListen)
+	if err != nil {
+		log.Fatalf("Unable to use --admin-listen flag: %v", err)
+	}
+
+	dbCfg := db.Config{
+		DSN:                *dbURL,
+		MaxIdleConnections: 1,
+		MaxOpenConnections: 1,
+	}
+	dbc, err := db.NewConnection(dbCfg)
+	if err != nil {
+		log.Fatalf(err.Error())
+	}
+
+	userRepo := db.NewUserRepo(dbc)
+	pwiRepo := db.NewPasswordInfoRepo(dbc)
+	userManager := user.NewManager(userRepo,
+		pwiRepo, db.TransactionFactory(dbc), user.ManagerOptions{})
+	adminAPI := admin.NewAdminAPI(userManager, userRepo, pwiRepo, *localConnectorID)
+	kRepo, err := db.NewPrivateKeySetRepo(dbc, *secret)
+	if err != nil {
+		log.Fatalf(err.Error())
+	}
+
+	krot := key.NewPrivateKeyRotator(kRepo, *keyPeriod)
+	s := server.NewAdminServer(adminAPI, krot)
+	h := s.HTTPHandler()
+	httpsrv := &http.Server{
+		Addr:    adminURL.Host,
+		Handler: h,
+	}
+
+	gc := db.NewGarbageCollector(dbc, *gcInterval)
+
+	log.Infof("Binding to %s...", httpsrv.Addr)
+	go func() {
+		log.Fatal(httpsrv.ListenAndServe())
+	}()
+
+	gc.Run()
+	<-krot.Run()
+}
diff --git a/cmd/dex-worker/main.go b/cmd/dex-worker/main.go
new file mode 100644
index 00000000..2a93b481
--- /dev/null
+++ b/cmd/dex-worker/main.go
@@ -0,0 +1,149 @@
+package main
+
+import (
+	"expvar"
+	"flag"
+	"fmt"
+	"net/http"
+	"net/url"
+	"os"
+
+	"github.com/gorilla/handlers"
+
+	"github.com/coreos/dex/db"
+	pflag "github.com/coreos/dex/pkg/flag"
+	"github.com/coreos/dex/pkg/log"
+	"github.com/coreos/dex/server"
+
+	"github.com/coreos/pkg/flagutil"
+)
+
+var version = "DEV"
+
+func init() {
+	versionVar := expvar.NewString("dex.version")
+	versionVar.Set(version)
+}
+
+func main() {
+	fs := flag.NewFlagSet("dex-worker", flag.ExitOnError)
+	listen := fs.String("listen", "http://0.0.0.0:5556", "")
+	issuer := fs.String("issuer", "http://127.0.0.1:5556", "")
+	templates := fs.String("html-assets", "./static/html", "directory of html template files")
+
+	emailTemplateDirs := flagutil.StringSliceFlag{"./static/email"}
+	fs.Var(&emailTemplateDirs, "email-templates", "comma separated list of directories of email template files")
+
+	emailFrom := fs.String("email-from", "no-reply@coreos.com", "emails sent from dex will come from this address")
+	emailConfig := fs.String("email-cfg", "./static/fixtures/emailer.json", "configures emailer.")
+
+	noDB := fs.Bool("no-db", false, "manage entities in-process w/o any encryption, used only for single-node testing")
+
+	// ignored if --no-db is set
+	dbURL := fs.String("db-url", "", "DSN-formatted database connection string")
+	keySecret := fs.String("key-secret", "", "symmetric key used to encrypt/decrypt signing key data in DB")
+	dbMaxIdleConns := fs.Int("db-max-idle-conns", 0, "maximum number of connections in the idle connection pool")
+	dbMaxOpenConns := fs.Int("db-max-open-conns", 0, "maximum number of open connections to the database")
+
+	// used only if --no-db is set
+	connectors := fs.String("connectors", "./static/fixtures/connectors.json", "JSON file containg set of IDPC configs")
+	clients := fs.String("clients", "./static/fixtures/clients.json", "json file containing set of clients")
+	users := fs.String("users", "./static/fixtures/users.json", "json file containing set of users")
+
+	logDebug := fs.Bool("log-debug", false, "log debug-level information")
+	logTimestamps := fs.Bool("log-timestamps", false, "prefix log lines with timestamps")
+
+	if err := fs.Parse(os.Args[1:]); err != nil {
+		fmt.Fprintln(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+
+	if err := pflag.SetFlagsFromEnv(fs, "DEX_WORKER"); err != nil {
+		fmt.Fprintln(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+
+	if *logDebug {
+		log.EnableDebug()
+		log.Infof("Debug logging enabled.")
+		log.Debugf("Debug logging enabled.")
+	}
+	if *logTimestamps {
+		log.EnableTimestamps()
+	}
+
+	lu, err := url.Parse(*listen)
+	if err != nil {
+		log.Fatalf("Unable to use --listen flag: %v", err)
+	}
+
+	if lu.Scheme != "http" {
+		log.Fatalf("Unable to listen using scheme %s", lu.Scheme)
+	}
+
+	scfg := server.ServerConfig{
+		IssuerURL:         *issuer,
+		TemplateDir:       *templates,
+		EmailTemplateDirs: emailTemplateDirs,
+		EmailFromAddress:  *emailFrom,
+		EmailerConfigFile: *emailConfig,
+	}
+
+	if *noDB {
+		log.Warning("Running in-process without external database or key rotation")
+		scfg.StateConfig = &server.SingleServerConfig{
+			ClientsFile:    *clients,
+			ConnectorsFile: *connectors,
+			UsersFile:      *users,
+		}
+	} else {
+		if *dbMaxIdleConns == 0 {
+			log.Warning("Running with no limit on: database idle connections")
+		}
+		if *dbMaxOpenConns == 0 {
+			log.Warning("Running with no limit on: database open connections")
+		}
+		dbCfg := db.Config{
+			DSN:                *dbURL,
+			MaxIdleConnections: *dbMaxIdleConns,
+			MaxOpenConnections: *dbMaxOpenConns,
+		}
+		scfg.StateConfig = &server.MultiServerConfig{
+			KeySecret:      *keySecret,
+			DatabaseConfig: dbCfg,
+		}
+	}
+
+	srv, err := scfg.Server()
+	if err != nil {
+		log.Fatalf("Unable to build Server: %v", err)
+	}
+
+	cfgs, err := srv.ConnectorConfigRepo.All()
+	if err != nil {
+		log.Fatalf("Unable to fetch connector configs from repo: %v", err)
+	}
+
+	for _, cfg := range cfgs {
+		cfg := cfg
+		if err = srv.AddConnector(cfg); err != nil {
+			log.Fatalf("Failed registering connector: %v", err)
+		}
+	}
+
+	h := srv.HTTPHandler()
+
+	h = handlers.LoggingHandler(log.InfoWriter(), h)
+
+	httpsrv := &http.Server{
+		Addr:    lu.Host,
+		Handler: h,
+	}
+
+	log.Infof("Binding to %s...", httpsrv.Addr)
+	go func() {
+		log.Fatal(httpsrv.ListenAndServe())
+	}()
+
+	<-srv.Run()
+}
diff --git a/cmd/dexctl/command_client.go b/cmd/dexctl/command_client.go
new file mode 100644
index 00000000..7da4abbd
--- /dev/null
+++ b/cmd/dexctl/command_client.go
@@ -0,0 +1,52 @@
+package main
+
+import (
+	"net/url"
+
+	"github.com/coreos/go-oidc/oidc"
+)
+
+var (
+	cmdNewClient = &command{
+		Name:    "new-client",
+		Summary: "Create a new client with the provided redirect URL(s)",
+		Usage:   "<URL>...",
+		Run:     runNewClient,
+	}
+)
+
+func init() {
+	commands = append(commands, cmdNewClient)
+}
+
+func runNewClient(args []string) int {
+	if len(args) < 1 {
+		stderr("Provide at least one redirect URL.")
+		return 2
+	}
+
+	redirectURLs := make([]url.URL, len(args))
+	for i, ua := range args {
+		u, err := url.Parse(ua)
+		if err != nil {
+			stderr("Malformed URL %q: %v", ua, err)
+			return 1
+		}
+		redirectURLs[i] = *u
+	}
+
+	cc, err := getDriver().NewClient(oidc.ClientMetadata{RedirectURLs: redirectURLs})
+	if err != nil {
+		stderr("Failed creating new client: %v", err)
+		return 1
+	}
+
+	stdout("# Added new client:")
+	stdout("DEX_APP_CLIENT_ID=%s", cc.ID)
+	stdout("DEX_APP_CLIENT_SECRET=%s", cc.Secret)
+	for i, u := range redirectURLs {
+		stdout(" DEX_APP_REDIRECTURL_%d=%s", i, u.String())
+	}
+
+	return 0
+}
diff --git a/cmd/dexctl/command_config.go b/cmd/dexctl/command_config.go
new file mode 100644
index 00000000..4a5030b8
--- /dev/null
+++ b/cmd/dexctl/command_config.go
@@ -0,0 +1,79 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/coreos/dex/connector"
+)
+
+var (
+	cmdGetConnectorConfigs = &command{
+		Name:    "get-connector-configs",
+		Summary: "Enumerate current IdP connector configs.",
+		Usage:   "",
+		Run:     runGetConnectorConfigs,
+	}
+
+	cmdSetConnectorConfigs = &command{
+		Name:    "set-connector-configs",
+		Summary: "Overwrite the current IdP connector configs with those from a local file.",
+		Usage:   "<FILE>",
+		Run:     runSetConnectorConfigs,
+	}
+)
+
+func init() {
+	commands = append(commands, cmdSetConnectorConfigs)
+	commands = append(commands, cmdGetConnectorConfigs)
+}
+
+func runSetConnectorConfigs(args []string) int {
+	if len(args) != 1 {
+		stderr("Provide a single argument.")
+		return 2
+	}
+
+	rf, err := connector.NewConnectorConfigRepoFromFile(args[0])
+	if err != nil {
+		stderr("Unable to retrieve connector configs from file: %v", err)
+		return 1
+	}
+
+	cfgs, err := rf.All()
+	if err != nil {
+		stderr("Unable to retrieve connector configs from file: %v", err)
+		return 1
+	}
+
+	if err := getDriver().SetConnectorConfigs(cfgs); err != nil {
+		stderr(err.Error())
+		return 1
+	}
+
+	fmt.Printf("Saved %d connector config(s)\n", len(cfgs))
+
+	return 0
+}
+
+func runGetConnectorConfigs(args []string) int {
+	if len(args) != 0 {
+		stderr("Provide zero arguments.")
+		return 2
+	}
+
+	cfgs, err := getDriver().ConnectorConfigs()
+	if err != nil {
+		stderr("Unable to retrieve connector configs: %v", err)
+		return 1
+	}
+
+	fmt.Printf("Found %d connector config(s)\n", len(cfgs))
+
+	for _, cfg := range cfgs {
+		fmt.Println()
+		fmt.Printf("ID:   %v\n", cfg.ConnectorID())
+		fmt.Printf("Type: %v\n", cfg.ConnectorType())
+	}
+
+	return 0
+}
diff --git a/cmd/dexctl/command_help.go b/cmd/dexctl/command_help.go
new file mode 100644
index 00000000..9a77dffe
--- /dev/null
+++ b/cmd/dexctl/command_help.go
@@ -0,0 +1,135 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"os"
+	"strings"
+	"text/tabwriter"
+	"text/template"
+)
+
+var (
+	cmdHelp = &command{
+		Name:    "help",
+		Summary: "Show a list of commands or help for one command",
+		Usage:   "[COMMAND]",
+		Run:     runHelp,
+	}
+
+	globalUsageTemplate  *template.Template
+	commandUsageTemplate *template.Template
+	templFuncs           = template.FuncMap{
+		"descToLines": func(s string) []string {
+			// trim leading/trailing whitespace and split into slice of lines
+			return strings.Split(strings.Trim(s, "\n\t "), "\n")
+		},
+		"printOption": func(name, defvalue, usage string) string {
+			prefix := "--"
+			if len(name) == 1 {
+				prefix = "-"
+			}
+			return fmt.Sprintf("\n\t%s%s=%s\t%s", prefix, name, defvalue, usage)
+		},
+	}
+
+	tabOut *tabwriter.Writer
+)
+
+func init() {
+	tabOut = tabwriter.NewWriter(os.Stdout, 0, 8, 1, '\t', 0)
+
+	commands = append(commands, cmdHelp)
+
+	globalUsageTemplate = template.Must(template.New("global_usage").Funcs(templFuncs).Parse(`
+NAME:
+{{printf "\t%s - %s" .Executable .Description}}
+
+USAGE: 
+{{printf "\t%s" .Executable}} [global options] <command> [command options] [arguments...]
+
+COMMANDS:{{range .Commands}}
+{{printf "\t%s\t%s" .Name .Summary}}{{end}}
+
+GLOBAL OPTIONS:{{range .Flags}}{{printOption .Name .DefValue .Usage}}{{end}}
+
+Global options can also be configured via upper-case environment variables prefixed with "DEXCTL_"
+For example, "some-flag" => "DEXCTL_SOME_FLAG"
+
+Run "{{.Executable}} help <command>" for more details on a specific command.
+`[1:]))
+	commandUsageTemplate = template.Must(template.New("command_usage").Funcs(templFuncs).Parse(`
+NAME:
+{{printf "\t%s - %s" .Cmd.Name .Cmd.Summary}}
+
+USAGE:
+{{printf "\t%s %s %s" .Executable .Cmd.Name .Cmd.Usage}}
+
+DESCRIPTION:
+{{range $line := descToLines .Cmd.Description}}{{printf "\t%s" $line}}
+{{end}}
+{{if .CmdFlags}}OPTIONS:{{range .CmdFlags}}
+{{printOption .Name .DefValue .Usage}}{{end}}
+
+{{end}}For help on global options run "{{.Executable}} help"
+`[1:]))
+}
+
+func runHelp(args []string) (exit int) {
+	if len(args) < 1 {
+		printGlobalUsage()
+		return
+	}
+
+	var cmd *command
+	for _, c := range commands {
+		if c.Name == args[0] {
+			cmd = c
+			break
+		}
+	}
+
+	if cmd == nil {
+		stderr("Unrecognized command: %s", args[0])
+		return 1
+	}
+
+	printCommandUsage(cmd)
+	return
+}
+
+func printGlobalUsage() {
+	globalUsageTemplate.Execute(tabOut, struct {
+		Executable  string
+		Commands    []*command
+		Flags       []*flag.Flag
+		Description string
+	}{
+		cliName,
+		commands,
+		getFlags(globalFS),
+		cliDescription,
+	})
+	tabOut.Flush()
+}
+
+func printCommandUsage(cmd *command) {
+	commandUsageTemplate.Execute(tabOut, struct {
+		Executable string
+		Cmd        *command
+		CmdFlags   []*flag.Flag
+	}{
+		cliName,
+		cmd,
+		getFlags(&cmd.Flags),
+	})
+	tabOut.Flush()
+}
+
+func getFlags(flagset *flag.FlagSet) (flags []*flag.Flag) {
+	flags = make([]*flag.Flag, 0)
+	flagset.VisitAll(func(f *flag.Flag) {
+		flags = append(flags, f)
+	})
+	return
+}
diff --git a/cmd/dexctl/driver.go b/cmd/dexctl/driver.go
new file mode 100644
index 00000000..98bc0a68
--- /dev/null
+++ b/cmd/dexctl/driver.go
@@ -0,0 +1,13 @@
+package main
+
+import (
+	"github.com/coreos/dex/connector"
+	"github.com/coreos/go-oidc/oidc"
+)
+
+type driver interface {
+	NewClient(oidc.ClientMetadata) (*oidc.ClientCredentials, error)
+
+	ConnectorConfigs() ([]connector.ConnectorConfig, error)
+	SetConnectorConfigs([]connector.ConnectorConfig) error
+}
diff --git a/cmd/dexctl/driver_api.go b/cmd/dexctl/driver_api.go
new file mode 100644
index 00000000..b287e5bd
--- /dev/null
+++ b/cmd/dexctl/driver_api.go
@@ -0,0 +1,71 @@
+package main
+
+import (
+	"errors"
+	"net/http"
+
+	"github.com/coreos/dex/connector"
+	schema "github.com/coreos/dex/schema/workerschema"
+	"github.com/coreos/go-oidc/oidc"
+)
+
+func newAPIDriver(pcfg oidc.ProviderConfig, creds oidc.ClientCredentials) (driver, error) {
+	ccfg := oidc.ClientConfig{
+		ProviderConfig: pcfg,
+		Credentials:    creds,
+	}
+	oc, err := oidc.NewClient(ccfg)
+	if err != nil {
+		return nil, err
+	}
+
+	trans := &oidc.AuthenticatedTransport{
+		TokenRefresher: &oidc.ClientCredsTokenRefresher{
+			Issuer:     pcfg.Issuer,
+			OIDCClient: oc,
+		},
+		RoundTripper: http.DefaultTransport,
+	}
+	hc := &http.Client{Transport: trans}
+	svc, err := schema.NewWithBasePath(hc, pcfg.Issuer)
+	if err != nil {
+		return nil, err
+	}
+
+	return &apiDriver{svc: svc}, nil
+}
+
+type apiDriver struct {
+	svc *schema.Service
+}
+
+func (d *apiDriver) NewClient(meta oidc.ClientMetadata) (*oidc.ClientCredentials, error) {
+	sc := &schema.Client{
+		RedirectURIs: make([]string, len(meta.RedirectURLs)),
+	}
+
+	for i, u := range meta.RedirectURLs {
+		sc.RedirectURIs[i] = u.String()
+	}
+
+	call := d.svc.Clients.Create(sc)
+	scs, err := call.Do()
+	if err != nil {
+		return nil, err
+	}
+
+	creds := &oidc.ClientCredentials{
+		ID:     scs.Id,
+		Secret: scs.Secret,
+	}
+
+	return creds, nil
+}
+
+func (d *apiDriver) ConnectorConfigs() ([]connector.ConnectorConfig, error) {
+	return nil, errors.New("unable to get connector configs from HTTP API")
+}
+
+func (d *apiDriver) SetConnectorConfigs(cfgs []connector.ConnectorConfig) error {
+	return errors.New("unable to set connector configs through HTTP API")
+}
diff --git a/cmd/dexctl/driver_db.go b/cmd/dexctl/driver_db.go
new file mode 100644
index 00000000..e5c8d760
--- /dev/null
+++ b/cmd/dexctl/driver_db.go
@@ -0,0 +1,48 @@
+package main
+
+import (
+	"github.com/coreos/dex/client"
+	"github.com/coreos/dex/connector"
+	"github.com/coreos/dex/db"
+	"github.com/coreos/go-oidc/oidc"
+)
+
+func newDBDriver(dsn string) (driver, error) {
+	dbc, err := db.NewConnection(db.Config{DSN: dsn})
+	if err != nil {
+		return nil, err
+	}
+
+	drv := &dbDriver{
+		ciRepo:  db.NewClientIdentityRepo(dbc),
+		cfgRepo: db.NewConnectorConfigRepo(dbc),
+	}
+
+	return drv, nil
+}
+
+type dbDriver struct {
+	ciRepo  client.ClientIdentityRepo
+	cfgRepo *db.ConnectorConfigRepo
+}
+
+func (d *dbDriver) NewClient(meta oidc.ClientMetadata) (*oidc.ClientCredentials, error) {
+	if err := meta.Valid(); err != nil {
+		return nil, err
+	}
+
+	clientID, err := oidc.GenClientID(meta.RedirectURLs[0].Host)
+	if err != nil {
+		return nil, err
+	}
+
+	return d.ciRepo.New(clientID, meta)
+}
+
+func (d *dbDriver) ConnectorConfigs() ([]connector.ConnectorConfig, error) {
+	return d.cfgRepo.All()
+}
+
+func (d *dbDriver) SetConnectorConfigs(cfgs []connector.ConnectorConfig) error {
+	return d.cfgRepo.Set(cfgs)
+}
diff --git a/cmd/dexctl/main.go b/cmd/dexctl/main.go
new file mode 100644
index 00000000..a1c24d8f
--- /dev/null
+++ b/cmd/dexctl/main.go
@@ -0,0 +1,124 @@
+package main
+
+import (
+	"errors"
+	"flag"
+	"net/http"
+	"os"
+
+	pflag "github.com/coreos/dex/pkg/flag"
+	"github.com/coreos/dex/pkg/log"
+	"github.com/coreos/go-oidc/oidc"
+)
+
+var (
+	cliName        = "dexctl"
+	cliDescription = "???"
+
+	commands []*command
+	globalFS = flag.NewFlagSet(cliName, flag.ExitOnError)
+
+	global struct {
+		endpoint string
+		creds    oidc.ClientCredentials
+		dbURL    string
+		help     bool
+		logDebug bool
+	}
+)
+
+func init() {
+	log.EnableTimestamps()
+
+	globalFS.StringVar(&global.endpoint, "endpoint", "", "URL of dex API")
+	globalFS.StringVar(&global.creds.ID, "client-id", "", "dex API user ID")
+	globalFS.StringVar(&global.creds.Secret, "client-secret", "", "dex API user password")
+	globalFS.StringVar(&global.dbURL, "db-url", "", "DSN-formatted database connection string")
+	globalFS.BoolVar(&global.help, "help", false, "Print usage information and exit")
+	globalFS.BoolVar(&global.help, "h", false, "Print usage information and exit")
+	globalFS.BoolVar(&global.logDebug, "log-debug", false, "Log debug-level information")
+}
+
+func main() {
+	err := parseFlags()
+	if err != nil {
+		stderr(err.Error())
+		os.Exit(2)
+	}
+
+	if global.logDebug {
+		log.EnableDebug()
+	}
+
+	args := globalFS.Args()
+	if len(args) < 1 || global.help {
+		args = []string{"help"}
+	}
+
+	var cmd *command
+	for _, c := range commands {
+		if c.Name == args[0] {
+			cmd = c
+			if err := c.Flags.Parse(args[1:]); err != nil {
+				stderr("%v", err)
+				os.Exit(2)
+			}
+			break
+		}
+	}
+
+	if cmd == nil {
+		stderr("%v: unknown subcommand: %q", cliName, args[0])
+		stderr("Run '%v help' for usage.", cliName)
+		os.Exit(2)
+	}
+
+	os.Exit(cmd.Run(cmd.Flags.Args()))
+}
+
+type command struct {
+	Name        string       // Name of the command and the string to use to invoke it
+	Summary     string       // One-sentence summary of what the command does
+	Usage       string       // Usage options/arguments
+	Description string       // Detailed description of command
+	Flags       flag.FlagSet // Set of flags associated with this command
+
+	Run func(args []string) int // Run a command with the given arguments, return exit status
+
+}
+
+func parseFlags() error {
+	if err := globalFS.Parse(os.Args[1:]); err != nil {
+		return err
+	}
+
+	return pflag.SetFlagsFromEnv(globalFS, "DEXCTL")
+}
+
+func getDriver() (drv driver) {
+	var err error
+	switch {
+	case len(global.dbURL) > 0:
+		drv, err = newDBDriver(global.dbURL)
+	case len(global.endpoint) > 0:
+		if len(global.creds.ID) == 0 || len(global.creds.Secret) == 0 {
+			err = errors.New("--client-id/--client-secret flags unset")
+		} else {
+			pcfg, err := oidc.FetchProviderConfig(http.DefaultClient, global.endpoint)
+			if err != nil {
+				stderr("Unable to fetch provider config: %v", err)
+				os.Exit(1)
+			}
+			drv, err = newAPIDriver(pcfg, global.creds)
+		}
+	default:
+		err = errors.New("--endpoint/--db-url flags unset")
+	}
+
+	if err != nil {
+		stderr("Unable to configure dexctl driver: %v", err)
+		os.Exit(1)
+	}
+
+	return
+}
diff --git a/cmd/dexctl/util.go b/cmd/dexctl/util.go
new file mode 100644
index 00000000..e26a6695
--- /dev/null
+++ b/cmd/dexctl/util.go
@@ -0,0 +1,21 @@
+package main
+
+import (
+	"fmt"
+	"os"
+	"strings"
+)
+
+func stderr(format string, args ...interface{}) {
+	if !strings.HasSuffix(format, "\n") {
+		format = format + "\n"
+	}
+	fmt.Fprintf(os.Stderr, format, args...)
+}
+
+func stdout(format string, args ...interface{}) {
+	if !strings.HasSuffix(format, "\n") {
+		format = format + "\n"
+	}
+	fmt.Fprintf(os.Stdout, format, args...)
+}
diff --git a/cmd/genconfig/README.md b/cmd/genconfig/README.md
new file mode 100644
index 00000000..1ad57140
--- /dev/null
+++ b/cmd/genconfig/README.md
@@ -0,0 +1,41 @@
+genconfig
+====
+
+The genconfig tool generates boilerplate code for registering and deserializing configuration objects.
+
+## Usage - Go source
+
+Let's say you have an interface called `Foo` with several concrete implmentations, and you'd like to be able to instantiate these implementations by reading JSON configuration files.
+
+The first thing you do is create a new interface called `FooConfig` and add a `go:generate` directive to it like so:
+
+    //go:generate genconfig -o config.go foo Foo
+    type FooConfig interface {
+      FooID() string
+      Foo()
+      ...
+
+The first argument is the name of the file to create. The second (`foo`) is the name of the package. The third is the object that is to be configurable.
+
+## Usage - Go Generate
+
+To generate (or re-generate) your config file, issue the following command in your shell:
+    ```
+    go generate github.com/coreos/dex/foo
+    ```
+
+## Usage - Generated Code API
+
+Every time you make a new `Foo` implementation, you should create a new `FooConfig` which configures it, and can return a `Foo`. You should tag `FooConfig` so that it can be serialized/de-serialized as you plesae.
+
+After creating the `Config` object, you can register it with the the generated `RegisterFooConfigType`. This allows you to create `NewFooFromType(fooType string)` and also `newFooConfigFromMap`.
+
+In practice you will do something like: deserialize a JSON object into a `map[string]interface{}`, pass that map into `newFooConfigFromMap` which gives you your `FooConfig` and then call whatever you've implemented to get a `Foo` from a `FooConfig`
+
+## The Future?
+
+There's still a lot of boilerplate that needs to be generated to use this API. It would be nice to generate even more code, with more `go:generate` directives. For example, partial implementations of the XXXConfig objects could be generated, along with functions for deserializing the Config objects (or slices of them) from an io.Reader.
+
+
+
+
diff --git a/cmd/genconfig/main.go b/cmd/genconfig/main.go
new file mode 100644
index 00000000..4767dac6
--- /dev/null
+++ b/cmd/genconfig/main.go
@@ -0,0 +1,109 @@
+// genconfig generates boilerplate configuration/registration code.
+package main
+
+import (
+	"flag"
+	"fmt"
+	"io/ioutil"
+	"log"
+	"os"
+	"strings"
+)
+
+var (
+	output = flag.String("o", "", "output file. Must be set")
+)
+
+const tmpl = `// DO NOT EDIT: This file was auto-generated by "go generate"
+// To regenerate run:
+//   go install github.com/coreos/dex/cmd/genconfig
+//   go generate <<fully qualified package name>>
+package __PKG__
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+)
+
+type New__OBJ__ConfigFunc func() __OBJ__Config
+
+var (
+	__obj__Types map[string]New__OBJ__ConfigFunc
+)
+
+func Register__OBJ__ConfigType(__obj__Type string, fn New__OBJ__ConfigFunc) {
+	if __obj__Types == nil {
+		__obj__Types = make(map[string]New__OBJ__ConfigFunc)
+	}
+
+	if _, ok := __obj__Types[__obj__Type]; ok {
+		panic(fmt.Sprintf("__obj__ config type %q already registered", __obj__Type))
+	}
+
+	__obj__Types[__obj__Type] = fn
+}
+
+func New__OBJ__ConfigFromType(__obj__Type string) (__OBJ__Config, error) {
+	fn, ok := __obj__Types[__obj__Type]
+	if !ok {
+		return nil, fmt.Errorf("unrecognized __obj__ config type %q", __obj__Type)
+	}
+
+	return fn(), nil
+}
+
+func new__OBJ__ConfigFromMap(m map[string]interface{}) (__OBJ__Config, error) {
+	ityp, ok := m["type"]
+	if !ok {
+		return nil, errors.New("__obj__ config type not set")
+	}
+	typ, ok := ityp.(string)
+	if !ok {
+		return nil, errors.New("__obj__ config type not string")
+	}
+	cfg, err := New__OBJ__ConfigFromType(typ)
+	if err != nil {
+		return nil, err
+	}
+	b, err := json.Marshal(m)
+	if err != nil {
+		return nil, err
+	}
+	if err = json.Unmarshal(b, cfg); err != nil {
+		return nil, err
+	}
+	return cfg, nil
+}
+`
+
+// Usage is a replacement usage function for the flags package.
+func Usage() {
+	fmt.Fprintf(os.Stderr, "Usage of %s:\n", os.Args[0])
+	fmt.Fprintf(os.Stderr, "\tgenconfig  -o OutputFile PackageName ObjToConfigure \n")
+	fmt.Fprintf(os.Stderr, "Flags:\n")
+	flag.PrintDefaults()
+}
+
+func main() {
+	flag.Parse()
+	flag.Usage = Usage
+	args := flag.Args()
+	if *output == "" || len(args) != 2 {
+		flag.Usage()
+		os.Exit(2)
+	}
+
+	pkg := args[0]
+	objType := args[1]
+	objTypeLower := strings.ToLower(objType[0:1]) + objType[1:]
+
+	src := strings.Replace(tmpl, "__OBJ__", objType, -1)
+	src = strings.Replace(src, "__obj__", objTypeLower, -1)
+	src = strings.Replace(src, "__PKG__", pkg, -1)
+
+	err := ioutil.WriteFile(*output, []byte(src), 0644)
+	if err != nil {
+		log.Fatalf("writing output: %s", err)
+	}
+}
diff --git a/connector/config.go b/connector/config.go
new file mode 100644
index 00000000..9fd7f284
--- /dev/null
+++ b/connector/config.go
@@ -0,0 +1,61 @@
+// DO NOT EDIT: This file was auto-generated by "go generate"
+// To regenerate run:
+//   go install github.com/coreos/dex/cmd/genconfig
+//   go generate <<fully qualified package name>>
+package connector
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+)
+
+type NewConnectorConfigFunc func() ConnectorConfig
+
+var (
+	connectorTypes map[string]NewConnectorConfigFunc
+)
+
+func RegisterConnectorConfigType(connectorType string, fn NewConnectorConfigFunc) {
+	if connectorTypes == nil {
+		connectorTypes = make(map[string]NewConnectorConfigFunc)
+	}
+
+	if _, ok := connectorTypes[connectorType]; ok {
+		panic(fmt.Sprintf("connector config type %q already registered", connectorType))
+	}
+
+	connectorTypes[connectorType] = fn
+}
+
+func NewConnectorConfigFromType(connectorType string) (ConnectorConfig, error) {
+	fn, ok := connectorTypes[connectorType]
+	if !ok {
+		return nil, fmt.Errorf("unrecognized connector config type %q", connectorType)
+	}
+
+	return fn(), nil
+}
+
+func newConnectorConfigFromMap(m map[string]interface{}) (ConnectorConfig, error) {
+	ityp, ok := m["type"]
+	if !ok {
+		return nil, errors.New("connector config type not set")
+	}
+	typ, ok := ityp.(string)
+	if !ok {
+		return nil, errors.New("connector config type not string")
+	}
+	cfg, err := NewConnectorConfigFromType(typ)
+	if err != nil {
+		return nil, err
+	}
+	b, err := json.Marshal(m)
+	if err != nil {
+		return nil, err
+	}
+	if err = json.Unmarshal(b, cfg); err != nil {
+		return nil, err
+	}
+	return cfg, nil
+}
diff --git a/connector/config_repo.go b/connector/config_repo.go
new file mode 100644
index 00000000..212a4cd7
--- /dev/null
+++ b/connector/config_repo.go
@@ -0,0 +1,46 @@
+package connector
+
+import (
+	"encoding/json"
+	"io"
+	"os"
+)
+
+func newConnectorConfigsFromReader(r io.Reader) ([]ConnectorConfig, error) {
+	var ms []map[string]interface{}
+	if err := json.NewDecoder(r).Decode(&ms); err != nil {
+		return nil, err
+	}
+	cfgs := make([]ConnectorConfig, len(ms))
+	for i, m := range ms {
+		cfg, err := newConnectorConfigFromMap(m)
+		if err != nil {
+			return nil, err
+		}
+		cfgs[i] = cfg
+	}
+	return cfgs, nil
+}
+
+func NewConnectorConfigRepoFromFile(loc string) (ConnectorConfigRepo, error) {
+	cf, err := os.Open(loc)
+	if err != nil {
+		return nil, err
+	}
+	defer cf.Close()
+
+	cfgs, err := newConnectorConfigsFromReader(cf)
+	if err != nil {
+		return nil, err
+	}
+
+	return &memConnectorConfigRepo{configs: cfgs}, nil
+}
+
+type memConnectorConfigRepo struct {
+	configs []ConnectorConfig
+}
+
+func (r *memConnectorConfigRepo) All() ([]ConnectorConfig, error) {
+	return r.configs, nil
+}
diff --git a/connector/config_repo_test.go b/connector/config_repo_test.go
new file mode 100644
index 00000000..38ad46f9
--- /dev/null
+++ b/connector/config_repo_test.go
@@ -0,0 +1,137 @@
+package connector
+
+import (
+	"reflect"
+	"strings"
+	"testing"
+
+	"github.com/kylelemons/godebug/pretty"
+
+	"github.com/coreos/dex/user"
+)
+
+func TestNewConnectorConfigFromType(t *testing.T) {
+	tests := []struct {
+		typ  string
+		want interface{}
+	}{
+		{
+			typ:  LocalConnectorType,
+			want: &LocalConnectorConfig{},
+		},
+		{
+			typ:  OIDCConnectorType,
+			want: &OIDCConnectorConfig{},
+		},
+	}
+
+	for i, tt := range tests {
+		got, err := NewConnectorConfigFromType(tt.typ)
+		if err != nil {
+			t.Errorf("case %d: expected nil err: %v", i, err)
+			continue
+		}
+		if !reflect.DeepEqual(tt.want, got) {
+			t.Errorf("case %d: want=%v got=%v", i, tt.want, got)
+		}
+	}
+}
+
+func TestNewConnectorConfigFromTypeUnrecognized(t *testing.T) {
+	_, err := NewConnectorConfigFromType("foo")
+	if err == nil {
+		t.Fatalf("Expected non-nil error")
+	}
+}
+
+func TestNewConnectorConfigFromMap(t *testing.T) {
+	user.PasswordHasher = func(plaintext string) ([]byte, error) {
+		return []byte(strings.ToUpper(plaintext)), nil
+	}
+	defer func() {
+		user.PasswordHasher = user.DefaultPasswordHasher
+	}()
+
+	tests := []struct {
+		m    map[string]interface{}
+		want ConnectorConfig
+	}{
+		{
+			m: map[string]interface{}{
+				"type": "local",
+				"id":   "foo",
+				"passwordInfos": []map[string]string{
+					{"userId": "abc", "passwordHash": "PING"},
+					{"userId": "271", "passwordPlaintext": "pong"},
+				},
+			},
+			want: &LocalConnectorConfig{
+				ID: "foo",
+				PasswordInfos: []user.PasswordInfo{
+					user.PasswordInfo{
+						UserID:   "abc",
+						Password: user.Password("PING"),
+					},
+					user.PasswordInfo{
+						UserID:   "271",
+						Password: user.Password("PONG"),
+					},
+				},
+			},
+		},
+		{
+			m: map[string]interface{}{
+				"type":         "oidc",
+				"id":           "bar",
+				"issuerURL":    "http://example.com",
+				"clientID":     "client123",
+				"clientSecret": "whaaaaa",
+			},
+			want: &OIDCConnectorConfig{
+				ID:           "bar",
+				IssuerURL:    "http://example.com",
+				ClientID:     "client123",
+				ClientSecret: "whaaaaa",
+			},
+		},
+	}
+
+	for i, tt := range tests {
+		got, err := newConnectorConfigFromMap(tt.m)
+		if err != nil {
+			t.Errorf("case %d: want nil error: %v", i, err)
+			continue
+		}
+
+		if diff := pretty.Compare(tt.want, got); diff != "" {
+			t.Errorf("case %d: Compare(want, got): %v", i, diff)
+		}
+	}
+}
+
+func TestNewConnectorConfigFromMapFail(t *testing.T) {
+	tests := []map[string]interface{}{
+		// invalid local connector
+		map[string]interface{}{
+			"type":          "local",
+			"passwordInfos": "invalid",
+		},
+
+		// no type
+		map[string]interface{}{
+			"id": "bar",
+		},
+
+		// type not string
+		map[string]interface{}{
+			"id": 123,
+		},
+	}
+
+	for i, tt := range tests {
+		_, err := newConnectorConfigFromMap(tt)
+		if err == nil {
+			t.Errorf("case %d: want non-nil error", i)
+		}
+	}
+}
diff --git a/connector/connector_local.go b/connector/connector_local.go
new file mode 100644
index 00000000..e25dfa54
--- /dev/null
+++ b/connector/connector_local.go
@@ -0,0 +1,208 @@
+package connector
+
+import (
+	"fmt"
+	"html/template"
+	"net/http"
+	"net/url"
+	"path"
+
+	phttp "github.com/coreos/dex/pkg/http"
+	"github.com/coreos/dex/pkg/log"
+	"github.com/coreos/dex/user"
+	"github.com/coreos/go-oidc/oauth2"
+	"github.com/coreos/go-oidc/oidc"
+)
+
+const (
+	LocalConnectorType    = "local"
+	LoginPageTemplateName = "local-login.html"
+)
+
+func init() {
+	RegisterConnectorConfigType(LocalConnectorType, func() ConnectorConfig { return &LocalConnectorConfig{} })
+}
+
+type LocalConnectorConfig struct {
+	ID            string              `json:"id"`
+	PasswordInfos []user.PasswordInfo `json:"passwordInfos"`
+}
+
+func (cfg *LocalConnectorConfig) ConnectorID() string {
+	return cfg.ID
+}
+
+func (cfg *LocalConnectorConfig) ConnectorType() string {
+	return LocalConnectorType
+}
+
+func (cfg *LocalConnectorConfig) Connector(ns url.URL, lf oidc.LoginFunc, tpls *template.Template) (Connector, error) {
+	tpl := tpls.Lookup(LoginPageTemplateName)
+	if tpl == nil {
+		return nil, fmt.Errorf("unable to find necessary HTML template")
+	}
+
+	idpc := &LocalConnector{
+		id:        cfg.ID,
+		namespace: ns,
+		loginFunc: lf,
+		loginTpl:  tpl,
+	}
+
+	return idpc, nil
+}
+
+type LocalConnector struct {
+	id        string
+	idp       *LocalIdentityProvider
+	namespace url.URL
+	loginFunc oidc.LoginFunc
+	loginTpl  *template.Template
+}
+
+type Page struct {
+	PostURL    string
+	Name       string
+	Error      bool
+	Message    string
+	SessionKey string
+}
+
+func (c *LocalConnector) ID() string {
+	return c.id
+}
+
+func (c *LocalConnector) Healthy() error {
+	return nil
+}
+
+func (c *LocalConnector) SetLocalIdentityProvider(idp *LocalIdentityProvider) {
+	c.idp = idp
+}
+
+func (c *LocalConnector) LoginURL(sessionKey, prompt string) (string, error) {
+	q := url.Values{}
+	q.Set("session_key", sessionKey)
+	q.Set("prompt", prompt)
+	enc := q.Encode()
+
+	return path.Join(c.namespace.Path, "login") + "?" + enc, nil
+}
+
+func (c *LocalConnector) Register(mux *http.ServeMux, errorURL url.URL) {
+	route := c.namespace.Path + "/login"
+	mux.Handle(route, handleLoginFunc(c.loginFunc, c.loginTpl, c.idp, route, errorURL))
+}
+
+func (c *LocalConnector) Sync() chan struct{} {
+	return make(chan struct{})
+}
+
+func (c *LocalConnector) TrustedEmailProvider() bool {
+	return false
+}
+
+func redirectPostError(w http.ResponseWriter, errorURL url.URL, q url.Values) {
+	redirectURL := phttp.MergeQuery(errorURL, q)
+	w.Header().Set("Location", redirectURL.String())
+	w.WriteHeader(http.StatusSeeOther)
+}
+
+func handleLoginFunc(lf oidc.LoginFunc, tpl *template.Template, idp *LocalIdentityProvider, localErrorPath string, errorURL url.URL) http.HandlerFunc {
+	handleGET := func(w http.ResponseWriter, r *http.Request, errMsg string) {
+		q := r.URL.Query()
+		sessionKey := q.Get("session_key")
+
+		p := &Page{PostURL: r.URL.String(), Name: "Local", SessionKey: sessionKey}
+		if errMsg != "" {
+			p.Error = true
+			p.Message = errMsg
+		}
+
+		if err := tpl.Execute(w, p); err != nil {
+			phttp.WriteError(w, http.StatusInternalServerError, err.Error())
+		}
+	}
+
+	handlePOST := func(w http.ResponseWriter, r *http.Request) {
+		if err := r.ParseForm(); err != nil {
+			msg := fmt.Sprintf("unable to parse form from body: %v", err)
+			phttp.WriteError(w, http.StatusBadRequest, msg)
+			return
+		}
+
+		userid := r.PostForm.Get("userid")
+		if userid == "" {
+			handleGET(w, r, "missing email address")
+			return
+		}
+
+		password := r.PostForm.Get("password")
+		if password == "" {
+			handleGET(w, r, "missing password")
+			return
+		}
+
+		ident, err := idp.Identity(userid, password)
+		log.Errorf("IDENTITY: err: %v", err)
+
+		if ident == nil || err != nil {
+			handleGET(w, r, "invalid login")
+			return
+		}
+
+		q := r.URL.Query()
+		sessionKey := r.FormValue("session_key")
+		if sessionKey == "" {
+			q.Set("error", oauth2.ErrorInvalidRequest)
+			q.Set("error_description", "missing session_key")
+			redirectPostError(w, errorURL, q)
+			return
+		}
+
+		redirectURL, err := lf(*ident, sessionKey)
+		if err != nil {
+			log.Errorf("Unable to log in %#v: %v", *ident, err)
+			q.Set("error", oauth2.ErrorAccessDenied)
+			q.Set("error_description", "login failed")
+			redirectPostError(w, errorURL, q)
+			return
+		}
+
+		w.Header().Set("Location", redirectURL)
+		w.WriteHeader(http.StatusTemporaryRedirect)
+	}
+
+	return func(w http.ResponseWriter, r *http.Request) {
+		switch r.Method {
+		case "POST":
+			handlePOST(w, r)
+		case "GET":
+			handleGET(w, r, "")
+		default:
+			w.Header().Set("Allow", "GET, POST")
+			phttp.WriteError(w, http.StatusMethodNotAllowed, "GET and POST only acceptable methods")
+		}
+	}
+}
+
+type LocalIdentityProvider struct {
+	PasswordInfoRepo user.PasswordInfoRepo
+	UserRepo         user.UserRepo
+}
+
+func (m *LocalIdentityProvider) Identity(email, password string) (*oidc.Identity, error) {
+	user, err := m.UserRepo.GetByEmail(nil, email)
+	if err != nil {
+		return nil, err
+	}
+
+	id := user.ID
+
+	pi, err := m.PasswordInfoRepo.Get(nil, id)
+	if err != nil {
+		return nil, err
+	}
+
+	return pi.Authenticate(password)
+}
diff --git a/connector/connector_oidc.go b/connector/connector_oidc.go
new file mode 100644
index 00000000..a5c54345
--- /dev/null
+++ b/connector/connector_oidc.go
@@ -0,0 +1,177 @@
+package connector
+
+import (
+	"html/template"
+	"net/http"
+	"net/url"
+	"path"
+
+	phttp "github.com/coreos/dex/pkg/http"
+	"github.com/coreos/dex/pkg/log"
+	"github.com/coreos/go-oidc/oauth2"
+	"github.com/coreos/go-oidc/oidc"
+)
+
+const (
+	OIDCConnectorType = "oidc"
+	httpPathCallback  = "/callback"
+)
+
+func init() {
+	RegisterConnectorConfigType(OIDCConnectorType, func() ConnectorConfig { return &OIDCConnectorConfig{} })
+}
+
+type OIDCConnectorConfig struct {
+	ID                   string `json:"id"`
+	IssuerURL            string `json:"issuerURL"`
+	ClientID             string `json:"clientID"`
+	ClientSecret         string `json:"clientSecret"`
+	TrustedEmailProvider bool   `json:"trustedEmailProvider"`
+}
+
+func (cfg *OIDCConnectorConfig) ConnectorID() string {
+	return cfg.ID
+}
+
+func (cfg *OIDCConnectorConfig) ConnectorType() string {
+	return OIDCConnectorType
+}
+
+type OIDCConnector struct {
+	id                   string
+	issuerURL            string
+	cbURL                url.URL
+	loginFunc            oidc.LoginFunc
+	client               *oidc.Client
+	trustedEmailProvider bool
+}
+
+func (cfg *OIDCConnectorConfig) Connector(ns url.URL, lf oidc.LoginFunc, tpls *template.Template) (Connector, error) {
+	ns.Path = path.Join(ns.Path, httpPathCallback)
+
+	ccfg := oidc.ClientConfig{
+		RedirectURL: ns.String(),
+		Credentials: oidc.ClientCredentials{
+			ID:     cfg.ClientID,
+			Secret: cfg.ClientSecret,
+		},
+	}
+
+	cl, err := oidc.NewClient(ccfg)
+	if err != nil {
+		return nil, err
+	}
+
+	idpc := &OIDCConnector{
+		id:                   cfg.ID,
+		issuerURL:            cfg.IssuerURL,
+		cbURL:                ns,
+		loginFunc:            lf,
+		client:               cl,
+		trustedEmailProvider: cfg.TrustedEmailProvider,
+	}
+	return idpc, nil
+}
+
+func (c *OIDCConnector) ID() string {
+	return c.id
+}
+
+func (c *OIDCConnector) Healthy() error {
+	return c.client.Healthy()
+}
+
+func (c *OIDCConnector) LoginURL(sessionKey, prompt string) (string, error) {
+	oac, err := c.client.OAuthClient()
+	if err != nil {
+		return "", err
+	}
+
+	return oac.AuthCodeURL(sessionKey, "", prompt), nil
+}
+
+func (c *OIDCConnector) Register(mux *http.ServeMux, errorURL url.URL) {
+	mux.Handle(c.cbURL.Path, c.handleCallbackFunc(c.loginFunc, errorURL))
+}
+
+func (c *OIDCConnector) Sync() chan struct{} {
+	return c.client.SyncProviderConfig(c.issuerURL)
+}
+
+func (c *OIDCConnector) TrustedEmailProvider() bool {
+	return c.trustedEmailProvider
+}
+
+func redirectError(w http.ResponseWriter, errorURL url.URL, q url.Values) {
+	redirectURL := phttp.MergeQuery(errorURL, q)
+	w.Header().Set("Location", redirectURL.String())
+	w.WriteHeader(http.StatusSeeOther)
+}
+
+func (c *OIDCConnector) handleCallbackFunc(lf oidc.LoginFunc, errorURL url.URL) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		q := r.URL.Query()
+
+		e := q.Get("error")
+		if e != "" {
+			redirectError(w, errorURL, q)
+			return
+		}
+
+		code := q.Get("code")
+		if code == "" {
+			q.Set("error", oauth2.ErrorInvalidRequest)
+			q.Set("error_description", "code query param must be set")
+			redirectError(w, errorURL, q)
+			return
+		}
+
+		tok, err := c.client.ExchangeAuthCode(code)
+		if err != nil {
+			log.Errorf("Unable to verify auth code with issuer: %v", err)
+			q.Set("error", oauth2.ErrorUnsupportedResponseType)
+			q.Set("error_description", "unable to verify auth code with issuer")
+			redirectError(w, errorURL, q)
+			return
+		}
+
+		claims, err := tok.Claims()
+		if err != nil {
+			log.Errorf("Unable to construct claims: %v", err)
+			q.Set("error", oauth2.ErrorUnsupportedResponseType)
+			q.Set("error_description", "unable to construct claims")
+			redirectError(w, errorURL, q)
+			return
+		}
+
+		ident, err := oidc.IdentityFromClaims(claims)
+		if err != nil {
+			log.Errorf("Failed parsing claims from remote provider: %v", err)
+			q.Set("error", oauth2.ErrorUnsupportedResponseType)
+			q.Set("error_description", "unable to convert claims to identity")
+			redirectError(w, errorURL, q)
+			return
+		}
+
+		sessionKey := q.Get("state")
+		if sessionKey == "" {
+			q.Set("error", oauth2.ErrorInvalidRequest)
+			q.Set("error_description", "missing state query param")
+			redirectError(w, errorURL, q)
+			return
+		}
+
+		redirectURL, err := lf(*ident, sessionKey)
+		if err != nil {
+			log.Errorf("Unable to log in %#v: %v", *ident, err)
+			q.Set("error", oauth2.ErrorAccessDenied)
+			q.Set("error_description", "login failed")
+			redirectError(w, errorURL, q)
+			return
+		}
+
+		w.Header().Set("Location", redirectURL)
+		w.WriteHeader(http.StatusTemporaryRedirect)
+		return
+	}
+}
diff --git a/connector/connector_oidc_test.go b/connector/connector_oidc_test.go
new file mode 100644
index 00000000..df9077ce
--- /dev/null
+++ b/connector/connector_oidc_test.go
@@ -0,0 +1,144 @@
+package connector
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"reflect"
+	"testing"
+
+	"github.com/coreos/go-oidc/oidc"
+)
+
+func TestLoginURL(t *testing.T) {
+	lf := func(ident oidc.Identity, sessionKey string) (redirectURL string, err error) { return }
+
+	tests := []struct {
+		cid    string
+		redir  string
+		state  string
+		scope  []string
+		prompt string
+		v      url.Values
+	}{
+		// Standard example
+		{
+			cid:    "fake-client-id",
+			redir:  "http://example.com/oauth-redirect",
+			state:  "fake-session-id",
+			scope:  []string{"openid", "email", "profile"},
+			prompt: "",
+			v: url.Values{
+				"response_type": {"code"},
+				"state":         {"fake-session-id"},
+				"redirect_uri":  {"http://example.com/oauth-redirect"},
+				"scope":         {"openid email profile"},
+				"client_id":     {"fake-client-id"},
+			},
+		},
+		// No scope
+		{
+			cid:    "fake-client-id",
+			redir:  "http://example.com/oauth-redirect",
+			state:  "fake-session-id",
+			scope:  []string{},
+			prompt: "",
+			v: url.Values{
+				"response_type": {"code"},
+				"state":         {"fake-session-id"},
+				"redirect_uri":  {"http://example.com/oauth-redirect"},
+				"scope":         {""},
+				"client_id":     {"fake-client-id"},
+			},
+		},
+		// No state
+		{
+			cid:    "fake-client-id",
+			redir:  "http://example.com/oauth-redirect",
+			state:  "",
+			scope:  []string{},
+			prompt: "",
+			v: url.Values{
+				"response_type": {"code"},
+				"state":         {""},
+				"redirect_uri":  {"http://example.com/oauth-redirect"},
+				"scope":         {""},
+				"client_id":     {"fake-client-id"},
+			},
+		},
+		// Force prompt
+		{
+			cid:    "fake-client-id",
+			redir:  "http://example.com/oauth-redirect",
+			state:  "fake-session-id",
+			scope:  []string{"openid", "email", "profile"},
+			prompt: "select_account",
+			v: url.Values{
+				"response_type": {"code"},
+				"prompt":        {"select_account"},
+				"state":         {"fake-session-id"},
+				"redirect_uri":  {"http://example.com/oauth-redirect"},
+				"scope":         {"openid email profile"},
+				"client_id":     {"fake-client-id"},
+			},
+		},
+	}
+
+	for i, tt := range tests {
+		cfg := oidc.ClientConfig{
+			Credentials: oidc.ClientCredentials{ID: tt.cid, Secret: "fake-client-secret"},
+			RedirectURL: tt.redir,
+			ProviderConfig: oidc.ProviderConfig{
+				AuthEndpoint:  "http://example.com/authorize",
+				TokenEndpoint: "http://example.com/token",
+			},
+			Scope: tt.scope,
+		}
+		cl, err := oidc.NewClient(cfg)
+		if err != nil {
+			t.Errorf("test: %d. unexpected error: %v", i, err)
+		}
+		cn := &OIDCConnector{
+			loginFunc: lf,
+			client:    cl,
+		}
+
+		lu, err := cn.LoginURL(tt.state, tt.prompt)
+		if err != nil {
+			t.Errorf("test: %d. want: no url error, got: error, error: %v", i, err)
+		}
+
+		u, err := url.Parse(lu)
+		if err != nil {
+			t.Errorf("test: %d. want: parsable url, got: unparsable url, error: %v", i, err)
+		}
+
+		got := u.Query()
+		if !reflect.DeepEqual(tt.v, got) {
+			t.Errorf("test: %d.\nwant: %v\ngot:  %v", i, tt.v, got)
+		}
+	}
+}
+
+func TestRedirectError(t *testing.T) {
+	eu := url.URL{
+		Scheme:   "http",
+		Host:     "example.com:9090",
+		Path:     "/login",
+		RawQuery: "foo=bar",
+	}
+	q := url.Values{"ping": []string{"pong"}}
+	rr := httptest.NewRecorder()
+	redirectError(rr, eu, q)
+
+	wantCode := http.StatusSeeOther
+	if wantCode != rr.Code {
+		t.Errorf("Incorrect code: want=%d got=%d", wantCode, rr.Code)
+	}
+
+	wantLoc := "http://example.com:9090/login?foo=bar&ping=pong"
+	gotLoc := rr.HeaderMap.Get("Location")
+	if wantLoc != gotLoc {
+		t.Errorf("Incorrect Location header: want=%s got=%s", wantLoc, gotLoc)
+	}
+}
diff --git a/connector/interface.go b/connector/interface.go
new file mode 100644
index 00000000..44cbb5da
--- /dev/null
+++ b/connector/interface.go
@@ -0,0 +1,37 @@
+package connector
+
+import (
+	"html/template"
+	"net/http"
+	"net/url"
+
+	"github.com/coreos/go-oidc/oidc"
+	"github.com/coreos/pkg/health"
+)
+
+type Connector interface {
+	ID() string
+	LoginURL(sessionKey, prompt string) (string, error)
+	Register(mux *http.ServeMux, errorURL url.URL)
+
+	// Sync triggers any long-running tasks needed to maintain the
+	// Connector's operation. For example, this would encompass
+	// repeatedly caching any remote resources for local use.
+	Sync() chan struct{}
+
+	// TrustedEmailProvider indicates whether or not we can trust that email claims coming from this provider.
+	TrustedEmailProvider() bool
+
+	health.Checkable
+}
+
+//go:generate genconfig -o config.go connector Connector
+type ConnectorConfig interface {
+	ConnectorID() string
+	ConnectorType() string
+	Connector(ns url.URL, loginFunc oidc.LoginFunc, tpls *template.Template) (Connector, error)
+}
+
+type ConnectorConfigRepo interface {
+	All() ([]ConnectorConfig, error)
+}
diff --git a/contrib/k8s/README.md b/contrib/k8s/README.md
new file mode 100644
index 00000000..c4908cca
--- /dev/null
+++ b/contrib/k8s/README.md
@@ -0,0 +1,41 @@
+# dex
+
+## Getting Started
+
+**Warning**: Hacks Ahead.
+
+You must be running cluster wide DNS for this to work.
+
+Install your dockercfg. There is no nice way to do this:
+
+```
+ssh worker
+cat > /proc/$(pgrep kubelet)/cwd/.dockercfg
+```
+
+Start postgres
+
+```
+kubectl create -f postgres-rc.yaml
+kubectl create -f postgres-service.yaml
+```
+
+Run dex and setup services
+
+```
+for i in dex-overlord-rc.yaml dex-overlord-service.yaml dex-worker-rc.yaml dex-worker-service.yaml; do 
+	kubectl create -f ${i}
+done
+```
+
+curl http://$(kubectl describe service dex-worker | grep '^IP:' | awk '{print $2}'):5556
+
+5. [Register your first client](https://github.com/coreos/dex#registering-clients)
+
+## Debugging
+
+You can use a port forward from the target host to debug the database
+
+IP=$(kubectl describe service dex-postgres | grep '^IP:' | awk '{print $2}')
+ssh -F ssh-config -L 5432:${IP}:5432 w1
+psql -h localhost -w -U postgres
diff --git a/contrib/k8s/authd-overlord-rc.yaml b/contrib/k8s/authd-overlord-rc.yaml
new file mode 100644
index 00000000..f05611ad
--- /dev/null
+++ b/contrib/k8s/authd-overlord-rc.yaml
@@ -0,0 +1,25 @@
+apiVersion: v1beta3
+kind: ReplicationController
+metadata:
+  labels:
+    app: dex
+    role: overlord
+  name: dex-overlord
+spec:
+  replicas: 1
+  selector:
+    app: dex
+    role: overlord
+  template:
+    metadata:
+      labels:
+        app: dex
+        role: overlord
+    spec:
+      containers:
+          - image: quay.io/coreos/dex
+            name: dex-overlord
+            command: ["/opt/dex/bin/dex-overlord", "-key-secret", "XXXXXXXXXXXXX", "-db-url", "postgres://postgres@auth-postgres.default.tectonic.local:5432/auth?sslmode=disable"]
+            ports:
+            - containerPort: 5557
+              name: overlord-port
diff --git a/contrib/k8s/authd-overlord-service.yaml b/contrib/k8s/authd-overlord-service.yaml
new file mode 100644
index 00000000..5df40a9f
--- /dev/null
+++ b/contrib/k8s/authd-overlord-service.yaml
@@ -0,0 +1,13 @@
+apiVersion: v1beta3
+kind: Service
+metadata:
+  labels:
+    app: dex
+    role: overlord
+  name: dex-overlord
+spec:
+  ports:
+    - port: 5557
+  selector:
+    app: dex
+    role: overlord
diff --git a/contrib/k8s/authd-worker-rc.yaml b/contrib/k8s/authd-worker-rc.yaml
new file mode 100644
index 00000000..1c0397b7
--- /dev/null
+++ b/contrib/k8s/authd-worker-rc.yaml
@@ -0,0 +1,32 @@
+apiVersion: v1beta3
+kind: ReplicationController
+metadata:
+  labels:
+    app: dex
+    role: worker
+  name: dex-worker
+spec:
+  replicas: 1
+  selector:
+    app: dex
+    role: worker
+  template:
+    metadata:
+      labels:
+        app: dex
+        role: worker
+    spec:
+      containers:
+          - image: quay.io/coreos/dex
+            name: dex-worker
+            command: ["/opt/dex/bin/dex-worker", "-issuer", "http://dex-worker.default.tectonic.local:5556", "-key-secret", "XXXXXXXXXXX", "-db-url", "postgres://postgres@auth-postgres.default.tectonic.local:5432/auth?sslmode=disable"]
+            ports:
+            - containerPort: 5556
+              name: worker-port
+            livenessProbe:
+              httpGet:
+                path: /health
+                port: 5556
+              initialDelaySeconds: 15
+              timeoutSeconds: 1
+
diff --git a/contrib/k8s/authd-worker-service.yaml b/contrib/k8s/authd-worker-service.yaml
new file mode 100644
index 00000000..020fd2a9
--- /dev/null
+++ b/contrib/k8s/authd-worker-service.yaml
@@ -0,0 +1,13 @@
+apiVersion: v1beta3
+kind: Service
+metadata:
+  labels:
+    app: dex
+    role: worker
+  name: dex-worker
+spec:
+  ports:
+    - port: 5556
+  selector:
+    app: dex
+    role: worker
diff --git a/contrib/k8s/postgres-rc.yaml b/contrib/k8s/postgres-rc.yaml
new file mode 100644
index 00000000..cdb1c8c2
--- /dev/null
+++ b/contrib/k8s/postgres-rc.yaml
@@ -0,0 +1,25 @@
+apiVersion: v1beta3
+kind: ReplicationController
+metadata:
+  labels:
+    app: postgres
+  name: auth-postgres
+spec:
+  replicas: 1
+  selector:
+    app: postgres
+  template:
+    metadata:
+      labels:
+        app: postgres
+    spec:
+      containers:
+          - image: quay.io/sym3tri/postgres-dev:9.4
+            name: auth-postgres
+            env:
+            - name: DATABASES
+              key: DATABASES
+              value: auth
+            ports:
+            - containerPort: 5432
+              name: postgres-port
diff --git a/contrib/k8s/postgres-service.yaml b/contrib/k8s/postgres-service.yaml
new file mode 100644
index 00000000..f3fb7b5e
--- /dev/null
+++ b/contrib/k8s/postgres-service.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1beta3
+kind: Service
+metadata:
+  labels:
+    app: postgres
+  name: auth-postgres
+spec:
+  ports:
+    - port: 5432
+  selector:
+    app: postgres
diff --git a/contrib/standup-db.sh b/contrib/standup-db.sh
new file mode 100644
index 00000000..f5bd2175
--- /dev/null
+++ b/contrib/standup-db.sh
@@ -0,0 +1,69 @@
+# This file will do everything necessary to bring up a working Dex
+# environment, connected to a Postgres DB and with a local and Google OIDC
+# connector; When the script is completed, you will have three processes running
+# in the background of your (bash) shell: an Dex Overlord, an Dex Worker,
+# and the example app.
+#
+# It assumes you are in the root directory of the Dex project and that you
+# have psql installed and running.
+#
+# USAGE:
+#
+# DEX_GOOGLE_CLIENT_ID=<<your_client_id>> DEX_GOOGLE_CLIENT_SECRET=<<your_client_secret>> && source  contrib/standup-db.sh
+#
+# NOTE: As you can see from above, this file is meant to be *sourced* not executed directly.
+
+# Build components.
+./build
+
+# Set DB var
+DEX_DB=dex_dev
+DEX_DB_URL=postgres://localhost/$DEX_DB?sslmode=disable
+export DEX_WORKER_DB_URL=$DEX_DB_URL
+
+# Delete/create DB
+dropdb $DEX_DB; createdb $DEX_DB
+
+# Create a client 
+eval "$(./bin/dexctl -db-url=$DEX_DB_URL new-client http://127.0.0.1:5555/callback)"
+
+# Set up connectors
+DEX_CONNECTORS_FILE=$(mktemp  /tmp/dex-conn.XXXXX)
+DEX_GOOGLE_ISSUER_URL=https://accounts.google.com 
+cat << EOF > $DEX_CONNECTORS_FILE
+[
+	{
+		"type": "local",
+		"id": "local"
+	},
+	{
+		"type": "oidc",
+		"id": "google",
+		"issuerURL": "$DEX_GOOGLE_ISSUER_URL",
+		"clientID": "$DEX_GOOGLE_CLIENT_ID",
+		"clientSecret": "$DEX_GOOGLE_CLIENT_SECRET",
+		"trustedEmailProvider": true
+	}
+]
+EOF
+
+./bin/dexctl -db-url=$DEX_DB_URL set-connector-configs $DEX_CONNECTORS_FILE
+
+# Start the overlord
+export DEX_OVERLORD_DB_URL=$DEX_DB_URL
+export DEX_OVERLORD_KEY_SECRET=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+export DEX_OVERLORD_KEY_PERIOD=1h
+./bin/dex-overlord &
+
+# Start the worker
+export DEX_WORKER_DB_URL=$DEX_DB_URL
+export DEX_WORKER_KEY_SECRET=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+export DEX_WORKER_LOG_DEBUG=1
+./bin/dex-worker &
+
+# Start the app
+./bin/example-app --client-id=$DEX_APP_CLIENT_ID --client-secret=$DEX_APP_CLIENT_SECRET --discovery=http://127.0.0.1:5556 &
+
+# Create Admin User - the password is a hash of the word "password"
+curl -X POST --data '{"email":"admin@example.com","password":"$2a$04$J54iz31fhYfXIRVglUMmpufY6TKf/vvwc9pv8zWog7X/LFrFfkNQe" }' http://127.0.0.1:5557/api/v1/admin
+
diff --git a/cover b/cover
new file mode 100755
index 00000000..4f77b7f5
--- /dev/null
+++ b/cover
@@ -0,0 +1,27 @@
+#!/bin/bash -e
+#
+# Generate coverage HTML for a package
+# e.g. PKG=./unit ./cover
+#
+
+if [ -z "$PKG" ]; then
+	echo "cover only works with a single package, sorry"
+	exit 255
+fi
+
+COVEROUT="coverage"
+
+if ! [ -d "$COVEROUT" ]; then
+	mkdir "$COVEROUT"
+fi
+
+# strip out slashes and dots
+COVERPKG=${PKG//\//}
+COVERPKG=${COVERPKG//./}
+
+# generate arg for "go test"
+export COVER="-coverprofile ${COVEROUT}/${COVERPKG}.out"
+
+source ./test
+
+go tool cover -html=${COVEROUT}/${COVERPKG}.out
diff --git a/db/client.go b/db/client.go
new file mode 100644
index 00000000..dd04a18d
--- /dev/null
+++ b/db/client.go
@@ -0,0 +1,299 @@
+package db
+
+import (
+	"database/sql"
+	"encoding/base64"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"net/url"
+
+	"github.com/coopernurse/gorp"
+	"github.com/coreos/go-oidc/oidc"
+	"github.com/lib/pq"
+	"golang.org/x/crypto/bcrypt"
+
+	"github.com/coreos/dex/client"
+	pcrypto "github.com/coreos/dex/pkg/crypto"
+	"github.com/coreos/dex/pkg/log"
+)
+
+const (
+	clientIdentityTableName = "client_identity"
+
+	bcryptHashCost = 10
+
+	// Blowfish, the algorithm underlying bcrypt, has a maximum
+	// password length of 72. We explicitly track and check this
+	// since the bcrypt library will silently ignore portions of
+	// a password past the first 72 characters.
+	maxSecretLength = 72
+
+	// postgres error codes
+	pgErrorCodeUniqueViolation = "23505" // unique_violation
+)
+
+func init() {
+	register(table{
+		name:    clientIdentityTableName,
+		model:   clientIdentityModel{},
+		autoinc: false,
+		pkey:    []string{"id"},
+	})
+}
+
+func newClientIdentityModel(id string, secret []byte, meta *oidc.ClientMetadata) (*clientIdentityModel, error) {
+	hashed, err := bcrypt.GenerateFromPassword(secret, bcryptHashCost)
+	if err != nil {
+		return nil, err
+	}
+
+	bmeta, err := json.Marshal(newClientMetadataJSON(meta))
+	if err != nil {
+		return nil, err
+	}
+
+	cim := clientIdentityModel{
+		ID:       id,
+		Secret:   hashed,
+		Metadata: string(bmeta),
+	}
+
+	return &cim, nil
+}
+
+type clientIdentityModel struct {
+	ID       string `db:"id"`
+	Secret   []byte `db:"secret"`
+	Metadata string `db:"metadata"`
+	DexAdmin bool   `db:"dexAdmin"`
+}
+
+func newClientMetadataJSON(cm *oidc.ClientMetadata) *clientMetadataJSON {
+	cmj := clientMetadataJSON{
+		RedirectURLs: make([]string, len(cm.RedirectURLs)),
+	}
+
+	for i, u := range cm.RedirectURLs {
+		cmj.RedirectURLs[i] = (&u).String()
+	}
+
+	return &cmj
+}
+
+type clientMetadataJSON struct {
+	RedirectURLs []string `json:"redirectURLs"`
+}
+
+func (cmj clientMetadataJSON) ClientMetadata() (*oidc.ClientMetadata, error) {
+	cm := oidc.ClientMetadata{
+		RedirectURLs: make([]url.URL, len(cmj.RedirectURLs)),
+	}
+
+	for i, us := range cmj.RedirectURLs {
+		up, err := url.Parse(us)
+		if err != nil {
+			return nil, err
+		}
+		cm.RedirectURLs[i] = *up
+	}
+
+	return &cm, nil
+}
+
+func (m *clientIdentityModel) ClientIdentity() (*oidc.ClientIdentity, error) {
+	ci := oidc.ClientIdentity{
+		Credentials: oidc.ClientCredentials{
+			ID:     m.ID,
+			Secret: string(m.Secret),
+		},
+	}
+
+	var cmj clientMetadataJSON
+	err := json.Unmarshal([]byte(m.Metadata), &cmj)
+	if err != nil {
+		return nil, err
+	}
+
+	cm, err := cmj.ClientMetadata()
+	if err != nil {
+		return nil, err
+	}
+
+	ci.Metadata = *cm
+	return &ci, nil
+}
+
+func NewClientIdentityRepo(dbm *gorp.DbMap) client.ClientIdentityRepo {
+	return &clientIdentityRepo{dbMap: dbm}
+}
+
+func NewClientIdentityRepoFromClients(dbm *gorp.DbMap, clients []oidc.ClientIdentity) (client.ClientIdentityRepo, error) {
+	repo := NewClientIdentityRepo(dbm).(*clientIdentityRepo)
+	for _, c := range clients {
+		dec, err := base64.URLEncoding.DecodeString(c.Credentials.Secret)
+		if err != nil {
+			return nil, err
+		}
+
+		cm, err := newClientIdentityModel(c.Credentials.ID, dec, &c.Metadata)
+		if err != nil {
+			return nil, err
+		}
+		err = repo.dbMap.Insert(cm)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return repo, nil
+}
+
+type clientIdentityRepo struct {
+	dbMap *gorp.DbMap
+}
+
+func (r *clientIdentityRepo) Metadata(clientID string) (*oidc.ClientMetadata, error) {
+	m, err := r.dbMap.Get(clientIdentityModel{}, clientID)
+	if err == sql.ErrNoRows || m == nil {
+		return nil, client.ErrorNotFound
+	}
+	if err != nil {
+		return nil, err
+	}
+
+	cim, ok := m.(*clientIdentityModel)
+	if !ok {
+		return nil, errors.New("unrecognized model")
+	}
+
+	ci, err := cim.ClientIdentity()
+	if err != nil {
+		return nil, err
+	}
+
+	return &ci.Metadata, nil
+}
+
+func (r *clientIdentityRepo) IsDexAdmin(clientID string) (bool, error) {
+	m, err := r.dbMap.Get(clientIdentityModel{}, clientID)
+	if m == nil || err != nil {
+		return false, err
+	}
+
+	cim, ok := m.(*clientIdentityModel)
+	if !ok {
+		return false, errors.New("unrecognized model")
+	}
+
+	return cim.DexAdmin, nil
+}
+
+func (r *clientIdentityRepo) SetDexAdmin(clientID string, isAdmin bool) error {
+	tx, err := r.dbMap.Begin()
+	if err != nil {
+		return err
+	}
+
+	m, err := r.dbMap.Get(clientIdentityModel{}, clientID)
+	if m == nil || err != nil {
+		rollback(tx)
+		return err
+	}
+
+	cim, ok := m.(*clientIdentityModel)
+	if !ok {
+		rollback(tx)
+		return errors.New("unrecognized model")
+	}
+
+	cim.DexAdmin = isAdmin
+	_, err = r.dbMap.Update(cim)
+	if err != nil {
+		rollback(tx)
+		return err
+	}
+
+	err = tx.Commit()
+	if err != nil {
+		rollback(tx)
+		return err
+	}
+
+	return nil
+}
+
+func (r *clientIdentityRepo) Authenticate(creds oidc.ClientCredentials) (bool, error) {
+	m, err := r.dbMap.Get(clientIdentityModel{}, creds.ID)
+	if m == nil || err != nil {
+		return false, err
+	}
+
+	cim, ok := m.(*clientIdentityModel)
+	if !ok {
+		return false, errors.New("unrecognized model")
+	}
+
+	dec, err := base64.URLEncoding.DecodeString(creds.Secret)
+	if err != nil {
+		log.Errorf("error Decoding client creds ")
+		return false, nil
+	}
+
+	if len(dec) > maxSecretLength {
+		return false, nil
+	}
+
+	ok = bcrypt.CompareHashAndPassword(cim.Secret, dec) == nil
+	return ok, nil
+}
+
+func (r *clientIdentityRepo) New(id string, meta oidc.ClientMetadata) (*oidc.ClientCredentials, error) {
+	secret, err := pcrypto.RandBytes(maxSecretLength)
+	if err != nil {
+		return nil, err
+	}
+
+	cim, err := newClientIdentityModel(id, secret, &meta)
+	if err != nil {
+		return nil, err
+	}
+
+	if err := r.dbMap.Insert(cim); err != nil {
+		if perr, ok := err.(*pq.Error); ok && perr.Code == pgErrorCodeUniqueViolation {
+			err = errors.New("client ID already exists")
+		}
+
+		return nil, err
+	}
+
+	cc := oidc.ClientCredentials{
+		ID:     id,
+		Secret: base64.URLEncoding.EncodeToString(secret),
+	}
+
+	return &cc, nil
+}
+
+func (r *clientIdentityRepo) All() ([]oidc.ClientIdentity, error) {
+	qt := pq.QuoteIdentifier(clientIdentityTableName)
+	q := fmt.Sprintf("SELECT * FROM %s", qt)
+	objs, err := r.dbMap.Select(&clientIdentityModel{}, q)
+	if err != nil {
+		return nil, err
+	}
+
+	cs := make([]oidc.ClientIdentity, len(objs))
+	for i, obj := range objs {
+		m, ok := obj.(*clientIdentityModel)
+		if !ok {
+			return nil, errors.New("unable to cast client identity to clientIdentityModel")
+		}
+
+		ci, err := m.ClientIdentity()
+		if err != nil {
+			return nil, err
+		}
+		cs[i] = *ci
+	}
+	return cs, nil
+}
diff --git a/db/conn.go b/db/conn.go
new file mode 100644
index 00000000..c4c2a8e4
--- /dev/null
+++ b/db/conn.go
@@ -0,0 +1,100 @@
+package db
+
+import (
+	"database/sql"
+	"errors"
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/coopernurse/gorp"
+	_ "github.com/lib/pq"
+
+	"github.com/coreos/dex/pkg/log"
+	ptime "github.com/coreos/dex/pkg/time"
+	"github.com/coreos/dex/repo"
+)
+
+type table struct {
+	name    string
+	model   interface{}
+	autoinc bool
+	pkey    []string
+
+	// unique are non-primary key fields which should have uniqueness constraints.
+	unique []string
+}
+
+var (
+	tables []table
+)
+
+func register(t table) {
+	tables = append(tables, t)
+}
+
+type Config struct {
+	// Connection string in the format: <driver>://<username>:<password>@<host>:<port>/<database>
+	DSN string
+	// The maximum number of open connections to the database. The default is 0 (unlimited).
+	// For more details see: http://golang.org/pkg/database/sql/#DB.SetMaxOpenConns
+	MaxOpenConnections int
+	// The maximum number of connections in the idle connection pool. The default is 0 (unlimited).
+	// For more details see: http://golang.org/pkg/database/sql/#DB.SetMaxIdleConns
+	MaxIdleConnections int
+}
+
+func NewConnection(cfg Config) (*gorp.DbMap, error) {
+	if !strings.HasPrefix(cfg.DSN, "postgres://") {
+		return nil, errors.New("unrecognized database driver")
+	}
+
+	db, err := sql.Open("postgres", cfg.DSN)
+	if err != nil {
+		return nil, err
+	}
+
+	db.SetMaxIdleConns(cfg.MaxIdleConnections)
+	db.SetMaxOpenConns(cfg.MaxOpenConnections)
+
+	dbm := gorp.DbMap{
+		Db:      db,
+		Dialect: gorp.PostgresDialect{},
+	}
+
+	for _, t := range tables {
+		tm := dbm.AddTableWithName(t.model, t.name).SetKeys(t.autoinc, t.pkey...)
+		for _, unique := range t.unique {
+			cm := tm.ColMap(unique)
+			if cm == nil {
+				return nil, fmt.Errorf("no such column: %q", unique)
+			}
+			cm.SetUnique(true)
+		}
+	}
+
+	var sleep time.Duration
+	for {
+		if err = dbm.CreateTablesIfNotExists(); err == nil {
+			break
+		}
+		sleep = ptime.ExpBackoff(sleep, time.Minute)
+		log.Errorf("Unable to initialize database, retrying in %v: %v", sleep, err)
+		time.Sleep(sleep)
+	}
+
+	return &dbm, nil
+}
+
+func TransactionFactory(conn *gorp.DbMap) repo.TransactionFactory {
+	return func() (repo.Transaction, error) {
+		return conn.Begin()
+	}
+}
+
+func rollback(tx *gorp.Transaction) {
+	err := tx.Rollback()
+	if err != nil {
+		log.Errorf("unable to rollback: %v", err)
+	}
+}
diff --git a/db/connector_config.go b/db/connector_config.go
new file mode 100644
index 00000000..8686a33e
--- /dev/null
+++ b/db/connector_config.go
@@ -0,0 +1,121 @@
+package db
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+
+	"github.com/coopernurse/gorp"
+	"github.com/lib/pq"
+
+	"github.com/coreos/dex/connector"
+)
+
+const (
+	connectorConfigTableName = "connector_config"
+)
+
+func init() {
+	register(table{
+		name:    connectorConfigTableName,
+		model:   connectorConfigModel{},
+		autoinc: false,
+		pkey:    []string{"id"},
+	})
+}
+
+func newConnectorConfigModel(cfg connector.ConnectorConfig) (*connectorConfigModel, error) {
+	b, err := json.Marshal(cfg)
+	if err != nil {
+		return nil, err
+	}
+
+	m := &connectorConfigModel{
+		ID:     cfg.ConnectorID(),
+		Type:   cfg.ConnectorType(),
+		Config: string(b),
+	}
+
+	return m, nil
+}
+
+type connectorConfigModel struct {
+	ID     string `db:"id"`
+	Type   string `db:"type"`
+	Config string `db:"config"`
+}
+
+func (m *connectorConfigModel) ConnectorConfig() (connector.ConnectorConfig, error) {
+	cfg, err := connector.NewConnectorConfigFromType(m.Type)
+	if err != nil {
+		return nil, err
+	}
+
+	if err = json.Unmarshal([]byte(m.Config), cfg); err != nil {
+		return nil, err
+	}
+
+	return cfg, nil
+}
+
+func NewConnectorConfigRepo(dbm *gorp.DbMap) *ConnectorConfigRepo {
+	return &ConnectorConfigRepo{dbMap: dbm}
+}
+
+type ConnectorConfigRepo struct {
+	dbMap *gorp.DbMap
+}
+
+func (r *ConnectorConfigRepo) All() ([]connector.ConnectorConfig, error) {
+	qt := pq.QuoteIdentifier(connectorConfigTableName)
+	q := fmt.Sprintf("SELECT * FROM %s", qt)
+	objs, err := r.dbMap.Select(&connectorConfigModel{}, q)
+	if err != nil {
+		return nil, err
+	}
+
+	cfgs := make([]connector.ConnectorConfig, len(objs))
+	for i, obj := range objs {
+		m, ok := obj.(*connectorConfigModel)
+		if !ok {
+			return nil, errors.New("unable to cast connector to connectorConfigModel")
+		}
+
+		cfg, err := m.ConnectorConfig()
+		if err != nil {
+			return nil, err
+		}
+		cfgs[i] = cfg
+	}
+
+	return cfgs, nil
+}
+
+func (r *ConnectorConfigRepo) Set(cfgs []connector.ConnectorConfig) error {
+	insert := make([]interface{}, len(cfgs))
+	for i, cfg := range cfgs {
+		m, err := newConnectorConfigModel(cfg)
+		if err != nil {
+			return err
+		}
+
+		insert[i] = m
+	}
+
+	tx, err := r.dbMap.Begin()
+	if err != nil {
+		return err
+	}
+
+	qt := pq.QuoteIdentifier(connectorConfigTableName)
+	q := fmt.Sprintf("DELETE FROM %s", qt)
+	if _, err = r.dbMap.Exec(q); err != nil {
+		return err
+	}
+
+	if err = r.dbMap.Insert(insert...); err != nil {
+		return fmt.Errorf("DB insert failed %#v: %v", insert, err)
+	}
+
+	return tx.Commit()
+}
diff --git a/db/gc.go b/db/gc.go
new file mode 100644
index 00000000..fe5a5479
--- /dev/null
+++ b/db/gc.go
@@ -0,0 +1,107 @@
+package db
+
+import (
+	"time"
+
+	"github.com/coopernurse/gorp"
+	"github.com/jonboulle/clockwork"
+
+	"github.com/coreos/dex/pkg/log"
+	ptime "github.com/coreos/dex/pkg/time"
+)
+
+type purger interface {
+	purge() error
+}
+
+type namedPurger struct {
+	name string
+	purger
+}
+
+func NewGarbageCollector(dbm *gorp.DbMap, ival time.Duration) *GarbageCollector {
+	sRepo := NewSessionRepo(dbm)
+	skRepo := NewSessionKeyRepo(dbm)
+
+	purgers := []namedPurger{
+		namedPurger{
+			name:   "session",
+			purger: sRepo,
+		},
+		namedPurger{
+			name:   "session_key",
+			purger: skRepo,
+		},
+	}
+
+	gc := GarbageCollector{
+		purgers:  purgers,
+		interval: ival,
+		clock:    clockwork.NewRealClock(),
+	}
+
+	return &gc
+}
+
+type GarbageCollector struct {
+	purgers  []namedPurger
+	interval time.Duration
+	clock    clockwork.Clock
+}
+
+func (gc *GarbageCollector) Run() chan struct{} {
+	stop := make(chan struct{})
+
+	go func() {
+		var failing bool
+		next := gc.interval
+		for {
+			select {
+			case <-gc.clock.After(next):
+				if anyPurgeErrors(purgeAll(gc.purgers)) {
+					if !failing {
+						failing = true
+						next = time.Second
+					} else {
+						next = ptime.ExpBackoff(next, time.Minute)
+					}
+					log.Errorf("Failed garbage collection, retrying in %v", next)
+				} else {
+					failing = false
+					next = gc.interval
+					log.Infof("Garbage collection complete, running again in %v", next)
+				}
+			case <-stop:
+				return
+			}
+		}
+	}()
+
+	return stop
+}
+
+type purgeError struct {
+	name string
+	err  error
+}
+
+func anyPurgeErrors(errchan <-chan purgeError) (found bool) {
+	for perr := range errchan {
+		found = true
+		log.Errorf("Failed purging %s: %v", perr.name, perr.err)
+	}
+	return
+}
+
+func purgeAll(purgers []namedPurger) <-chan purgeError {
+	errchan := make(chan purgeError)
+	go func() {
+		for _, p := range purgers {
+			if err := p.purge(); err != nil {
+				errchan <- purgeError{name: p.name, err: err}
+			}
+		}
+		close(errchan)
+	}()
+	return errchan
+}
diff --git a/db/gc_test.go b/db/gc_test.go
new file mode 100644
index 00000000..3ceb3043
--- /dev/null
+++ b/db/gc_test.go
@@ -0,0 +1,125 @@
+package db
+
+import (
+	"errors"
+	"reflect"
+	"testing"
+)
+
+type staticPurger struct {
+	err error
+}
+
+func (p staticPurger) purge() error {
+	return p.err
+}
+
+func TestPurgeAll(t *testing.T) {
+	tests := []struct {
+		pm   []namedPurger
+		want []purgeError
+	}{
+		{
+			pm: []namedPurger{
+				namedPurger{
+					name:   "foo",
+					purger: staticPurger{err: nil},
+				},
+			},
+			want: []purgeError{},
+		},
+		{
+			pm: []namedPurger{
+				namedPurger{
+					name:   "foo",
+					purger: staticPurger{err: errors.New("foo fail")},
+				},
+			},
+			want: []purgeError{
+				purgeError{name: "foo", err: errors.New("foo fail")},
+			},
+		},
+
+		{
+			pm: []namedPurger{
+				namedPurger{
+					name:   "foo",
+					purger: staticPurger{err: nil},
+				},
+				namedPurger{
+					name:   "bar",
+					purger: staticPurger{err: errors.New("bar fail")},
+				},
+				namedPurger{
+					name:   "baz",
+					purger: staticPurger{err: nil},
+				},
+				namedPurger{
+					name:   "fum",
+					purger: staticPurger{err: errors.New("fum fail")},
+				},
+			},
+			want: []purgeError{
+				purgeError{name: "bar", err: errors.New("bar fail")},
+				purgeError{name: "fum", err: errors.New("fum fail")},
+			},
+		},
+	}
+
+	for i, tt := range tests {
+		got := make([]purgeError, 0)
+		for perr := range purgeAll(tt.pm) {
+			got = append(got, perr)
+		}
+		if !reflect.DeepEqual(tt.want, got) {
+			t.Errorf("case %d: want=%v, got=%v", i, tt.want, got)
+		}
+	}
+}
+
+func TestAnyPurgeErrors(t *testing.T) {
+	tests := []struct {
+		chanFunc func() chan purgeError
+		want     bool
+	}{
+		{
+			chanFunc: func() chan purgeError {
+				errchan := make(chan purgeError)
+				close(errchan)
+				return errchan
+			},
+			want: false,
+		},
+
+		{
+			chanFunc: func() chan purgeError {
+				errchan := make(chan purgeError, 1)
+				errchan <- purgeError{}
+				close(errchan)
+				return errchan
+			},
+			want: true,
+		},
+
+		{
+			chanFunc: func() chan purgeError {
+				errchan := make(chan purgeError, 4)
+				errchan <- purgeError{}
+				errchan <- purgeError{}
+				errchan <- purgeError{}
+				errchan <- purgeError{}
+				close(errchan)
+				return errchan
+			},
+			want: true,
+		},
+	}
+
+	for i, tt := range tests {
+		errchan := tt.chanFunc()
+		got := anyPurgeErrors(errchan)
+		if tt.want != got {
+			t.Errorf("case %d: want=%t got=%t", i, tt.want, got)
+		}
+	}
+}
diff --git a/db/health.go b/db/health.go
new file mode 100644
index 00000000..139ad17f
--- /dev/null
+++ b/db/health.go
@@ -0,0 +1,34 @@
+package db
+
+import (
+	"errors"
+	"fmt"
+
+	"github.com/coopernurse/gorp"
+)
+
+func NewHealthChecker(dbm *gorp.DbMap) *healthChecker {
+	return &healthChecker{dbMap: dbm}
+}
+
+type healthChecker struct {
+	dbMap *gorp.DbMap
+}
+
+func (hc *healthChecker) Healthy() (err error) {
+	if err = hc.dbMap.Db.Ping(); err != nil {
+		err = fmt.Errorf("database error: %v", err)
+		return
+	}
+
+	num, err := hc.dbMap.SelectInt("SELECT 1")
+	if err != nil {
+		return
+	}
+
+	if num != 1 {
+		err = errors.New("unable to connect to database")
+	}
+
+	return
+}
diff --git a/db/key.go b/db/key.go
new file mode 100644
index 00000000..a5eec35f
--- /dev/null
+++ b/db/key.go
@@ -0,0 +1,170 @@
+package db
+
+import (
+	"crypto/x509"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"time"
+
+	"github.com/coopernurse/gorp"
+	"github.com/lib/pq"
+
+	pcrypto "github.com/coreos/dex/pkg/crypto"
+	"github.com/coreos/go-oidc/key"
+)
+
+const (
+	keyTableName = "key"
+)
+
+func init() {
+	register(table{
+		name:    keyTableName,
+		model:   privateKeySetBlob{},
+		autoinc: false,
+		pkey:    []string{"value"},
+	})
+}
+
+func newPrivateKeySetModel(pks *key.PrivateKeySet) (*privateKeySetModel, error) {
+	pkeys := pks.Keys()
+	keys := make([]privateKeyModel, len(pkeys))
+	for i, pkey := range pkeys {
+		keys[i] = privateKeyModel{
+			ID:    pkey.ID(),
+			PKCS1: x509.MarshalPKCS1PrivateKey(pkey.PrivateKey),
+		}
+	}
+
+	m := privateKeySetModel{
+		Keys:      keys,
+		ExpiresAt: pks.ExpiresAt(),
+	}
+
+	return &m, nil
+}
+
+type privateKeyModel struct {
+	ID    string `json:"id"`
+	PKCS1 []byte `json:"pkcs1"`
+}
+
+func (m *privateKeyModel) PrivateKey() (*key.PrivateKey, error) {
+	d, err := x509.ParsePKCS1PrivateKey(m.PKCS1)
+	if err != nil {
+		return nil, err
+	}
+
+	pk := key.PrivateKey{
+		KeyID:      m.ID,
+		PrivateKey: d,
+	}
+
+	return &pk, nil
+}
+
+type privateKeySetModel struct {
+	Keys      []privateKeyModel `json:"keys"`
+	ExpiresAt time.Time         `json:"expires_at"`
+}
+
+func (m *privateKeySetModel) PrivateKeySet() (*key.PrivateKeySet, error) {
+	keys := make([]*key.PrivateKey, len(m.Keys))
+	for i, pkm := range m.Keys {
+		pk, err := pkm.PrivateKey()
+		if err != nil {
+			return nil, err
+		}
+		keys[i] = pk
+	}
+	return key.NewPrivateKeySet(keys, m.ExpiresAt), nil
+}
+
+type privateKeySetBlob struct {
+	Value []byte `db:"value"`
+}
+
+func NewPrivateKeySetRepo(dbm *gorp.DbMap, secret string) (*PrivateKeySetRepo, error) {
+	bsecret := []byte(secret)
+	if len(bsecret) != 32 {
+		return nil, errors.New("expected 32-byte secret")
+	}
+
+	r := &PrivateKeySetRepo{
+		dbMap:  dbm,
+		secret: []byte(secret),
+	}
+
+	return r, nil
+}
+
+type PrivateKeySetRepo struct {
+	dbMap  *gorp.DbMap
+	secret []byte
+}
+
+func (r *PrivateKeySetRepo) Set(ks key.KeySet) error {
+	qt := pq.QuoteIdentifier(keyTableName)
+	_, err := r.dbMap.Exec(fmt.Sprintf("DELETE FROM %s", qt))
+	if err != nil {
+		return err
+	}
+
+	pks, ok := ks.(*key.PrivateKeySet)
+	if !ok {
+		return errors.New("unable to cast to PrivateKeySet")
+	}
+
+	m, err := newPrivateKeySetModel(pks)
+	if err != nil {
+		return err
+	}
+
+	j, err := json.Marshal(m)
+	if err != nil {
+		return err
+	}
+
+	v, err := pcrypto.AESEncrypt(j, r.secret)
+	if err != nil {
+		return err
+	}
+
+	b := &privateKeySetBlob{Value: v}
+	return r.dbMap.Insert(b)
+}
+
+func (r *PrivateKeySetRepo) Get() (key.KeySet, error) {
+	qt := pq.QuoteIdentifier(keyTableName)
+	objs, err := r.dbMap.Select(&privateKeySetBlob{}, fmt.Sprintf("SELECT * FROM %s", qt))
+	if err != nil {
+		return nil, err
+	}
+
+	if len(objs) == 0 {
+		return nil, key.ErrorNoKeys
+	}
+
+	b, ok := objs[0].(*privateKeySetBlob)
+	if !ok {
+		return nil, errors.New("unable to cast to KeySet")
+	}
+
+	j, err := pcrypto.AESDecrypt(b.Value, r.secret)
+	if err != nil {
+		return nil, errors.New("unable to decrypt key set")
+	}
+
+	var m privateKeySetModel
+	if err := json.Unmarshal(j, &m); err != nil {
+		return nil, err
+	}
+
+	pks, err := m.PrivateKeySet()
+	if err != nil {
+		return nil, err
+	}
+
+	return key.KeySet(pks), nil
+}
diff --git a/db/key_test.go b/db/key_test.go
new file mode 100644
index 00000000..634c9bf3
--- /dev/null
+++ b/db/key_test.go
@@ -0,0 +1,12 @@
+package db
+
+import (
+	"testing"
+)
+
+func TestNewPrivateKeySetRepoInvalidKey(t *testing.T) {
+	_, err := NewPrivateKeySetRepo(nil, "sharks")
+	if err == nil {
+		t.Fatalf("Expected non-nil error")
+	}
+}
diff --git a/db/password.go b/db/password.go
new file mode 100644
index 00000000..d575c152
--- /dev/null
+++ b/db/password.go
@@ -0,0 +1,167 @@
+package db
+
+import (
+	"errors"
+	"time"
+
+	"github.com/coopernurse/gorp"
+
+	"github.com/coreos/dex/repo"
+	"github.com/coreos/dex/user"
+)
+
+const (
+	passwordInfoTableName = "password_info"
+)
+
+func init() {
+	register(table{
+		name:    passwordInfoTableName,
+		model:   passwordInfoModel{},
+		autoinc: false,
+		pkey:    []string{"user_id"},
+	})
+
+}
+
+type passwordInfoModel struct {
+	UserID          string `db:"user_id"`
+	Password        string `db:"password"`
+	PasswordExpires int64  `db:"password_expires"`
+}
+
+func NewPasswordInfoRepo(dbm *gorp.DbMap) user.PasswordInfoRepo {
+	return &passwordInfoRepo{
+		dbMap: dbm,
+	}
+}
+
+type passwordInfoRepo struct {
+	dbMap *gorp.DbMap
+}
+
+func (r *passwordInfoRepo) Get(tx repo.Transaction, userID string) (user.PasswordInfo, error) {
+	return r.get(tx, userID)
+}
+
+func (r *passwordInfoRepo) Create(tx repo.Transaction, pw user.PasswordInfo) (err error) {
+	if pw.UserID == "" {
+		return user.ErrorInvalidID
+	}
+
+	_, err = r.get(tx, pw.UserID)
+	if err != nil {
+		if err != user.ErrorNotFound {
+			return err
+		}
+	} else {
+		return user.ErrorDuplicateID
+	}
+
+	err = r.insert(tx, pw)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (r *passwordInfoRepo) Update(tx repo.Transaction, pw user.PasswordInfo) error {
+	if pw.UserID == "" {
+		return user.ErrorInvalidID
+	}
+
+	if len(pw.Password) == 0 {
+		return user.ErrorInvalidPassword
+	}
+
+	// make sure this user exists already
+	_, err := r.get(tx, pw.UserID)
+	if err != nil {
+		return err
+	}
+
+	err = r.update(tx, pw)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (r *passwordInfoRepo) executor(tx repo.Transaction) gorp.SqlExecutor {
+	if tx == nil {
+		return r.dbMap
+	}
+
+	gorpTx, ok := tx.(*gorp.Transaction)
+	if !ok {
+		panic("wrong kind of transaction passed to a DB repo")
+	}
+	return gorpTx
+}
+
+func (r *passwordInfoRepo) get(tx repo.Transaction, id string) (user.PasswordInfo, error) {
+	ex := r.executor(tx)
+
+	m, err := ex.Get(passwordInfoModel{}, id)
+	if err != nil {
+		return user.PasswordInfo{}, nil
+	}
+
+	if m == nil {
+		return user.PasswordInfo{}, user.ErrorNotFound
+	}
+
+	pwm, ok := m.(*passwordInfoModel)
+	if !ok {
+		return user.PasswordInfo{}, errors.New("unrecognized model")
+	}
+
+	return pwm.passwordInfo()
+}
+
+func (r *passwordInfoRepo) insert(tx repo.Transaction, pw user.PasswordInfo) error {
+	ex := r.executor(tx)
+	pm, err := newPasswordInfoModel(&pw)
+	if err != nil {
+		return err
+	}
+	return ex.Insert(pm)
+}
+
+func (r *passwordInfoRepo) update(tx repo.Transaction, pw user.PasswordInfo) error {
+	ex := r.executor(tx)
+	pm, err := newPasswordInfoModel(&pw)
+	if err != nil {
+		return err
+	}
+	_, err = ex.Update(pm)
+	return err
+}
+
+func (p *passwordInfoModel) passwordInfo() (user.PasswordInfo, error) {
+	pw := user.PasswordInfo{
+		UserID:   p.UserID,
+		Password: user.Password(p.Password),
+	}
+
+	if p.PasswordExpires != 0 {
+		pw.PasswordExpires = time.Unix(p.PasswordExpires, 0).UTC()
+	}
+
+	return pw, nil
+}
+
+func newPasswordInfoModel(p *user.PasswordInfo) (*passwordInfoModel, error) {
+	pw := passwordInfoModel{
+		UserID:   p.UserID,
+		Password: string(p.Password),
+	}
+
+	if !p.PasswordExpires.IsZero() {
+		pw.PasswordExpires = p.PasswordExpires.Unix()
+	}
+
+	return &pw, nil
+}
diff --git a/db/refresh.go b/db/refresh.go
new file mode 100644
index 00000000..d65e275f
--- /dev/null
+++ b/db/refresh.go
@@ -0,0 +1,185 @@
+package db
+
+import (
+	"errors"
+	"fmt"
+	"strconv"
+	"strings"
+
+	"github.com/coopernurse/gorp"
+	"github.com/coreos/dex/refresh"
+	"golang.org/x/crypto/bcrypt"
+)
+
+const (
+	refreshTokenTableName = "refresh_token"
+)
+
+func init() {
+	register(table{
+		name:    refreshTokenTableName,
+		model:   refreshTokenModel{},
+		autoinc: true,
+		pkey:    []string{"id"},
+	})
+}
+
+type refreshTokenRepo struct {
+	dbMap          *gorp.DbMap
+	tokenGenerator refresh.RefreshTokenGenerator
+}
+
+type refreshTokenModel struct {
+	ID          int64  `db:"id"`
+	PayloadHash string `db:"payload_hash"`
+	// TODO(yifan): Use some sort of foreign key to manage database level
+	// data integrity.
+	UserID   string `db:"user_id"`
+	ClientID string `db:"client_id"`
+}
+
+// buildToken combines the token ID and token payload to create a new token.
+func buildToken(tokenID int64, tokenPayload string) string {
+	return fmt.Sprintf("%d%s%s", tokenID, refresh.TokenDelimer, tokenPayload)
+}
+
+// parseToken parses a token and returns the token ID and token payload.
+func parseToken(token string) (int64, string, error) {
+	parts := strings.SplitN(token, refresh.TokenDelimer, 2)
+	if len(parts) != 2 {
+		return -1, "", refresh.ErrorInvalidToken
+	}
+	id, err := strconv.ParseInt(parts[0], 0, 64)
+	if err != nil {
+		return -1, "", refresh.ErrorInvalidToken
+	}
+	return id, parts[1], nil
+}
+
+func checkTokenPayload(payloadHash, payload string) error {
+	if err := bcrypt.CompareHashAndPassword([]byte(payloadHash), []byte(payload)); err != nil {
+		switch err {
+		case bcrypt.ErrMismatchedHashAndPassword:
+			return refresh.ErrorInvalidToken
+		default:
+			return err
+		}
+	}
+	return nil
+}
+
+func NewRefreshTokenRepo(dbm *gorp.DbMap) refresh.RefreshTokenRepo {
+	return &refreshTokenRepo{
+		dbMap:          dbm,
+		tokenGenerator: refresh.DefaultRefreshTokenGenerator,
+	}
+}
+
+func (r *refreshTokenRepo) Create(userID, clientID string) (string, error) {
+	if userID == "" {
+		return "", refresh.ErrorInvalidUserID
+	}
+	if clientID == "" {
+		return "", refresh.ErrorInvalidClientID
+	}
+
+	// TODO(yifan): Check the number of tokens given to the client-user pair.
+	tokenPayload, err := r.tokenGenerator.Generate()
+	if err != nil {
+		return "", err
+	}
+
+	payloadHash, err := bcrypt.GenerateFromPassword([]byte(tokenPayload), bcrypt.DefaultCost)
+	if err != nil {
+		return "", err
+	}
+
+	record := &refreshTokenModel{
+		PayloadHash: string(payloadHash),
+		UserID:      userID,
+		ClientID:    clientID,
+	}
+
+	if err := r.dbMap.Insert(record); err != nil {
+		return "", err
+	}
+
+	return buildToken(record.ID, tokenPayload), nil
+}
+
+func (r *refreshTokenRepo) Verify(clientID, token string) (string, error) {
+	tokenID, tokenPayload, err := parseToken(token)
+	if err != nil {
+		return "", err
+	}
+
+	record, err := r.get(nil, tokenID)
+	if err != nil {
+		return "", err
+	}
+
+	if record.ClientID != clientID {
+		return "", refresh.ErrorInvalidClientID
+	}
+
+	if err := checkTokenPayload(record.PayloadHash, tokenPayload); err != nil {
+		return "", err
+	}
+
+	return record.UserID, nil
+}
+
+func (r *refreshTokenRepo) Revoke(userID, token string) error {
+	tokenID, tokenPayload, err := parseToken(token)
+	if err != nil {
+		return err
+	}
+
+	record, err := r.get(nil, tokenID)
+	if err != nil {
+		return err
+	}
+
+	if record.UserID != userID {
+		return refresh.ErrorInvalidUserID
+	}
+
+	if err := checkTokenPayload(record.PayloadHash, tokenPayload); err != nil {
+		return err
+	}
+
+	deleted, err := r.dbMap.Delete(record)
+	if err != nil {
+		return err
+	}
+	if deleted == 0 {
+		return refresh.ErrorInvalidToken
+	}
+
+	return nil
+}
+
+func (r *refreshTokenRepo) executor(tx *gorp.Transaction) gorp.SqlExecutor {
+	if tx == nil {
+		return r.dbMap
+	}
+	return tx
+}
+
+func (r *refreshTokenRepo) get(tx *gorp.Transaction, tokenID int64) (*refreshTokenModel, error) {
+	ex := r.executor(tx)
+	result, err := ex.Get(refreshTokenModel{}, tokenID)
+	if err != nil {
+		return nil, err
+	}
+
+	if result == nil {
+		return nil, refresh.ErrorInvalidToken
+	}
+
+	record, ok := result.(*refreshTokenModel)
+	if !ok {
+		return nil, errors.New("unrecognized model")
+	}
+	return record, nil
+}
diff --git a/db/session.go b/db/session.go
new file mode 100644
index 00000000..4478e93b
--- /dev/null
+++ b/db/session.go
@@ -0,0 +1,193 @@
+package db
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"net/url"
+	"time"
+
+	"github.com/coopernurse/gorp"
+	"github.com/jonboulle/clockwork"
+	"github.com/lib/pq"
+
+	"github.com/coreos/dex/pkg/log"
+	"github.com/coreos/dex/session"
+	"github.com/coreos/go-oidc/oidc"
+)
+
+const (
+	sessionTableName = "session"
+)
+
+func init() {
+	register(table{
+		name:    sessionTableName,
+		model:   sessionModel{},
+		autoinc: false,
+		pkey:    []string{"id"},
+	})
+}
+
+type sessionModel struct {
+	ID          string `db:"id"`
+	State       string `db:"state"`
+	CreatedAt   int64  `db:"created_at"`
+	ExpiresAt   int64  `db:"expires_at"`
+	ClientID    string `db:"client_id"`
+	ClientState string `db:"client_state"`
+	RedirectURL string `db:"redirect_url"`
+	Identity    string `db:"identity"`
+	ConnectorID string `db:"connector_id"`
+	UserID      string `db:"user_id"`
+	Register    bool   `db:"register"`
+	Nonce       string `db:"nonce"`
+}
+
+func (s *sessionModel) session() (*session.Session, error) {
+	ru, err := url.Parse(s.RedirectURL)
+	if err != nil {
+		return nil, err
+	}
+
+	var ident oidc.Identity
+	if err = json.Unmarshal([]byte(s.Identity), &ident); err != nil {
+		return nil, err
+	}
+	// If this is not here, then ExpiresAt is unmarshaled with a "loc" field,
+	// which breaks tests.
+	if ident.ExpiresAt.IsZero() {
+		ident.ExpiresAt = time.Time{}
+	}
+
+	ses := session.Session{
+		ID:          s.ID,
+		State:       session.SessionState(s.State),
+		ClientID:    s.ClientID,
+		ClientState: s.ClientState,
+		RedirectURL: *ru,
+		Identity:    ident,
+		ConnectorID: s.ConnectorID,
+		UserID:      s.UserID,
+		Register:    s.Register,
+		Nonce:       s.Nonce,
+	}
+
+	if s.CreatedAt != 0 {
+		ses.CreatedAt = time.Unix(s.CreatedAt, 0).UTC()
+	}
+
+	if s.ExpiresAt != 0 {
+		ses.ExpiresAt = time.Unix(s.ExpiresAt, 0).UTC()
+	}
+
+	return &ses, nil
+}
+
+func newSessionModel(s *session.Session) (*sessionModel, error) {
+	b, err := json.Marshal(s.Identity)
+	if err != nil {
+		return nil, err
+	}
+
+	sm := sessionModel{
+		ID:          s.ID,
+		State:       string(s.State),
+		ClientID:    s.ClientID,
+		ClientState: s.ClientState,
+		RedirectURL: s.RedirectURL.String(),
+		Identity:    string(b),
+		ConnectorID: s.ConnectorID,
+		UserID:      s.UserID,
+		Register:    s.Register,
+		Nonce:       s.Nonce,
+	}
+
+	if !s.CreatedAt.IsZero() {
+		sm.CreatedAt = s.CreatedAt.Unix()
+	}
+
+	if !s.ExpiresAt.IsZero() {
+		sm.ExpiresAt = s.ExpiresAt.Unix()
+	}
+
+	return &sm, nil
+}
+
+func NewSessionRepo(dbm *gorp.DbMap) *SessionRepo {
+	return NewSessionRepoWithClock(dbm, clockwork.NewRealClock())
+}
+
+func NewSessionRepoWithClock(dbm *gorp.DbMap, clock clockwork.Clock) *SessionRepo {
+	return &SessionRepo{dbMap: dbm, clock: clock}
+}
+
+type SessionRepo struct {
+	dbMap *gorp.DbMap
+	clock clockwork.Clock
+}
+
+func (r *SessionRepo) Get(sessionID string) (*session.Session, error) {
+	m, err := r.dbMap.Get(sessionModel{}, sessionID)
+	if err != nil {
+		return nil, err
+	}
+
+	sm, ok := m.(*sessionModel)
+	if !ok {
+		return nil, errors.New("unrecognized model")
+	}
+
+	ses, err := sm.session()
+	if err != nil {
+		return nil, err
+	}
+	if ses.ExpiresAt.Before(r.clock.Now()) {
+		return nil, errors.New("session does not exist")
+	}
+
+	return ses, nil
+}
+
+func (r *SessionRepo) Create(s session.Session) error {
+	sm, err := newSessionModel(&s)
+	if err != nil {
+		return err
+	}
+	return r.dbMap.Insert(sm)
+}
+
+func (r *SessionRepo) Update(s session.Session) error {
+	sm, err := newSessionModel(&s)
+	if err != nil {
+		return err
+	}
+	n, err := r.dbMap.Update(sm)
+	if err != nil {
+		return err
+	}
+	if n != 1 {
+		return errors.New("update affected unexpected number of rows")
+	}
+	return nil
+}
+
+func (r *SessionRepo) purge() error {
+	qt := pq.QuoteIdentifier(sessionTableName)
+	q := fmt.Sprintf("DELETE FROM %s WHERE expires_at < $1 OR state = $2", qt)
+	res, err := r.dbMap.Exec(q, r.clock.Now().Unix(), string(session.SessionStateDead))
+	if err != nil {
+		return err
+	}
+
+	d := "unknown # of"
+	if n, err := res.RowsAffected(); err == nil {
+		if n == 0 {
+			return nil
+		}
+		d = fmt.Sprintf("%d", n)
+	}
+
+	log.Infof("Deleted %s stale row(s) from %s table", d, sessionTableName)
+	return nil
+}
diff --git a/db/session_key.go b/db/session_key.go
new file mode 100644
index 00000000..e3e480fc
--- /dev/null
+++ b/db/session_key.go
@@ -0,0 +1,109 @@
+package db
+
+import (
+	"errors"
+	"fmt"
+	"time"
+
+	"github.com/coopernurse/gorp"
+	"github.com/jonboulle/clockwork"
+	"github.com/lib/pq"
+
+	"github.com/coreos/dex/pkg/log"
+	"github.com/coreos/dex/session"
+)
+
+const (
+	sessionKeyTableName = "session_key"
+)
+
+func init() {
+	register(table{
+		name:    sessionKeyTableName,
+		model:   sessionKeyModel{},
+		autoinc: false,
+		pkey:    []string{"key"},
+	})
+}
+
+type sessionKeyModel struct {
+	Key       string `db:"key"`
+	SessionID string `db:"session_id"`
+	ExpiresAt int64  `db:"expires_at"`
+	Stale     bool   `db:"stale"`
+}
+
+func NewSessionKeyRepo(dbm *gorp.DbMap) *SessionKeyRepo {
+	return NewSessionKeyRepoWithClock(dbm, clockwork.NewRealClock())
+}
+
+func NewSessionKeyRepoWithClock(dbm *gorp.DbMap, clock clockwork.Clock) *SessionKeyRepo {
+	return &SessionKeyRepo{dbMap: dbm, clock: clock}
+}
+
+type SessionKeyRepo struct {
+	dbMap *gorp.DbMap
+	clock clockwork.Clock
+}
+
+func (r *SessionKeyRepo) Push(sk session.SessionKey, exp time.Duration) error {
+	skm := &sessionKeyModel{
+		Key:       sk.Key,
+		SessionID: sk.SessionID,
+		ExpiresAt: r.clock.Now().Unix() + int64(exp.Seconds()),
+		Stale:     false,
+	}
+	return r.dbMap.Insert(skm)
+}
+
+func (r *SessionKeyRepo) Pop(key string) (string, error) {
+	m, err := r.dbMap.Get(sessionKeyModel{}, key)
+	if err != nil {
+		return "", err
+	}
+
+	skm, ok := m.(*sessionKeyModel)
+	if !ok {
+		return "", errors.New("unrecognized model")
+	}
+
+	if skm.Stale || skm.ExpiresAt < r.clock.Now().Unix() {
+		return "", errors.New("invalid session key")
+	}
+
+	qt := pq.QuoteIdentifier(sessionKeyTableName)
+	q := fmt.Sprintf("UPDATE %s SET stale=$1 WHERE key=$2 AND stale=$3", qt)
+	res, err := r.dbMap.Exec(q, true, key, false)
+	if err != nil {
+		return "", err
+	}
+
+	if n, err := res.RowsAffected(); n != 1 {
+		if err != nil {
+			log.Errorf("Failed determining rows affected by UPDATE session_key query: %v", err)
+		}
+		return "", fmt.Errorf("failed to pop entity")
+	}
+
+	return skm.SessionID, nil
+}
+
+func (r *SessionKeyRepo) purge() error {
+	qt := pq.QuoteIdentifier(sessionKeyTableName)
+	q := fmt.Sprintf("DELETE FROM %s WHERE stale = $1 OR expires_at < $2", qt)
+	res, err := r.dbMap.Exec(q, true, r.clock.Now().Unix())
+	if err != nil {
+		return err
+	}
+
+	d := "unknown # of"
+	if n, err := res.RowsAffected(); err == nil {
+		if n == 0 {
+			return nil
+		}
+		d = fmt.Sprintf("%d", n)
+	}
+
+	log.Infof("Deleted %s stale row(s) from %s table", d, sessionKeyTableName)
+	return nil
+}
diff --git a/db/user.go b/db/user.go
new file mode 100644
index 00000000..cff1d3e9
--- /dev/null
+++ b/db/user.go
@@ -0,0 +1,467 @@
+package db
+
+import (
+	"database/sql"
+	"errors"
+	"fmt"
+	"time"
+
+	"github.com/coopernurse/gorp"
+	"github.com/lib/pq"
+
+	"github.com/coreos/dex/repo"
+	"github.com/coreos/dex/user"
+)
+
+const (
+	userTableName                  = "dex_user"
+	remoteIdentityMappingTableName = "remote_identity_mapping"
+)
+
+func init() {
+	register(table{
+		name:    userTableName,
+		model:   userModel{},
+		autoinc: false,
+		pkey:    []string{"id"},
+		unique:  []string{"email"},
+	})
+
+	register(table{
+		name:    remoteIdentityMappingTableName,
+		model:   remoteIdentityMappingModel{},
+		autoinc: false,
+		pkey:    []string{"connector_id", "remote_id"},
+	})
+}
+
+func NewUserRepo(dbm *gorp.DbMap) user.UserRepo {
+	return &userRepo{
+		dbMap: dbm,
+	}
+}
+
+func NewUserRepoFromUsers(dbm *gorp.DbMap, us []user.UserWithRemoteIdentities) (user.UserRepo, error) {
+	repo := NewUserRepo(dbm).(*userRepo)
+	for _, u := range us {
+		um, err := newUserModel(&u.User)
+		if err != nil {
+			return nil, err
+		}
+		err = repo.dbMap.Insert(um)
+		for _, ri := range u.RemoteIdentities {
+			err = repo.AddRemoteIdentity(nil, u.User.ID, ri)
+			if err != nil {
+				return nil, err
+			}
+		}
+	}
+	return repo, nil
+}
+
+type userRepo struct {
+	dbMap *gorp.DbMap
+}
+
+func (r *userRepo) Get(tx repo.Transaction, userID string) (user.User, error) {
+	return r.get(tx, userID)
+}
+
+func (r *userRepo) Create(tx repo.Transaction, usr user.User) (err error) {
+	if usr.ID == "" {
+		return user.ErrorInvalidID
+	}
+
+	_, err = r.get(tx, usr.ID)
+	if err != nil {
+		if err != user.ErrorNotFound {
+			return err
+		}
+	} else {
+		return user.ErrorDuplicateID
+	}
+
+	if !user.ValidEmail(usr.Email) {
+		return user.ErrorInvalidEmail
+	}
+
+	// make sure there's no other user with the same Email
+	_, err = r.getByEmail(tx, usr.Email)
+	if err != nil {
+		if err != user.ErrorNotFound {
+			return err
+		}
+	} else {
+		return user.ErrorDuplicateEmail
+	}
+
+	err = r.insert(tx, usr)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (r *userRepo) GetByEmail(tx repo.Transaction, email string) (user.User, error) {
+	return r.getByEmail(tx, email)
+}
+
+func (r *userRepo) Update(tx repo.Transaction, usr user.User) error {
+	if usr.ID == "" {
+		return user.ErrorInvalidID
+	}
+
+	if !user.ValidEmail(usr.Email) {
+		return user.ErrorInvalidEmail
+	}
+
+	// make sure this user exists already
+	_, err := r.get(tx, usr.ID)
+	if err != nil {
+		return err
+	}
+
+	// make sure there's no other user with the same Email
+	otherUser, err := r.getByEmail(tx, usr.Email)
+	if err != user.ErrorNotFound {
+		if err != nil {
+			return err
+		}
+		if otherUser.ID != usr.ID {
+			return user.ErrorDuplicateEmail
+		}
+	}
+
+	err = r.update(tx, usr)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (r *userRepo) GetByRemoteIdentity(tx repo.Transaction, ri user.RemoteIdentity) (user.User, error) {
+	userID, err := r.getUserIDForRemoteIdentity(tx, ri)
+	if err != nil {
+		return user.User{}, err
+	}
+
+	usr, err := r.get(tx, userID)
+	if err != nil {
+		return user.User{}, err
+	}
+
+	if err != nil {
+		return user.User{}, err
+	}
+
+	return usr, nil
+}
+
+func (r *userRepo) AddRemoteIdentity(tx repo.Transaction, userID string, ri user.RemoteIdentity) error {
+	_, err := r.get(tx, userID)
+	if err != nil {
+		return err
+	}
+
+	otherUserID, err := r.getUserIDForRemoteIdentity(tx, ri)
+	if err != user.ErrorNotFound {
+		if err == nil && otherUserID != "" {
+			return user.ErrorDuplicateRemoteIdentity
+		}
+		return err
+	}
+
+	err = r.insertRemoteIdentity(tx, userID, ri)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (r *userRepo) RemoveRemoteIdentity(tx repo.Transaction, userID string, rid user.RemoteIdentity) error {
+	if userID == "" || rid.ID == "" || rid.ConnectorID == "" {
+		return user.ErrorInvalidID
+	}
+
+	otherUserID, err := r.getUserIDForRemoteIdentity(tx, rid)
+	if err != nil {
+		return err
+	}
+	if otherUserID != userID {
+		return user.ErrorNotFound
+	}
+
+	rim, err := newRemoteIdentityMappingModel(userID, rid)
+	if err != nil {
+		return err
+	}
+
+	ex := r.executor(tx)
+	deleted, err := ex.Delete(rim)
+
+	if err != nil {
+		return err
+	}
+
+	if deleted == 0 {
+		return user.ErrorNotFound
+	}
+
+	return nil
+}
+
+func (r *userRepo) GetRemoteIdentities(tx repo.Transaction, userID string) ([]user.RemoteIdentity, error) {
+	ex := r.executor(tx)
+	if userID == "" {
+		return nil, user.ErrorInvalidID
+	}
+
+	qt := pq.QuoteIdentifier(remoteIdentityMappingTableName)
+	rims, err := ex.Select(&remoteIdentityMappingModel{},
+		fmt.Sprintf("select * from %s where user_id = $1", qt), userID)
+
+	if err != nil {
+		if err != sql.ErrNoRows {
+			return nil, err
+		}
+		return nil, err
+	}
+	if len(rims) == 0 {
+		return nil, nil
+	}
+
+	var ris []user.RemoteIdentity
+	for _, m := range rims {
+		rim, ok := m.(*remoteIdentityMappingModel)
+		if !ok {
+			return nil, errors.New("unrecognized model")
+		}
+
+		ris = append(ris, user.RemoteIdentity{
+			ID:          rim.RemoteID,
+			ConnectorID: rim.ConnectorID,
+		})
+	}
+
+	return ris, nil
+}
+
+func (r *userRepo) GetAdminCount(tx repo.Transaction) (int, error) {
+	qt := pq.QuoteIdentifier(userTableName)
+	ex := r.executor(tx)
+	i, err := ex.SelectInt(fmt.Sprintf("SELECT count(*) FROM %s where admin=true", qt))
+	return int(i), err
+}
+
+func (r *userRepo) List(tx repo.Transaction, filter user.UserFilter, maxResults int, nextPageToken string) ([]user.User, string, error) {
+	var offset int
+	var err error
+	if nextPageToken != "" {
+		filter, maxResults, offset, err = user.DecodeNextPageToken(nextPageToken)
+	}
+	if err != nil {
+		return nil, "", err
+	}
+	ex := r.executor(tx)
+
+	qt := pq.QuoteIdentifier(userTableName)
+
+	// Ask for one more than needed so we know if there's more results, and
+	// hence, whether a nextPageToken is necessary.
+	ums, err := ex.Select(&userModel{},
+		fmt.Sprintf("SELECT * FROM %s ORDER BY email LIMIT $1 OFFSET $2 ", qt), maxResults+1, offset)
+	if err != nil {
+		return nil, "", err
+	}
+	if len(ums) == 0 {
+		return nil, "", user.ErrorNotFound
+	}
+
+	var more bool
+	var numUsers int
+	if len(ums) <= maxResults {
+		numUsers = len(ums)
+	} else {
+		numUsers = maxResults
+		more = true
+	}
+
+	users := make([]user.User, numUsers)
+	for i := 0; i < numUsers; i++ {
+		um, ok := ums[i].(*userModel)
+		if !ok {
+			return nil, "", errors.New("unrecognized model")
+		}
+		usr, err := um.user()
+		if err != nil {
+			return nil, "", err
+		}
+		users[i] = usr
+	}
+
+	var tok string
+	if more {
+		tok, err = user.EncodeNextPageToken(filter, maxResults, offset+maxResults)
+		if err != nil {
+			return nil, "", err
+		}
+	}
+
+	return users, tok, nil
+
+}
+
+func (r *userRepo) executor(tx repo.Transaction) gorp.SqlExecutor {
+	if tx == nil {
+		return r.dbMap
+	}
+
+	gorpTx, ok := tx.(*gorp.Transaction)
+	if !ok {
+		panic("wrong kind of transaction passed to a DB repo")
+	}
+	return gorpTx
+}
+
+func (r *userRepo) insert(tx repo.Transaction, usr user.User) error {
+	ex := r.executor(tx)
+	um, err := newUserModel(&usr)
+	if err != nil {
+		return err
+	}
+	return ex.Insert(um)
+}
+
+func (r *userRepo) update(tx repo.Transaction, usr user.User) error {
+	ex := r.executor(tx)
+	um, err := newUserModel(&usr)
+	if err != nil {
+		return err
+	}
+	_, err = ex.Update(um)
+	return err
+}
+
+func (r *userRepo) get(tx repo.Transaction, userID string) (user.User, error) {
+	ex := r.executor(tx)
+
+	m, err := ex.Get(userModel{}, userID)
+	if err != nil {
+		return user.User{}, err
+	}
+
+	if m == nil {
+		return user.User{}, user.ErrorNotFound
+	}
+
+	um, ok := m.(*userModel)
+	if !ok {
+		return user.User{}, errors.New("unrecognized model")
+	}
+
+	return um.user()
+}
+
+func (r *userRepo) getUserIDForRemoteIdentity(tx repo.Transaction, ri user.RemoteIdentity) (string, error) {
+	ex := r.executor(tx)
+
+	m, err := ex.Get(remoteIdentityMappingModel{}, ri.ConnectorID, ri.ID)
+	if err != nil {
+		return "", err
+	}
+
+	if m == nil {
+		return "", user.ErrorNotFound
+	}
+
+	rim, ok := m.(*remoteIdentityMappingModel)
+	if !ok {
+		return "", errors.New("unrecognized model")
+	}
+
+	return rim.UserID, nil
+}
+
+func (r *userRepo) getByEmail(tx repo.Transaction, email string) (user.User, error) {
+	qt := pq.QuoteIdentifier(userTableName)
+	ex := r.executor(tx)
+	var um userModel
+	err := ex.SelectOne(&um, fmt.Sprintf("select * from %s where email = $1", qt), email)
+
+	if err != nil {
+		if err == sql.ErrNoRows {
+			return user.User{}, user.ErrorNotFound
+		}
+		return user.User{}, err
+	}
+	return um.user()
+}
+
+func (r *userRepo) insertRemoteIdentity(tx repo.Transaction, userID string, ri user.RemoteIdentity) error {
+	ex := r.executor(tx)
+	rim, err := newRemoteIdentityMappingModel(userID, ri)
+	if err != nil {
+
+		return err
+	}
+	err = ex.Insert(rim)
+	return err
+}
+
+type userModel struct {
+	ID            string `db:"id"`
+	Email         string `db:"email"`
+	EmailVerified bool   `db:"email_verified"`
+	DisplayName   string `db:"display_name"`
+	Admin         bool   `db:"admin"`
+	CreatedAt     int64  `db:"created_at"`
+}
+
+func (u *userModel) user() (user.User, error) {
+	usr := user.User{
+		ID:            u.ID,
+		DisplayName:   u.DisplayName,
+		Email:         u.Email,
+		EmailVerified: u.EmailVerified,
+		Admin:         u.Admin,
+	}
+
+	if u.CreatedAt != 0 {
+		usr.CreatedAt = time.Unix(u.CreatedAt, 0).UTC()
+	}
+
+	return usr, nil
+}
+
+func newUserModel(u *user.User) (*userModel, error) {
+	um := userModel{
+		ID:            u.ID,
+		DisplayName:   u.DisplayName,
+		Email:         u.Email,
+		EmailVerified: u.EmailVerified,
+		Admin:         u.Admin,
+	}
+
+	if !u.CreatedAt.IsZero() {
+		um.CreatedAt = u.CreatedAt.Unix()
+	}
+
+	return &um, nil
+}
+
+func newRemoteIdentityMappingModel(userID string, ri user.RemoteIdentity) (*remoteIdentityMappingModel, error) {
+	return &remoteIdentityMappingModel{
+		ConnectorID: ri.ConnectorID,
+		UserID:      userID,
+		RemoteID:    ri.ID,
+	}, nil
+}
+
+type remoteIdentityMappingModel struct {
+	ConnectorID string `db:"connector_id"`
+	UserID      string `db:"user_id"`
+	RemoteID    string `db:"remote_id"`
+}
diff --git a/email/config.go b/email/config.go
new file mode 100644
index 00000000..7d5eecc9
--- /dev/null
+++ b/email/config.go
@@ -0,0 +1,61 @@
+// DO NOT EDIT: This file was auto-generated by "go generate"
+// To regenerate run:
+//   go install github.com/coreos/dex/cmd/genconfig
+//   go generate <<fully qualified package name>>
+package email
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+)
+
+type NewEmailerConfigFunc func() EmailerConfig
+
+var (
+	emailerTypes map[string]NewEmailerConfigFunc
+)
+
+func RegisterEmailerConfigType(emailerType string, fn NewEmailerConfigFunc) {
+	if emailerTypes == nil {
+		emailerTypes = make(map[string]NewEmailerConfigFunc)
+	}
+
+	if _, ok := emailerTypes[emailerType]; ok {
+		panic(fmt.Sprintf("emailer config type %q already registered", emailerType))
+	}
+
+	emailerTypes[emailerType] = fn
+}
+
+func NewEmailerConfigFromType(emailerType string) (EmailerConfig, error) {
+	fn, ok := emailerTypes[emailerType]
+	if !ok {
+		return nil, fmt.Errorf("unrecognized emailer config type %q", emailerType)
+	}
+
+	return fn(), nil
+}
+
+func newEmailerConfigFromMap(m map[string]interface{}) (EmailerConfig, error) {
+	ityp, ok := m["type"]
+	if !ok {
+		return nil, errors.New("emailer config type not set")
+	}
+	typ, ok := ityp.(string)
+	if !ok {
+		return nil, errors.New("emailer config type not string")
+	}
+	cfg, err := NewEmailerConfigFromType(typ)
+	if err != nil {
+		return nil, err
+	}
+	b, err := json.Marshal(m)
+	if err != nil {
+		return nil, err
+	}
+	if err = json.Unmarshal(b, cfg); err != nil {
+		return nil, err
+	}
+	return cfg, nil
+}
diff --git a/email/interface.go b/email/interface.go
new file mode 100644
index 00000000..eb9ff908
--- /dev/null
+++ b/email/interface.go
@@ -0,0 +1,91 @@
+package email
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"os"
+	"strings"
+)
+
+const (
+	FakeEmailerType = "fake"
+)
+
+var (
+	ErrorNoTemplate = errors.New("No HTML or Text template found for template name.")
+)
+
+func init() {
+	RegisterEmailerConfigType(FakeEmailerType, func() EmailerConfig { return &FakeEmailerConfig{} })
+}
+
+// Emailer is an object that sends emails.
+type Emailer interface {
+	// SendMail queues an email to be sent to 1 or more recipients.
+	// At least one of "text" or "html" must not be blank. If text is blank, but
+	// html is not, then an html-only email should be sent and vice-versal.
+	SendMail(from, subject, text, html string, to ...string) error
+}
+
+//go:generate genconfig -o config.go email Emailer
+type EmailerConfig interface {
+	EmailerID() string
+	EmailerType() string
+	Emailer() (Emailer, error)
+}
+
+func newEmailerConfigFromReader(r io.Reader) (EmailerConfig, error) {
+	var m map[string]interface{}
+	if err := json.NewDecoder(r).Decode(&m); err != nil {
+		return nil, err
+	}
+	cfg, err := newEmailerConfigFromMap(m)
+	if err != nil {
+		return nil, err
+	}
+	return cfg, nil
+}
+
+func NewEmailerConfigFromFile(loc string) (EmailerConfig, error) {
+	cf, err := os.Open(loc)
+	if err != nil {
+		return nil, err
+	}
+	defer cf.Close()
+
+	cfg, err := newEmailerConfigFromReader(cf)
+	if err != nil {
+		return nil, err
+	}
+	return cfg, nil
+}
+
+type FakeEmailerConfig struct {
+	ID string `json:"id"`
+}
+
+func (cfg FakeEmailerConfig) EmailerType() string {
+	return FakeEmailerType
+}
+
+func (cfg FakeEmailerConfig) EmailerID() string {
+	return cfg.ID
+}
+
+func (cfg FakeEmailerConfig) Emailer() (Emailer, error) {
+	return FakeEmailer{}, nil
+}
+
+// FakeEmailer is an Emailer that writes emails to stdout. Should only be used in development.
+type FakeEmailer struct{}
+
+func (f FakeEmailer) SendMail(from, subject, text, html string, to ...string) error {
+	fmt.Printf("From: %v\n", from)
+	fmt.Printf("Subject: %v\n", subject)
+	fmt.Printf("To: %v\n", strings.Join(to, ","))
+	fmt.Printf("Body(text): %v\n", text)
+	fmt.Printf("Body(html): %v\n", html)
+	return nil
+}
diff --git a/email/mailgun.go b/email/mailgun.go
new file mode 100644
index 00000000..6661f29f
--- /dev/null
+++ b/email/mailgun.go
@@ -0,0 +1,88 @@
+package email
+
+import (
+	"encoding/json"
+	"errors"
+	"expvar"
+
+	"github.com/coreos/dex/pkg/log"
+	mailgun "github.com/mailgun/mailgun-go"
+)
+
+const (
+	MailgunEmailerType = "mailgun"
+)
+
+var (
+	counterEmailSendErr = expvar.NewInt("mailgun.send.err")
+)
+
+func init() {
+	RegisterEmailerConfigType(MailgunEmailerType, func() EmailerConfig { return &MailgunEmailerConfig{} })
+}
+
+type MailgunEmailerConfig struct {
+	ID            string `json:"id"`
+	PrivateAPIKey string `json:"privateAPIKey"`
+	PublicAPIKey  string `json:"publicAPIKey"`
+	Domain        string `json:"domain"`
+}
+
+func (cfg MailgunEmailerConfig) EmailerType() string {
+	return MailgunEmailerType
+}
+
+func (cfg MailgunEmailerConfig) EmailerID() string {
+	return cfg.ID
+}
+
+func (cfg MailgunEmailerConfig) Emailer() (Emailer, error) {
+	mg := mailgun.NewMailgun(cfg.Domain, cfg.PrivateAPIKey, cfg.PublicAPIKey)
+	return &mailgunEmailer{
+		mg: mg,
+	}, nil
+}
+
+// mailgunEmailerConfig exists to avoid recusion.
+type mailgunEmailerConfig MailgunEmailerConfig
+
+func (cfg *MailgunEmailerConfig) UnmarshalJSON(data []byte) error {
+	mgtmp := mailgunEmailerConfig{}
+	err := json.Unmarshal(data, &mgtmp)
+	if err != nil {
+		return err
+	}
+
+	if mgtmp.PrivateAPIKey == "" {
+		return errors.New("must have a privateAPIKey set")
+	}
+
+	if mgtmp.PublicAPIKey == "" {
+		return errors.New("must have a publicAPIKey set")
+	}
+
+	if mgtmp.Domain == "" {
+		return errors.New("must have a domain set")
+	}
+
+	*cfg = MailgunEmailerConfig(mgtmp)
+	return nil
+}
+
+type mailgunEmailer struct {
+	mg mailgun.Mailgun
+}
+
+func (m *mailgunEmailer) SendMail(from, subject, text, html string, to ...string) error {
+	msg := m.mg.NewMessage(from, subject, text, to...)
+	if html != "" {
+		msg.SetHtml(html)
+	}
+	mes, id, err := m.mg.Send(msg)
+	if err != nil {
+		counterEmailSendErr.Add(1)
+		return err
+	}
+	log.Infof("SendMail: msgID: %v: %q", id, mes)
+	return nil
+}
diff --git a/email/mailgun_test.go b/email/mailgun_test.go
new file mode 100644
index 00000000..6c78dd91
--- /dev/null
+++ b/email/mailgun_test.go
@@ -0,0 +1,57 @@
+package email
+
+import (
+	"strings"
+	"testing"
+
+	"github.com/kylelemons/godebug/pretty"
+)
+
+func TestNewEmailConfigFromReader(t *testing.T) {
+	tests := []struct {
+		json    string
+		want    MailgunEmailerConfig
+		wantErr bool
+	}{
+		{
+			json: `{"type":"mailgun","id":"mg","privateAPIKey":"private","publicAPIKey":"public","domain":"example.com"}`,
+			want: MailgunEmailerConfig{
+				ID:            "mg",
+				PrivateAPIKey: "private",
+				PublicAPIKey:  "public",
+				Domain:        "example.com",
+			},
+		},
+		{
+			json:    `{"type":"mailgun","id":"mg","publicAPIKey":"public","domain":"example.com"}`,
+			wantErr: true,
+		},
+		{
+			json:    `{"type":"mailgun","id":"mg","privateAPIKey":"private","publicAPIKey":"public"}`,
+			wantErr: true,
+		},
+		{
+			json:    `{"type":"mailgun","id":"mg","privateAPIKey":"private","domain":"example.com"}`,
+			wantErr: true,
+		},
+	}
+
+	for i, tt := range tests {
+		r := strings.NewReader(tt.json)
+		ec, err := newEmailerConfigFromReader(r)
+		if tt.wantErr {
+			if err == nil {
+				t.Errorf("case %d: want non-nil err.", i)
+			}
+			t.Logf("WHAT: %v", err)
+			continue
+		}
+		if err != nil {
+			t.Errorf("case %d: want nil err: %v", i, err)
+			continue
+		}
+		if diff := pretty.Compare(tt.want, ec); diff != "" {
+			t.Errorf("case %d: Compare(want, got): %v", i, diff)
+		}
+	}
+}
diff --git a/email/template.go b/email/template.go
new file mode 100644
index 00000000..2f3c3e03
--- /dev/null
+++ b/email/template.go
@@ -0,0 +1,79 @@
+package email
+
+import (
+	"bytes"
+	"errors"
+	htmltemplate "html/template"
+	"text/template"
+)
+
+// NewTemplatizedEmailerFromGlobs creates a new TemplatizedEmailer, parsing the templates found in the given filepattern globs.
+func NewTemplatizedEmailerFromGlobs(textGlob, htmlGlob string, emailer Emailer) (*TemplatizedEmailer, error) {
+	textTemplates, err := template.ParseGlob(textGlob)
+	if err != nil {
+		return nil, err
+	}
+
+	htmlTemplates, err := htmltemplate.ParseGlob(htmlGlob)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTemplatizedEmailerFromTemplates(textTemplates, htmlTemplates, emailer), nil
+}
+
+// NewTemplatizedEmailerFromTemplates creates a new TemplatizedEmailer, given root text and html templates.
+func NewTemplatizedEmailerFromTemplates(textTemplates *template.Template, htmlTemplates *htmltemplate.Template, emailer Emailer) *TemplatizedEmailer {
+	return &TemplatizedEmailer{
+		emailer:       emailer,
+		textTemplates: textTemplates,
+		htmlTemplates: htmlTemplates,
+	}
+}
+
+// TemplatizedEmailer sends emails based on templates, using any Emailer.
+type TemplatizedEmailer struct {
+	textTemplates *template.Template
+	htmlTemplates *htmltemplate.Template
+	emailer       Emailer
+}
+
+// SendMail queues an email to be sent to a recipient.
+// SendMail has similar semantics to Emailer.SendMail, except that you provide
+// the template names you want to base the message on instead of the actual
+// text. "to", "from" and "subject" will be added into the data map regardless
+// of if they are used.
+func (t *TemplatizedEmailer) SendMail(from, subject, tplName string, data map[string]interface{}, to string) error {
+	if tplName == "" {
+		return errors.New("Must provide a template name")
+	}
+
+	textTpl := t.textTemplates.Lookup(tplName + ".txt")
+	htmlTpl := t.htmlTemplates.Lookup(tplName + ".html")
+
+	if textTpl == nil && htmlTpl == nil {
+		return ErrorNoTemplate
+	}
+
+	data["to"] = to
+	data["from"] = from
+	data["subject"] = subject
+
+	var textBuffer bytes.Buffer
+	if textTpl != nil {
+		err := textTpl.Execute(&textBuffer, data)
+		if err != nil {
+			return err
+		}
+	}
+
+	var htmlBuffer bytes.Buffer
+	if htmlTpl != nil {
+		err := htmlTpl.Execute(&htmlBuffer, data)
+		if err != nil {
+			return err
+		}
+	}
+
+	return t.emailer.SendMail(from, subject, textBuffer.String(), htmlBuffer.String(), to)
+}
diff --git a/email/template_test.go b/email/template_test.go
new file mode 100644
index 00000000..a4a37cad
--- /dev/null
+++ b/email/template_test.go
@@ -0,0 +1,134 @@
+package email
+
+import (
+	htmltemplate "html/template"
+	"testing"
+	"text/template"
+)
+
+const (
+	textTemplateString = `{{define "T1.txt"}}{{.gift}} from {{.from}} to {{.to}}.{{end}}
+{{define "T3.txt"}}Hello there, {{.name}}!{{end}}
+`
+	htmlTemplateString = `{{define "T1.html"}}<html><body>{{.gift}} from {{.from}} to {{.to}}.</body></html>{{end}}
+{{define "T2.html"}}<html><body>Hello, {{.name}}!</body></html>{{end}}
+`
+)
+
+type testEmailer struct {
+	from, subject, text, html string
+	to                        []string
+}
+
+func (t *testEmailer) SendMail(from, subject, text, html string, to ...string) error {
+	t.from = from
+	t.subject = subject
+	t.text = text
+	t.html = html
+	t.to = to
+	return nil
+}
+
+func TestTemplatizedEmailSendMail(t *testing.T) {
+	textTemplates := template.New("text")
+	_, err := textTemplates.Parse(textTemplateString)
+	if err != nil {
+		t.Fatalf("error parsing text templates: %v", err)
+	}
+
+	htmlTemplates := htmltemplate.New("html")
+	_, err = htmlTemplates.Parse(htmlTemplateString)
+	if err != nil {
+		t.Fatalf("error parsing html templates: %v", err)
+	}
+
+	htmlStart := "<html><body>"
+	htmlEnd := "</body></html>"
+	tests := []struct {
+		tplName           string
+		from, to, subject string
+		data              map[string]interface{}
+		wantText          string
+		wantHtml          string
+		wantErr           bool
+	}{
+		{
+			tplName: "T1",
+			from:    "bob@example.com",
+			to:      "alice@example.com",
+			subject: "hello there",
+			data: map[string]interface{}{
+				"gift": "Greetings",
+			},
+			wantText: "Greetings from bob@example.com to alice@example.com.",
+			wantHtml: htmlStart + "Greetings from bob@example.com to alice@example.com." + htmlEnd,
+		},
+		{
+			tplName: "T2",
+			from:    "bob@example.com",
+			to:      "alice@example.com",
+			subject: "hello there",
+			data: map[string]interface{}{
+				"name": "Alice",
+			},
+			wantText: "",
+			wantHtml: htmlStart + "Hello, Alice!" + htmlEnd,
+		},
+		{
+			tplName: "T3",
+			from:    "bob@example.com",
+			to:      "alice@example.com",
+			subject: "hello there",
+			data: map[string]interface{}{
+				"name": "Alice",
+			},
+			wantText: "Hello there, Alice!",
+			wantHtml: "",
+		},
+		{
+			// make sure HTML stuff gets escaped.
+			tplName: "T2",
+			from:    "bob@example.com",
+			to:      "alice@example.com",
+			subject: "hello there",
+			data: map[string]interface{}{
+				"name": "Alice<script>alert('hacked!')</script>",
+			},
+			wantText: "",
+			wantHtml: htmlStart + "Hello, Alice&lt;script&gt;alert(&#39;hacked!&#39;)&lt;/script&gt;!" + htmlEnd,
+		},
+	}
+
+	for i, tt := range tests {
+		emailer := &testEmailer{}
+		templatizer := NewTemplatizedEmailerFromTemplates(textTemplates, htmlTemplates, emailer)
+		err := templatizer.SendMail(tt.from, tt.subject, tt.tplName, tt.data, tt.to)
+		if tt.wantErr {
+			if err == nil {
+				t.Errorf("case %d: err == nil, want non-nil err", i)
+			}
+			continue
+		}
+
+		if emailer.from != tt.from {
+			t.Errorf("case %d: want=%q, got=%q", i, tt.from, emailer.from)
+		}
+		if emailer.subject != tt.subject {
+			t.Errorf("case %d: want=%q, got=%q", i, tt.subject, emailer.subject)
+		}
+		if emailer.text != tt.wantText {
+			t.Errorf("case %d: want=%q, got=%q", i, tt.wantText, emailer.text)
+		}
+		if emailer.html != tt.wantHtml {
+			t.Errorf("case %d: want=%q, got=%q", i, tt.wantHtml, emailer.html)
+		}
+		if len(emailer.to) != 1 {
+			t.Errorf("case %d: want=1, got=%d", i, len(emailer.to))
+		}
+		if emailer.to[0] != tt.to {
+			t.Errorf("case %d: want=%q, got=%q", i, tt.to, emailer.to[0])
+		}
+
+	}
+
+}
diff --git a/examples/README.md b/examples/README.md
new file mode 100644
index 00000000..63de9e47
--- /dev/null
+++ b/examples/README.md
@@ -0,0 +1,46 @@
+Running Examples
+===
+
+The quickest way to start experimenting with dex is to run a single dex-worker locally, with an in-process 
+database, and then interacting with it using the example programs in this directory.
+
+
+## Build Everything and Start dex-worker
+
+This section is required for both the Example App and the Example CLI. 
+
+1. Build everything:
+   ```
+   ./build
+   ```
+   
+1. Copy `static/fixtures/connectors.json.sample`
+    ```
+    cp static/fixtures/connectors.json.sample static/fixtures/connectors.json
+    ```
+    
+1. Run dex_worker in local mode.
+    ```
+    ./bin/dex-worker --no-db &
+    ```
+
+
+## Example App
+
+1. Build and run example app webserver, pointing the discovery URL to local Dex, and 
+supplying the client information from `./static/fixtures/clients.json` into the flags.
+   ```
+   ./bin/app --client-id=XXX --client-secret=secrete --discovery=http://127.0.0.1:5556 
+   ```
+
+1. Navigate browser to `http://localhost:5555` and click "login" link
+1. Click "Login with Local"
+1. Enter in sample credentials from `static/fixtures/connectors.json`:
+   ```
+   user: elroy77
+   password: bones
+   ```
+1. Observe user information in example app.
+  
+## Example CLI
+*TODO*
diff --git a/examples/app/main.go b/examples/app/main.go
new file mode 100644
index 00000000..68bb12e5
--- /dev/null
+++ b/examples/app/main.go
@@ -0,0 +1,234 @@
+package main
+
+import (
+	"bytes"
+	"encoding/json"
+	"flag"
+	"fmt"
+	"net"
+	"net/http"
+	"net/url"
+	"os"
+	"time"
+
+	pflag "github.com/coreos/dex/pkg/flag"
+	phttp "github.com/coreos/dex/pkg/http"
+	"github.com/coreos/dex/pkg/log"
+	"github.com/coreos/go-oidc/oidc"
+)
+
+var (
+	pathCallback = "/callback"
+)
+
+func main() {
+	fs := flag.NewFlagSet("oidc-app", flag.ExitOnError)
+	listen := fs.String("listen", "http://127.0.0.1:5555", "")
+	redirectURL := fs.String("redirect-url", "http://127.0.0.1:5555/callback", "")
+	clientID := fs.String("client-id", "", "")
+	clientSecret := fs.String("client-secret", "", "")
+	discovery := fs.String("discovery", "https://accounts.google.com", "")
+	logDebug := fs.Bool("log-debug", false, "log debug-level information")
+	logTimestamps := fs.Bool("log-timestamps", false, "prefix log lines with timestamps")
+
+	if err := fs.Parse(os.Args[1:]); err != nil {
+		fmt.Fprintln(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+
+	if err := pflag.SetFlagsFromEnv(fs, "EXAMPLE_APP"); err != nil {
+		fmt.Fprintln(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+
+	if *logDebug {
+		log.EnableDebug()
+	}
+	if *logTimestamps {
+		log.EnableTimestamps()
+	}
+
+	if *clientID == "" {
+		log.Fatal("--client-id must be set")
+	}
+
+	if *clientSecret == "" {
+		log.Fatal("--client-secret must be set")
+	}
+
+	l, err := url.Parse(*listen)
+	if err != nil {
+		log.Fatalf("Unable to use --listen flag: %v", err)
+	}
+
+	_, p, err := net.SplitHostPort(l.Host)
+	if err != nil {
+		log.Fatalf("Unable to parse host from --listen flag: %v", err)
+	}
+
+	cc := oidc.ClientCredentials{
+		ID:     *clientID,
+		Secret: *clientSecret,
+	}
+
+	var cfg oidc.ProviderConfig
+	for {
+		cfg, err = oidc.FetchProviderConfig(http.DefaultClient, *discovery)
+		if err == nil {
+			break
+		}
+
+		sleep := 3 * time.Second
+		log.Errorf("Failed fetching provider config, trying again in %v: %v", sleep, err)
+		time.Sleep(sleep)
+	}
+
+	log.Infof("Fetched provider config from %s: %#v", *discovery, cfg)
+
+	ccfg := oidc.ClientConfig{
+		ProviderConfig: cfg,
+		Credentials:    cc,
+		RedirectURL:    *redirectURL,
+	}
+
+	client, err := oidc.NewClient(ccfg)
+	if err != nil {
+		log.Fatalf("Unable to create Client: %v", err)
+	}
+
+	client.SyncProviderConfig(*discovery)
+
+	redirectURLParsed, err := url.Parse(*redirectURL)
+	if err != nil {
+		log.Fatalf("Unable to parse url from --redirect-url flag: %v", err)
+	}
+	hdlr := NewClientHandler(client, *discovery, *redirectURLParsed)
+	httpsrv := &http.Server{
+		Addr:    fmt.Sprintf(":%s", p),
+		Handler: hdlr,
+	}
+
+	log.Infof("Binding to %s...", httpsrv.Addr)
+	log.Fatal(httpsrv.ListenAndServe())
+}
+
+func NewClientHandler(c *oidc.Client, issuer string, cbURL url.URL) http.Handler {
+	mux := http.NewServeMux()
+
+	issuerURL, err := url.Parse(issuer)
+	if err != nil {
+		log.Fatalf("Could not parse issuer url: %v", err)
+	}
+
+	mux.HandleFunc("/", handleIndex)
+	mux.HandleFunc("/login", handleLoginFunc(c))
+	mux.HandleFunc("/register", handleRegisterFunc(c))
+	mux.HandleFunc(pathCallback, handleCallbackFunc(c))
+
+	resendURL := *issuerURL
+	resendURL.Path = "/resend-verify-email"
+
+	mux.HandleFunc("/resend", handleResendFunc(c, *issuerURL, resendURL, cbURL))
+	return mux
+}
+
+func handleIndex(w http.ResponseWriter, r *http.Request) {
+	w.Write([]byte("<a href='/login'>login</a>"))
+	w.Write([]byte("<br>"))
+	w.Write([]byte("<a href='/register'>register</a>"))
+}
+
+func handleLoginFunc(c *oidc.Client) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		oac, err := c.OAuthClient()
+		if err != nil {
+			panic("unable to proceed")
+		}
+
+		u, err := url.Parse(oac.AuthCodeURL("", "", ""))
+		if err != nil {
+			panic("unable to proceed")
+		}
+		http.Redirect(w, r, u.String(), http.StatusFound)
+	}
+}
+
+func handleRegisterFunc(c *oidc.Client) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		oac, err := c.OAuthClient()
+		if err != nil {
+			panic("unable to proceed")
+		}
+
+		u, err := url.Parse(oac.AuthCodeURL("", "", ""))
+		q := u.Query()
+		q.Set("register", "1")
+		if err != nil {
+			panic("unable to proceed")
+		}
+		u.RawQuery = q.Encode()
+		log.Infof("URL: %v", u.String())
+		http.Redirect(w, r, u.String(), http.StatusFound)
+	}
+}
+
+func handleResendFunc(c *oidc.Client, issuerURL, resendURL, cbURL url.URL) http.HandlerFunc {
+	trans := &oidc.AuthenticatedTransport{
+		TokenRefresher: &oidc.ClientCredsTokenRefresher{
+			Issuer:     issuerURL.String(),
+			OIDCClient: c,
+		},
+		RoundTripper: http.DefaultTransport,
+	}
+	hc := &http.Client{Transport: trans}
+
+	return func(w http.ResponseWriter, r *http.Request) {
+		err := r.ParseForm()
+		if err != nil {
+			panic("unable to proceed")
+		}
+
+		tok := r.Form.Get("jwt")
+		q := struct {
+			Token       string `json:"token"`
+			RedirectURI string `json:"redirectURI"`
+		}{
+			Token:       tok,
+			RedirectURI: cbURL.String(),
+		}
+		qBytes, err := json.Marshal(&q)
+		res, err := hc.Post(resendURL.String(), "application/json", bytes.NewReader(qBytes))
+		if err != nil {
+			log.Fatalf("error requesting email resend:", err)
+		}
+
+		w.Write([]byte(fmt.Sprintf("Status from Dex: %v", res.Status)))
+	}
+}
+
+func handleCallbackFunc(c *oidc.Client) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		code := r.URL.Query().Get("code")
+		if code == "" {
+			phttp.WriteError(w, http.StatusBadRequest, "code query param must be set")
+			return
+		}
+
+		tok, err := c.ExchangeAuthCode(code)
+		if err != nil {
+			phttp.WriteError(w, http.StatusBadRequest, fmt.Sprintf("unable to verify auth code with issuer: %v", err))
+			return
+		}
+
+		claims, err := tok.Claims()
+		if err != nil {
+			phttp.WriteError(w, http.StatusBadRequest, fmt.Sprintf("unable to construct claims: %v", err))
+			return
+		}
+
+		s := fmt.Sprintf(`<html><body>Claims: %v <br>
+        <a href="/resend?jwt=%s">Resend Verification Email</a>
+</body></html>`, claims, tok.Encode())
+		w.Write([]byte(s))
+	}
+}
diff --git a/examples/cli/main.go b/examples/cli/main.go
new file mode 100644
index 00000000..ec2168cd
--- /dev/null
+++ b/examples/cli/main.go
@@ -0,0 +1,96 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"net/http"
+	"os"
+	"time"
+
+	pflag "github.com/coreos/dex/pkg/flag"
+	"github.com/coreos/dex/pkg/log"
+	"github.com/coreos/go-oidc/oidc"
+)
+
+func main() {
+	fs := flag.NewFlagSet("example-cli", flag.ExitOnError)
+	clientID := fs.String("client-id", "", "")
+	clientSecret := fs.String("client-secret", "", "")
+	discovery := fs.String("discovery", "http://localhost:5556", "")
+	logDebug := fs.Bool("log-debug", false, "log debug-level information")
+	logTimestamps := fs.Bool("log-timestamps", false, "prefix log lines with timestamps")
+
+	if err := fs.Parse(os.Args[1:]); err != nil {
+		fmt.Fprintln(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+
+	if err := pflag.SetFlagsFromEnv(fs, "EXAMPLE_CLI"); err != nil {
+		fmt.Fprintln(os.Stderr, err.Error())
+		os.Exit(1)
+	}
+
+	if *logDebug {
+		log.EnableDebug()
+	}
+	if *logTimestamps {
+		log.EnableTimestamps()
+	}
+
+	if *clientID == "" {
+		fmt.Println("--client-id must be set")
+		os.Exit(2)
+	}
+
+	if *clientSecret == "" {
+		fmt.Println("--client-secret must be set")
+		os.Exit(2)
+	}
+
+	cc := oidc.ClientCredentials{
+		ID:     *clientID,
+		Secret: *clientSecret,
+	}
+
+	// NOTE: A real CLI would cache this config, or provide it via flags/config file.
+	var cfg oidc.ProviderConfig
+	var err error
+	for {
+		cfg, err = oidc.FetchProviderConfig(http.DefaultClient, *discovery)
+		if err == nil {
+			break
+		}
+
+		sleep := 1 * time.Second
+		fmt.Printf("Failed fetching provider config, trying again in %v: %v\n", sleep, err)
+		time.Sleep(sleep)
+	}
+
+	fmt.Printf("Fetched provider config from %s: %#v\n\n", *discovery, cfg)
+
+	ccfg := oidc.ClientConfig{
+		ProviderConfig: cfg,
+		Credentials:    cc,
+	}
+
+	client, err := oidc.NewClient(ccfg)
+	if err != nil {
+		log.Fatalf("Unable to create Client: %v", err)
+	}
+
+	tok, err := client.ClientCredsToken([]string{"openid"})
+	if err != nil {
+		fmt.Printf("unable to verify auth code with issuer: %v\n", err)
+		os.Exit(1)
+	}
+
+	fmt.Printf("got jwt: %v\n\n", tok.Encode())
+
+	claims, err := tok.Claims()
+	if err != nil {
+		fmt.Printf("unable to construct claims: %v\n", err)
+		os.Exit(1)
+	}
+
+	fmt.Printf("got claims %#v...\n", claims)
+}
diff --git a/examples/emailtester/main.go b/examples/emailtester/main.go
new file mode 100644
index 00000000..cbf15ca4
--- /dev/null
+++ b/examples/emailtester/main.go
@@ -0,0 +1,80 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"os"
+	"strings"
+
+	"github.com/coreos/dex/email"
+	"github.com/coreos/dex/pkg/log"
+)
+
+func getEmailer(emailerConfigFile, emailTemplateDir string) (*email.TemplatizedEmailer, error) {
+	cfg, err := email.NewEmailerConfigFromFile(emailerConfigFile)
+	if err != nil {
+		return nil, err
+	}
+
+	emailer, err := cfg.Emailer()
+	if err != nil {
+		return nil, err
+	}
+
+	tMailer, err := email.NewTemplatizedEmailerFromGlobs(emailTemplateDir+"/*.txt", emailTemplateDir+"/*.html", emailer)
+	if err != nil {
+		return nil, err
+	}
+
+	return tMailer, nil
+}
+
+var (
+	tpls = map[string]map[string]interface{}{
+		"verify-email": map[string]interface{}{
+			"email": "test@example.com",
+			"link":  "http://text.example.com",
+		},
+	}
+)
+
+func stderr(format string, args ...interface{}) {
+	if !strings.HasSuffix(format, "\n") {
+		format = format + "\n"
+	}
+	fmt.Fprintf(os.Stderr, format, args...)
+}
+
+func die(format string, args ...interface{}) {
+	stderr(format, args...)
+	os.Exit(1)
+}
+
+func main() {
+	log.EnableDebug()
+
+	emailTemplates := flag.String("templates-dir", "./static/email", "directory of email template files")
+	emailFrom := flag.String("from", "no-reply@coreos.com", "")
+	emailTo := flag.String("to", "", "")
+	emailConfig := flag.String("cfg", "./static/fixtures/emailer.json", "configures emailer.")
+	tplName := flag.String("template", "verify-email", "which email template to use.")
+	flag.Parse()
+	emailer, err := getEmailer(*emailConfig, *emailTemplates)
+	if err != nil {
+		die("Error getting emailer: %v", err)
+	}
+
+	data, ok := tpls[*tplName]
+	if !ok {
+		die("no such template.")
+	}
+
+	if *emailTo == "" {
+		die("--email-to is required")
+	}
+	err = emailer.SendMail(*emailFrom, "TEST EMAIL", *tplName, data, *emailTo)
+	if err != nil {
+		die("err: %v", err)
+	}
+
+}
diff --git a/functional/db_test.go b/functional/db_test.go
new file mode 100644
index 00000000..f4bc53eb
--- /dev/null
+++ b/functional/db_test.go
@@ -0,0 +1,414 @@
+package functional
+
+import (
+	"fmt"
+	"net/url"
+	"os"
+	"testing"
+	"time"
+
+	"github.com/coopernurse/gorp"
+	"github.com/coreos/go-oidc/key"
+	"github.com/coreos/go-oidc/oidc"
+	"github.com/kylelemons/godebug/pretty"
+
+	"github.com/coreos/dex/client"
+	"github.com/coreos/dex/db"
+	"github.com/coreos/dex/refresh"
+	"github.com/coreos/dex/session"
+)
+
+var (
+	dsn string
+)
+
+func init() {
+	dsn = os.Getenv("DEX_TEST_DSN")
+	if dsn == "" {
+		fmt.Println("Unable to proceed with empty env var DEX_TEST_DSN")
+		os.Exit(1)
+	}
+}
+
+func connect(t *testing.T) *gorp.DbMap {
+	c, err := db.NewConnection(db.Config{DSN: dsn})
+	if err != nil {
+		t.Fatalf("Unable to connect to database: %v", err)
+	}
+
+	if err = c.DropTablesIfExists(); err != nil {
+		t.Fatalf("Unable to drop database tables: %v", err)
+	}
+
+	if err = c.CreateTablesIfNotExists(); err != nil {
+		t.Fatalf("Unable to create database tables: %v", err)
+	}
+
+	return c
+}
+
+func TestDBSessionKeyRepoPushPop(t *testing.T) {
+	r := db.NewSessionKeyRepo(connect(t))
+
+	key := "123"
+	sessionID := "456"
+
+	r.Push(session.SessionKey{Key: key, SessionID: sessionID}, time.Second)
+
+	got, err := r.Pop(key)
+	if err != nil {
+		t.Fatalf("Expected nil error: %v", err)
+	}
+	if got != sessionID {
+		t.Fatalf("Incorrect sessionID: want=%s got=%s", sessionID, got)
+	}
+
+	// attempting to Pop a second time must fail
+	if _, err := r.Pop(key); err == nil {
+		t.Fatalf("Second call to Pop succeeded, expected non-nil error")
+	}
+}
+
+func TestDBSessionRepoCreateUpdate(t *testing.T) {
+	r := db.NewSessionRepo(connect(t))
+
+	// postgres stores its time type with a lower precision
+	// than we generate here. Stripping off nanoseconds gives
+	// us a predictable value to use in comparisions.
+	now := time.Now().Round(time.Second).UTC()
+
+	ses := session.Session{
+		ID:          "AAA",
+		State:       session.SessionStateIdentified,
+		CreatedAt:   now,
+		ExpiresAt:   now.Add(time.Minute),
+		ClientID:    "ZZZ",
+		ClientState: "foo",
+		RedirectURL: url.URL{
+			Scheme: "http",
+			Host:   "example.com",
+			Path:   "/callback",
+		},
+		Identity: oidc.Identity{
+			ID:        "YYY",
+			Name:      "Elroy",
+			Email:     "elroy@example.com",
+			ExpiresAt: now.Add(time.Minute),
+		},
+	}
+
+	if err := r.Create(ses); err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	got, err := r.Get(ses.ID)
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	if diff := pretty.Compare(ses, got); diff != "" {
+		t.Fatalf("Retrieved incorrect Session: Compare(want,got): %v", diff)
+	}
+}
+
+func TestDBPrivateKeySetRepoSetGet(t *testing.T) {
+	r, err := db.NewPrivateKeySetRepo(connect(t), "roflroflroflroflroflroflroflrofl")
+	if err != nil {
+		t.Fatalf(err.Error())
+	}
+
+	k1, err := key.GeneratePrivateKey()
+	if err != nil {
+		t.Fatalf("Unable to generate RSA key: %v", err)
+	}
+
+	k2, err := key.GeneratePrivateKey()
+	if err != nil {
+		t.Fatalf("Unable to generate RSA key: %v", err)
+	}
+
+	ks := key.NewPrivateKeySet([]*key.PrivateKey{k1, k2}, time.Now().Add(time.Minute))
+	if err := r.Set(ks); err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	got, err := r.Get()
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	if diff := pretty.Compare(ks, got); diff != "" {
+		t.Fatalf("Retrieved incorrect KeySet: Compare(want,got): %v", diff)
+	}
+}
+
+func TestDBClientIdentityRepoMetadata(t *testing.T) {
+	r := db.NewClientIdentityRepo(connect(t))
+
+	cm := oidc.ClientMetadata{
+		RedirectURLs: []url.URL{
+			url.URL{Scheme: "http", Host: "127.0.0.1:5556", Path: "/cb"},
+			url.URL{Scheme: "https", Host: "example.com", Path: "/callback"},
+		},
+	}
+
+	_, err := r.New("foo", cm)
+	if err != nil {
+		t.Fatalf(err.Error())
+	}
+
+	got, err := r.Metadata("foo")
+	if err != nil {
+		t.Fatalf(err.Error())
+	}
+
+	if diff := pretty.Compare(cm, *got); diff != "" {
+		t.Fatalf("Retrieved incorrect ClientMetadata: Compare(want,got): %v", diff)
+	}
+}
+
+func TestDBClientIdentityRepoMetadataNoExist(t *testing.T) {
+	r := db.NewClientIdentityRepo(connect(t))
+
+	got, err := r.Metadata("noexist")
+	if err != client.ErrorNotFound {
+		t.Errorf("want==%q, got==%q", client.ErrorNotFound, err)
+	}
+	if got != nil {
+		t.Fatalf("Retrieved incorrect ClientMetadata: want=nil got=%#v", got)
+	}
+}
+
+func TestDBClientIdentityRepoNewDuplicate(t *testing.T) {
+	r := db.NewClientIdentityRepo(connect(t))
+
+	meta1 := oidc.ClientMetadata{
+		RedirectURLs: []url.URL{
+			url.URL{Scheme: "http", Host: "foo.example.com"},
+		},
+	}
+
+	if _, err := r.New("foo", meta1); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	meta2 := oidc.ClientMetadata{
+		RedirectURLs: []url.URL{
+			url.URL{Scheme: "http", Host: "bar.example.com"},
+		},
+	}
+
+	if _, err := r.New("foo", meta2); err == nil {
+		t.Fatalf("expected non-nil error")
+	}
+}
+
+func TestDBClientIdentityRepoAuthenticate(t *testing.T) {
+	r := db.NewClientIdentityRepo(connect(t))
+
+	cm := oidc.ClientMetadata{
+		RedirectURLs: []url.URL{
+			url.URL{Scheme: "http", Host: "127.0.0.1:5556", Path: "/cb"},
+		},
+	}
+
+	cc, err := r.New("baz", cm)
+	if err != nil {
+		t.Fatalf(err.Error())
+	}
+
+	if cc.ID != "baz" {
+		t.Fatalf("Returned ClientCredentials has incorrect ID: want=baz got=%s", cc.ID)
+	}
+
+	ok, err := r.Authenticate(*cc)
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	} else if !ok {
+		t.Fatalf("Authentication failed for good creds")
+	}
+
+	creds := []oidc.ClientCredentials{
+		// completely made up
+		oidc.ClientCredentials{ID: "foo", Secret: "bar"},
+
+		// good client ID, bad secret
+		oidc.ClientCredentials{ID: cc.ID, Secret: "bar"},
+
+		// bad client ID, good secret
+		oidc.ClientCredentials{ID: "foo", Secret: cc.Secret},
+
+		// good client ID, secret with some fluff on the end
+		oidc.ClientCredentials{ID: cc.ID, Secret: fmt.Sprintf("%sfluff", cc.Secret)},
+	}
+	for i, c := range creds {
+		ok, err := r.Authenticate(c)
+		if err != nil {
+			t.Errorf("case %d: unexpected error: %v", i, err)
+		} else if ok {
+			t.Errorf("case %d: authentication succeeded for bad creds", i)
+		}
+	}
+}
+
+func TestDBClientIdentityAll(t *testing.T) {
+	r := db.NewClientIdentityRepo(connect(t))
+
+	cm := oidc.ClientMetadata{
+		RedirectURLs: []url.URL{
+			url.URL{Scheme: "http", Host: "127.0.0.1:5556", Path: "/cb"},
+		},
+	}
+
+	_, err := r.New("foo", cm)
+	if err != nil {
+		t.Fatalf(err.Error())
+	}
+
+	got, err := r.All()
+	if err != nil {
+		t.Fatalf(err.Error())
+	}
+	count := len(got)
+	if count != 1 {
+		t.Fatalf("Retrieved incorrect number of ClientIdentities: want=1 got=%d", count)
+	}
+
+	if diff := pretty.Compare(cm, got[0].Metadata); diff != "" {
+		t.Fatalf("Retrieved incorrect ClientMetadata: Compare(want,got): %v", diff)
+	}
+
+	cm = oidc.ClientMetadata{
+		RedirectURLs: []url.URL{
+			url.URL{Scheme: "http", Host: "foo.com", Path: "/cb"},
+		},
+	}
+	_, err = r.New("bar", cm)
+	if err != nil {
+		t.Fatalf(err.Error())
+	}
+
+	got, err = r.All()
+	if err != nil {
+		t.Fatalf(err.Error())
+	}
+	count = len(got)
+	if count != 2 {
+		t.Fatalf("Retrieved incorrect number of ClientIdentities: want=2 got=%d", count)
+	}
+}
+
+func TestDBRefreshRepoCreate(t *testing.T) {
+	r := db.NewRefreshTokenRepo(connect(t))
+
+	tests := []struct {
+		userID   string
+		clientID string
+		err      error
+	}{
+		{
+			"",
+			"client-foo",
+			refresh.ErrorInvalidUserID,
+		},
+		{
+			"user-foo",
+			"",
+			refresh.ErrorInvalidClientID,
+		},
+		{
+			"user-foo",
+			"client-foo",
+			nil,
+		},
+	}
+
+	for i, tt := range tests {
+		_, err := r.Create(tt.userID, tt.clientID)
+		if err != tt.err {
+			t.Errorf("Case #%d: expected: %v, got: %v", i, tt.err, err)
+		}
+	}
+}
+
+func TestDBRefreshRepoVerify(t *testing.T) {
+	r := db.NewRefreshTokenRepo(connect(t))
+
+	token, err := r.Create("user-foo", "client-foo")
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	tests := []struct {
+		token    string
+		creds    oidc.ClientCredentials
+		err      error
+		expected string
+	}{
+		{
+			"invalid-token-foo",
+			oidc.ClientCredentials{ID: "client-foo", Secret: "secret-foo"},
+			refresh.ErrorInvalidToken,
+			"",
+		},
+		{
+			token,
+			oidc.ClientCredentials{ID: "invalid-client", Secret: "secret-foo"},
+			refresh.ErrorInvalidClientID,
+			"",
+		},
+		{
+			token,
+			oidc.ClientCredentials{ID: "client-foo", Secret: "secret-foo"},
+			nil,
+			"user-foo",
+		},
+	}
+
+	for i, tt := range tests {
+		result, err := r.Verify(tt.creds.ID, tt.token)
+		if err != tt.err {
+			t.Errorf("Case #%d: expected: %v, got: %v", i, tt.err, err)
+		}
+		if result != tt.expected {
+			t.Errorf("Case #%d: expected: %v, got: %v", i, tt.expected, result)
+		}
+	}
+}
+
+func TestDBRefreshRepoRevoke(t *testing.T) {
+	r := db.NewRefreshTokenRepo(connect(t))
+
+	token, err := r.Create("user-foo", "client-foo")
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	tests := []struct {
+		token  string
+		userID string
+		err    error
+	}{
+		{
+			"invalid-token-foo",
+			"user-foo",
+			refresh.ErrorInvalidToken,
+		},
+		{
+			token,
+			"invalid-user",
+			refresh.ErrorInvalidUserID,
+		},
+		{
+			token,
+			"user-foo",
+			nil,
+		},
+	}
+
+	for i, tt := range tests {
+		if err := r.Revoke(tt.userID, tt.token); err != tt.err {
+			t.Errorf("Case #%d: expected: %v, got: %v", i, tt.err, err)
+		}
+	}
+}
diff --git a/functional/repo/client_repo_test.go b/functional/repo/client_repo_test.go
new file mode 100644
index 00000000..81e73bea
--- /dev/null
+++ b/functional/repo/client_repo_test.go
@@ -0,0 +1,153 @@
+package repo
+
+import (
+	"fmt"
+	"net/url"
+	"os"
+	"testing"
+
+	"github.com/coreos/go-oidc/oidc"
+
+	"github.com/coreos/dex/client"
+	"github.com/coreos/dex/db"
+)
+
+var makeTestClientIdentityRepoFromClients func(clients []oidc.ClientIdentity) client.ClientIdentityRepo
+
+var (
+	testClients = []oidc.ClientIdentity{
+		oidc.ClientIdentity{
+			Credentials: oidc.ClientCredentials{
+				ID:     "client1",
+				Secret: "secret-1",
+			},
+			Metadata: oidc.ClientMetadata{
+				RedirectURLs: []url.URL{
+					url.URL{
+						Scheme: "https",
+						Host:   "client1.example.com/callback",
+					},
+				},
+			},
+		},
+		oidc.ClientIdentity{
+			Credentials: oidc.ClientCredentials{
+				ID:     "client2",
+				Secret: "secret-2",
+			},
+			Metadata: oidc.ClientMetadata{
+				RedirectURLs: []url.URL{
+					url.URL{
+						Scheme: "https",
+						Host:   "client2.example.com/callback",
+					},
+				},
+			},
+		},
+	}
+)
+
+func init() {
+	dsn := os.Getenv("DEX_TEST_DSN")
+	if dsn == "" {
+		makeTestClientIdentityRepoFromClients = makeTestClientIdentityRepoMem
+	} else {
+		makeTestClientIdentityRepoFromClients = makeTestClientIdentityRepoDB(dsn)
+	}
+}
+
+func makeTestClientIdentityRepoMem(clients []oidc.ClientIdentity) client.ClientIdentityRepo {
+	return client.NewClientIdentityRepo(clients)
+}
+
+func makeTestClientIdentityRepoDB(dsn string) func([]oidc.ClientIdentity) client.ClientIdentityRepo {
+	return func(clients []oidc.ClientIdentity) client.ClientIdentityRepo {
+		c := initDB(dsn)
+
+		repo, err := db.NewClientIdentityRepoFromClients(c, clients)
+		if err != nil {
+			panic(fmt.Sprintf("Unable to add clients: %v", err))
+		}
+		return repo
+	}
+
+}
+
+func makeTestClientIdentityRepo() client.ClientIdentityRepo {
+	return makeTestClientIdentityRepoFromClients(testClients)
+}
+
+func TestGetSetAdminClient(t *testing.T) {
+	startAdmins := []string{"client2"}
+	tests := []struct {
+		// client ID
+		cid string
+
+		// initial state of client
+		wantAdmin bool
+
+		// final state of client
+		setAdmin bool
+
+		wantErr bool
+	}{
+		{
+			cid:       "client1",
+			wantAdmin: false,
+			setAdmin:  true,
+		},
+		{
+			cid:       "client1",
+			wantAdmin: false,
+			setAdmin:  false,
+		},
+		{
+			cid:       "client2",
+			wantAdmin: true,
+			setAdmin:  true,
+		},
+		{
+			cid:       "client2",
+			wantAdmin: true,
+			setAdmin:  false,
+		},
+	}
+
+	for i, tt := range tests {
+		repo := makeTestClientIdentityRepo()
+		for _, cid := range startAdmins {
+			err := repo.SetDexAdmin(cid, true)
+			if err != nil {
+				t.Fatalf("case %d: unexpected error: %v", i, err)
+			}
+		}
+
+		gotAdmin, err := repo.IsDexAdmin(tt.cid)
+		if tt.wantErr {
+			if err == nil {
+				t.Errorf("case %d: want non-nil err", i)
+			}
+			continue
+		}
+		if err != nil {
+			t.Fatalf("case %d: unexpected error: %v", i, err)
+		}
+		if gotAdmin != tt.wantAdmin {
+			t.Errorf("case %d: want=%v, got=%v", i, tt.wantAdmin, gotAdmin)
+		}
+
+		err = repo.SetDexAdmin(tt.cid, tt.setAdmin)
+		if err != nil {
+			t.Fatalf("case %d: unexpected error: %v", i, err)
+		}
+
+		gotAdmin, err = repo.IsDexAdmin(tt.cid)
+		if err != nil {
+			t.Fatalf("case %d: unexpected error: %v", i, err)
+		}
+		if gotAdmin != tt.setAdmin {
+			t.Errorf("case %d: want=%v, got=%v", i, tt.setAdmin, gotAdmin)
+		}
+
+	}
+}
diff --git a/functional/repo/password_repo_test.go b/functional/repo/password_repo_test.go
new file mode 100644
index 00000000..762e5d8e
--- /dev/null
+++ b/functional/repo/password_repo_test.go
@@ -0,0 +1,167 @@
+package repo
+
+import (
+	"fmt"
+	"os"
+	"testing"
+	"time"
+
+	"github.com/kylelemons/godebug/pretty"
+
+	"github.com/coreos/dex/db"
+	"github.com/coreos/dex/user"
+)
+
+var makeTestPasswordInfoRepo func() user.PasswordInfoRepo
+
+var (
+	testPWs = []user.PasswordInfo{
+		{
+			UserID:   "ID-1",
+			Password: []byte("hi."),
+		},
+	}
+)
+
+func init() {
+	dsn := os.Getenv("DEX_TEST_DSN")
+	if dsn == "" {
+		makeTestPasswordInfoRepo = makeTestPasswordInfoRepoMem
+	} else {
+		makeTestPasswordInfoRepo = makeTestPasswordInfoRepoDB(dsn)
+	}
+}
+
+func makeTestPasswordInfoRepoMem() user.PasswordInfoRepo {
+	return user.NewPasswordInfoRepoFromPasswordInfos(testPWs)
+}
+
+func makeTestPasswordInfoRepoDB(dsn string) func() user.PasswordInfoRepo {
+	return func() user.PasswordInfoRepo {
+		c := initDB(dsn)
+
+		repo := db.NewPasswordInfoRepo(c)
+		err := user.LoadPasswordInfos(repo, testPWs)
+		if err != nil {
+			panic(fmt.Sprintf("Unable to add passwordInfos: %v", err))
+		}
+		return repo
+	}
+}
+
+func TestCreatePasswordInfo(t *testing.T) {
+	tests := []struct {
+		pw  user.PasswordInfo
+		err error
+	}{
+		{
+			pw: user.PasswordInfo{
+				UserID:   "ID-2",
+				Password: user.Password("bob@example.com"),
+			},
+			err: nil,
+		},
+		{
+			pw: user.PasswordInfo{
+				UserID:          "ID-3",
+				Password:        user.Password("1234"),
+				PasswordExpires: time.Now().Round(time.Second).UTC(),
+			},
+			err: nil,
+		},
+		{
+			pw: user.PasswordInfo{
+				UserID:          "ID-1",
+				Password:        user.Password("1234"),
+				PasswordExpires: time.Now().Round(time.Second).UTC(),
+			},
+			err: user.ErrorDuplicateID,
+		},
+		{
+			pw: user.PasswordInfo{
+				Password:        user.Password("1234"),
+				PasswordExpires: time.Now().Round(time.Second).UTC(),
+			},
+			err: user.ErrorInvalidID,
+		},
+	}
+
+	for i, tt := range tests {
+		repo := makeTestPasswordInfoRepo()
+		err := repo.Create(nil, tt.pw)
+		if tt.err != nil {
+			if err != tt.err {
+				t.Errorf("case %d: want=%v, got=%v", i, tt.err, err)
+			}
+		} else {
+			if err != nil {
+				t.Errorf("case %d: want nil err, got %v", i, err)
+			}
+
+			gotPW, err := repo.Get(nil, tt.pw.UserID)
+			if err != nil {
+				t.Errorf("case %d: want nil err, got %v", i, err)
+			}
+
+			if diff := pretty.Compare(tt.pw, gotPW); diff != "" {
+				t.Errorf("case %d: Compare(want, got) = %v", i,
+					diff)
+			}
+		}
+	}
+}
+
+func TestUpdatePasswordInfo(t *testing.T) {
+	tests := []struct {
+		pw  user.PasswordInfo
+		err error
+	}{
+		{
+			pw: user.PasswordInfo{
+				UserID:          "ID-1",
+				Password:        user.Password("new_pass"),
+				PasswordExpires: time.Now().Round(time.Second).UTC(),
+			},
+			err: nil,
+		},
+		{
+			pw: user.PasswordInfo{
+				UserID:          "ID-2",
+				Password:        user.Password("new_pass"),
+				PasswordExpires: time.Now().Round(time.Second).UTC(),
+			},
+			err: user.ErrorNotFound,
+		},
+		{
+			pw: user.PasswordInfo{
+				UserID:          "ID-1",
+				PasswordExpires: time.Now().Round(time.Second).UTC(),
+			},
+			err: user.ErrorInvalidPassword,
+		},
+	}
+
+	for i, tt := range tests {
+		repo := makeTestPasswordInfoRepo()
+		err := repo.Update(nil, tt.pw)
+		if tt.err != nil {
+			if err != tt.err {
+				t.Errorf("case %d: want=%q, got=%q", i, tt.err, err)
+			}
+		} else {
+			if err != nil {
+				t.Errorf("case %d: want nil err, got %q", i, err)
+			}
+
+			gotPW, err := repo.Get(nil, tt.pw.UserID)
+			if err != nil {
+				t.Errorf("case %d: want nil err, got %q", i, err)
+			}
+
+			if diff := pretty.Compare(tt.pw, gotPW); diff != "" {
+				t.Errorf("case %d: Compare(want, got) = %v", i,
+					diff)
+			}
+		}
+	}
+}
diff --git a/functional/repo/session_repo_test.go b/functional/repo/session_repo_test.go
new file mode 100644
index 00000000..6880a358
--- /dev/null
+++ b/functional/repo/session_repo_test.go
@@ -0,0 +1,195 @@
+package repo
+
+import (
+	"os"
+	"testing"
+	"time"
+
+	"github.com/jonboulle/clockwork"
+	"github.com/kylelemons/godebug/pretty"
+
+	"github.com/coreos/dex/db"
+	"github.com/coreos/dex/session"
+)
+
+var makeTestSessionRepo func() (session.SessionRepo, clockwork.FakeClock)
+var makeTestSessionKeyRepo func() (session.SessionKeyRepo, clockwork.FakeClock)
+
+func init() {
+	dsn := os.Getenv("DEX_TEST_DSN")
+	if dsn == "" {
+		makeTestSessionRepo = makeTestSessionRepoMem
+		makeTestSessionKeyRepo = makeTestSessionKeyRepoMem
+	} else {
+		makeTestSessionRepo = makeTestSessionRepoDB(dsn)
+		makeTestSessionKeyRepo = makeTestSessionKeyRepoDB(dsn)
+	}
+}
+
+func makeTestSessionRepoMem() (session.SessionRepo, clockwork.FakeClock) {
+	fc := clockwork.NewFakeClock()
+	return session.NewSessionRepoWithClock(fc), fc
+}
+
+func makeTestSessionRepoDB(dsn string) func() (session.SessionRepo, clockwork.FakeClock) {
+	return func() (session.SessionRepo, clockwork.FakeClock) {
+		c := initDB(dsn)
+		fc := clockwork.NewFakeClock()
+		return db.NewSessionRepoWithClock(c, fc), fc
+	}
+}
+
+func makeTestSessionKeyRepoMem() (session.SessionKeyRepo, clockwork.FakeClock) {
+	fc := clockwork.NewFakeClock()
+	return session.NewSessionKeyRepoWithClock(fc), fc
+}
+
+func makeTestSessionKeyRepoDB(dsn string) func() (session.SessionKeyRepo, clockwork.FakeClock) {
+	return func() (session.SessionKeyRepo, clockwork.FakeClock) {
+		c := initDB(dsn)
+		fc := clockwork.NewFakeClock()
+		return db.NewSessionKeyRepoWithClock(c, fc), fc
+	}
+}
+
+func TestSessionKeyRepoPopNoExist(t *testing.T) {
+	r, _ := makeTestSessionKeyRepo()
+
+	_, err := r.Pop("123")
+	if err == nil {
+		t.Fatalf("Expected error, got nil")
+	}
+}
+
+func TestSessionKeyRepoPushPop(t *testing.T) {
+	r, _ := makeTestSessionKeyRepo()
+
+	key := "123"
+	sessionID := "456"
+
+	r.Push(session.SessionKey{Key: key, SessionID: sessionID}, time.Second)
+
+	got, err := r.Pop(key)
+	if err != nil {
+		t.Fatalf("Expected nil error: %v", err)
+	}
+
+	if got != sessionID {
+		t.Fatalf("Incorrect sessionID: want=%s got=%s", sessionID, got)
+	}
+}
+
+func TestSessionKeyRepoExpired(t *testing.T) {
+	r, fc := makeTestSessionKeyRepo()
+
+	key := "123"
+	sessionID := "456"
+
+	r.Push(session.SessionKey{Key: key, SessionID: sessionID}, time.Second)
+
+	fc.Advance(2 * time.Second)
+
+	_, err := r.Pop(key)
+	if err == nil {
+		t.Fatalf("Expected error, got nil")
+	}
+}
+
+func TestSessionRepoGetNoExist(t *testing.T) {
+	r, _ := makeTestSessionRepo()
+
+	ses, err := r.Get("123")
+	if ses != nil {
+		t.Fatalf("Expected nil, got %#v", ses)
+	}
+	if err == nil {
+		t.Fatalf("Expected non-nil error")
+	}
+}
+
+func TestSessionRepoCreateGet(t *testing.T) {
+	tests := []session.Session{
+		session.Session{
+			ID:          "123",
+			ClientState: "blargh",
+			ExpiresAt:   time.Unix(123, 0).UTC(),
+		},
+		session.Session{
+			ID:          "456",
+			ClientState: "argh",
+			ExpiresAt:   time.Unix(456, 0).UTC(),
+			Register:    true,
+		},
+		session.Session{
+			ID:          "789",
+			ClientState: "blargh",
+			ExpiresAt:   time.Unix(789, 0).UTC(),
+			Nonce:       "oncenay",
+		},
+	}
+
+	for i, tt := range tests {
+		r, _ := makeTestSessionRepo()
+
+		r.Create(tt)
+
+		ses, _ := r.Get(tt.ID)
+		if ses == nil {
+			t.Fatalf("case %d: Expected non-nil Session", i)
+		}
+
+		if diff := pretty.Compare(tt, ses); diff != "" {
+			t.Errorf("case %d: Compare(want, got) = %v", i, diff)
+		}
+
+	}
+}
+
+func TestSessionRepoCreateUpdate(t *testing.T) {
+	tests := []struct {
+		initial session.Session
+		update  session.Session
+	}{
+		{
+			initial: session.Session{
+				ID:          "123",
+				ClientState: "blargh",
+				ExpiresAt:   time.Unix(123, 0).UTC(),
+			},
+			update: session.Session{
+				ID:          "123",
+				ClientState: "boom",
+				ExpiresAt:   time.Unix(123, 0).UTC(),
+				Register:    true,
+			},
+		},
+	}
+
+	for i, tt := range tests {
+		r, _ := makeTestSessionRepo()
+		r.Create(tt.initial)
+
+		ses, _ := r.Get(tt.initial.ID)
+		if diff := pretty.Compare(tt.initial, ses); diff != "" {
+			t.Errorf("case %d: Compare(want, got) = %v", i, diff)
+		}
+
+		r.Update(tt.update)
+		ses, _ = r.Get(tt.initial.ID)
+		if ses == nil {
+			t.Fatalf("Expected non-nil Session")
+		}
+		if diff := pretty.Compare(tt.update, ses); diff != "" {
+			t.Errorf("case %d: Compare(want, got) = %v", i, diff)
+		}
+	}
+}
+
+func TestSessionRepoUpdateNoExist(t *testing.T) {
+	r, _ := makeTestSessionRepo()
+
+	err := r.Update(session.Session{ID: "123", ClientState: "boom"})
+	if err == nil {
+		t.Fatalf("Expected non-nil error")
+	}
+}
diff --git a/functional/repo/testutil.go b/functional/repo/testutil.go
new file mode 100644
index 00000000..63bc963f
--- /dev/null
+++ b/functional/repo/testutil.go
@@ -0,0 +1,25 @@
+package repo
+
+import (
+	"fmt"
+
+	"github.com/coopernurse/gorp"
+
+	"github.com/coreos/dex/db"
+)
+
+func initDB(dsn string) *gorp.DbMap {
+	c, err := db.NewConnection(db.Config{DSN: dsn})
+	if err != nil {
+		panic(fmt.Sprintf("Unable to connect to database: %v", err))
+	}
+
+	if err = c.DropTablesIfExists(); err != nil {
+		panic(fmt.Sprintf("Unable to drop database tables: %v", err))
+	}
+
+	if err = c.CreateTablesIfNotExists(); err != nil {
+		panic(fmt.Sprintf("Unable to create database tables: %v", err))
+	}
+	return c
+}
diff --git a/functional/repo/user_repo_test.go b/functional/repo/user_repo_test.go
new file mode 100644
index 00000000..5a1ac934
--- /dev/null
+++ b/functional/repo/user_repo_test.go
@@ -0,0 +1,603 @@
+package repo
+
+import (
+	"fmt"
+	"os"
+	"reflect"
+	"testing"
+	"time"
+
+	"github.com/kylelemons/godebug/pretty"
+
+	"github.com/coreos/dex/db"
+	"github.com/coreos/dex/user"
+)
+
+var makeTestUserRepoFromUsers func(users []user.UserWithRemoteIdentities) user.UserRepo
+
+var (
+	testUsers = []user.UserWithRemoteIdentities{
+		{
+			User: user.User{
+				ID:        "ID-1",
+				Email:     "Email-1@example.com",
+				CreatedAt: time.Now().Truncate(time.Second),
+			},
+			RemoteIdentities: []user.RemoteIdentity{
+				{
+					ConnectorID: "IDPC-1",
+					ID:          "RID-1",
+				},
+			},
+		},
+		{
+			User: user.User{
+				ID:        "ID-2",
+				Email:     "Email-2@example.com",
+				CreatedAt: time.Now(),
+			},
+			RemoteIdentities: []user.RemoteIdentity{
+				{
+					ConnectorID: "IDPC-2",
+					ID:          "RID-2",
+				},
+			},
+		},
+	}
+)
+
+func init() {
+	dsn := os.Getenv("DEX_TEST_DSN")
+	if dsn == "" {
+		makeTestUserRepoFromUsers = makeTestUserRepoMem
+	} else {
+		makeTestUserRepoFromUsers = makeTestUserRepoDB(dsn)
+	}
+}
+
+func makeTestUserRepoMem(users []user.UserWithRemoteIdentities) user.UserRepo {
+	return user.NewUserRepoFromUsers(users)
+}
+
+func makeTestUserRepoDB(dsn string) func([]user.UserWithRemoteIdentities) user.UserRepo {
+	return func(users []user.UserWithRemoteIdentities) user.UserRepo {
+		c := initDB(dsn)
+
+		repo, err := db.NewUserRepoFromUsers(c, users)
+		if err != nil {
+			panic(fmt.Sprintf("Unable to add users: %v", err))
+		}
+		return repo
+	}
+
+}
+
+func makeTestUserRepo() user.UserRepo {
+	return makeTestUserRepoFromUsers(testUsers)
+}
+
+func TestNewUser(t *testing.T) {
+	now := time.Now().UTC().Truncate(time.Second)
+	tests := []struct {
+		user user.User
+		err  error
+	}{
+		{
+			user: user.User{
+				ID:        "ID-bob",
+				Email:     "bob@example.com",
+				CreatedAt: now,
+			},
+			err: nil,
+		},
+		{
+			user: user.User{
+				ID:        "ID-admin",
+				Email:     "admin@example.com",
+				Admin:     true,
+				CreatedAt: now,
+			},
+			err: nil,
+		},
+		{
+			user: user.User{
+				ID:            "ID-verified",
+				Email:         "verified@example.com",
+				EmailVerified: true,
+				CreatedAt:     now,
+			},
+			err: nil,
+		},
+		{
+			user: user.User{
+				ID:          "ID-same",
+				Email:       "Email-1@example.com",
+				DisplayName: "Oops Same Email",
+				CreatedAt:   now,
+			},
+			err: user.ErrorDuplicateEmail,
+		},
+		{
+			user: user.User{
+				Email:       "AnotherEmail@example.com",
+				DisplayName: "Can't set your own ID!",
+				CreatedAt:   now,
+			},
+			err: user.ErrorInvalidID,
+		},
+		{
+			user: user.User{
+				ID:          "ID-noemail",
+				DisplayName: "No Email",
+				CreatedAt:   now,
+			},
+			err: user.ErrorInvalidEmail,
+		},
+	}
+
+	for i, tt := range tests {
+		repo := makeTestUserRepo()
+		err := repo.Create(nil, tt.user)
+		if tt.err != nil {
+			if err != tt.err {
+				t.Errorf("case %d: want=%v, got=%v", i, tt.err, err)
+			}
+		} else {
+			if err != nil {
+				t.Errorf("case %d: want nil err, got %v", i, err)
+			}
+
+			gotUser, err := repo.Get(nil, tt.user.ID)
+			if err != nil {
+				t.Errorf("case %d: want nil err, got %v", i, err)
+			}
+
+			if diff := pretty.Compare(tt.user, gotUser); diff != "" {
+				t.Errorf("case %d: Compare(want, got) = %v", i,
+					diff)
+			}
+		}
+	}
+}
+
+func TestUpdateUser(t *testing.T) {
+	tests := []struct {
+		user user.User
+		err  error
+	}{
+		{
+			// Update the email.
+			user: user.User{
+				ID:    "ID-1",
+				Email: "Email-1.1@example.com",
+			},
+			err: nil,
+		},
+		{
+			// No-op.
+			user: user.User{
+				ID:    "ID-1",
+				Email: "Email-1@example.com",
+			},
+			err: nil,
+		},
+		{
+			// No email.
+			user: user.User{
+				ID:    "ID-1",
+				Email: "",
+			},
+			err: user.ErrorInvalidEmail,
+		},
+		{
+			// Try Update on non-existent user.
+			user: user.User{
+				ID:    "NonExistent",
+				Email: "GoodEmail@email.com",
+			},
+			err: user.ErrorNotFound,
+		},
+		{
+			// Try update to someone else's email.
+			user: user.User{
+				ID:    "ID-2",
+				Email: "Email-1@example.com",
+			},
+			err: user.ErrorDuplicateEmail,
+		},
+	}
+
+	for i, tt := range tests {
+		repo := makeTestUserRepo()
+		err := repo.Update(nil, tt.user)
+		if tt.err != nil {
+			if err != tt.err {
+				t.Errorf("case %d: want=%q, got=%q", i, tt.err, err)
+			}
+		} else {
+			if err != nil {
+				t.Errorf("case %d: want nil err, got %q", i, err)
+			}
+
+			gotUser, err := repo.Get(nil, tt.user.ID)
+			if err != nil {
+				t.Errorf("case %d: want nil err, got %q", i, err)
+			}
+
+			if diff := pretty.Compare(tt.user, gotUser); diff != "" {
+				t.Errorf("case %d: Compare(want, got) = %v", i,
+					diff)
+			}
+		}
+	}
+}
+
+func TestAttachRemoteIdentity(t *testing.T) {
+	tests := []struct {
+		id  string
+		rid user.RemoteIdentity
+		err error
+	}{
+		{
+			id: "ID-1",
+			rid: user.RemoteIdentity{
+				ConnectorID: "IDPC-1",
+				ID:          "RID-1.1",
+			},
+		},
+		{
+			id: "ID-1",
+			rid: user.RemoteIdentity{
+				ConnectorID: "IDPC-2",
+				ID:          "RID-2",
+			},
+			err: user.ErrorDuplicateRemoteIdentity,
+		},
+		{
+			id: "NoSuchUser",
+			rid: user.RemoteIdentity{
+				ConnectorID: "IDPC-3",
+				ID:          "RID-3",
+			},
+			err: user.ErrorNotFound,
+		},
+	}
+
+	for i, tt := range tests {
+		repo := makeTestUserRepo()
+		err := repo.AddRemoteIdentity(nil, tt.id, tt.rid)
+		if tt.err != nil {
+			if err != tt.err {
+				t.Errorf("case %d: want=%q, got=%q", i, tt.err, err)
+			}
+		} else {
+			if err != nil {
+				t.Errorf("case %d: want nil err, got %q", i, err)
+			}
+
+			gotUser, err := repo.GetByRemoteIdentity(nil, tt.rid)
+			if err != nil {
+				t.Errorf("case %d: want nil err, got %q", i, err)
+			}
+
+			wantUser, err := repo.Get(nil, tt.id)
+			if err != nil {
+				t.Errorf("case %d: want nil err, got %q", i, err)
+			}
+
+			gotRIDs, err := repo.GetRemoteIdentities(nil, tt.id)
+			if err != nil {
+				t.Errorf("case %d: want nil err, got %q", i, err)
+			}
+
+			if findRemoteIdentity(gotRIDs, tt.rid) == -1 {
+				t.Errorf("case %d: user.RemoteIdentity not found", i)
+			}
+
+			if !reflect.DeepEqual(wantUser, gotUser) {
+				t.Errorf("case %d: want=%#v, got=%#v", i,
+					wantUser, gotUser)
+			}
+		}
+	}
+}
+
+func TestRemoveRemoteIdentity(t *testing.T) {
+	tests := []struct {
+		id  string
+		rid user.RemoteIdentity
+		err error
+	}{
+		{
+			id: "ID-1",
+			rid: user.RemoteIdentity{
+				ConnectorID: "IDPC-1",
+				ID:          "RID-1",
+			},
+		},
+		{
+			id: "ID-1",
+			rid: user.RemoteIdentity{
+				ConnectorID: "IDPC-2",
+				ID:          "RID-2",
+			},
+			err: user.ErrorNotFound,
+		},
+		{
+			id: "NoSuchUser",
+			rid: user.RemoteIdentity{
+				ConnectorID: "IDPC-3",
+				ID:          "RID-3",
+			},
+			err: user.ErrorNotFound,
+		},
+	}
+
+	for i, tt := range tests {
+		repo := makeTestUserRepo()
+		err := repo.RemoveRemoteIdentity(nil, tt.id, tt.rid)
+		if tt.err != nil {
+			if err != tt.err {
+				t.Errorf("case %d: want=%q, got=%q", i, tt.err, err)
+			}
+		} else {
+			if err != nil {
+				t.Errorf("case %d: want nil err, got %q", i, err)
+			}
+
+			gotUser, err := repo.GetByRemoteIdentity(nil, tt.rid)
+			if err == nil {
+				if gotUser.ID == tt.id {
+					t.Errorf("case %d: user found.", i)
+
+				}
+			} else if err != user.ErrorNotFound {
+				t.Errorf("case %d: want %q err, got %q err", i, user.ErrorNotFound, err)
+			}
+
+			gotRIDs, err := repo.GetRemoteIdentities(nil, tt.id)
+			if err != nil {
+				t.Errorf("case %d: want nil err, got %q", i, err)
+			}
+
+			if findRemoteIdentity(gotRIDs, tt.rid) != -1 {
+				t.Errorf("case %d: user.RemoteIdentity found", i)
+			}
+
+		}
+	}
+}
+
+func findRemoteIdentity(rids []user.RemoteIdentity, rid user.RemoteIdentity) int {
+	for i, curRID := range rids {
+		if curRID == rid {
+			return i
+		}
+	}
+	return -1
+}
+
+func TestNewUserRepoFromUsers(t *testing.T) {
+	tests := []struct {
+		users []user.UserWithRemoteIdentities
+	}{
+		{
+			users: []user.UserWithRemoteIdentities{
+				{
+					User: user.User{
+						ID:    "123",
+						Email: "email123@example.com",
+					},
+					RemoteIdentities: []user.RemoteIdentity{},
+				},
+				{
+					User: user.User{
+						ID:    "456",
+						Email: "email456@example.com",
+					},
+					RemoteIdentities: []user.RemoteIdentity{
+						{
+							ID:          "remoteID",
+							ConnectorID: "connID",
+						},
+					},
+				},
+			},
+		},
+	}
+
+	for i, tt := range tests {
+		repo := user.NewUserRepoFromUsers(tt.users)
+		for _, want := range tt.users {
+			gotUser, err := repo.Get(nil, want.User.ID)
+			if err != nil {
+				t.Errorf("case %d: want nil err: %v", i, err)
+			}
+
+			gotRIDs, err := repo.GetRemoteIdentities(nil, want.User.ID)
+			if err != nil {
+				t.Errorf("case %d: want nil err: %v", i, err)
+			}
+
+			if !reflect.DeepEqual(want.User, gotUser) {
+				t.Errorf("case %d: want=%#v got=%#v", i, want.User, gotUser)
+			}
+
+			if !reflect.DeepEqual(want.RemoteIdentities, gotRIDs) {
+				t.Errorf("case %d: want=%#v got=%#v", i, want.RemoteIdentities, gotRIDs)
+			}
+		}
+	}
+}
+
+func TestGetByEmail(t *testing.T) {
+	tests := []struct {
+		email   string
+		wantErr error
+	}{
+		{
+			email:   "Email-1@example.com",
+			wantErr: nil,
+		},
+		{
+			email:   "NoSuchEmail@example.com",
+			wantErr: user.ErrorNotFound,
+		},
+	}
+
+	for i, tt := range tests {
+		repo := makeTestUserRepo()
+		gotUser, gotErr := repo.GetByEmail(nil, tt.email)
+		if tt.wantErr != nil {
+			if tt.wantErr != gotErr {
+				t.Errorf("case %d: wantErr=%q, gotErr=%q", i, tt.wantErr, gotErr)
+			}
+			continue
+		}
+
+		if gotErr != nil {
+			t.Errorf("case %d: want nil err:% q", i, gotErr)
+		}
+
+		if tt.email != gotUser.Email {
+			t.Errorf("case %d: want=%q, got=%q", i, tt.email, gotUser.Email)
+		}
+	}
+}
+
+func TestGetAdminCount(t *testing.T) {
+	tests := []struct {
+		addUsers []user.User
+		want     int
+	}{
+		{
+			addUsers: []user.User{
+				user.User{
+					ID:    "ID-admin",
+					Email: "Admin@example.com",
+					Admin: true,
+				},
+			},
+			want: 1,
+		},
+		{
+			want: 0,
+		},
+		{
+			addUsers: []user.User{
+				user.User{
+					ID:    "ID-admin",
+					Email: "NotAdmin@example.com",
+				},
+			},
+			want: 0,
+		},
+		{
+			addUsers: []user.User{
+				user.User{
+					ID:    "ID-admin",
+					Email: "Admin@example.com",
+					Admin: true,
+				},
+				user.User{
+					ID:    "ID-admin2",
+					Email: "AnotherAdmin@example.com",
+					Admin: true,
+				},
+			},
+			want: 2,
+		},
+	}
+
+	for i, tt := range tests {
+		repo := makeTestUserRepo()
+		for _, addUser := range tt.addUsers {
+			err := repo.Create(nil, addUser)
+			if err != nil {
+				t.Fatalf("case %d: couldn't add user: %q", i, err)
+			}
+		}
+
+		got, err := repo.GetAdminCount(nil)
+		if err != nil {
+			t.Errorf("case %d: couldn't get admin count: %q", i, err)
+			continue
+		}
+
+		if tt.want != got {
+			t.Errorf("case %d: want=%d, got=%d", i, tt.want, got)
+		}
+	}
+}
+
+func TestList(t *testing.T) {
+	repoUsers := []user.UserWithRemoteIdentities{}
+	for i := 0; i < 10; i++ {
+		repoUsers = append(repoUsers, user.UserWithRemoteIdentities{
+			User: user.User{
+				ID:    fmt.Sprintf("%d", i),
+				Email: fmt.Sprintf("%d@example.com", i),
+			},
+		})
+
+	}
+	tests := []struct {
+		filter      user.UserFilter
+		maxResults  int
+		expectedIDs [][]string
+	}{
+		{
+			maxResults:  5,
+			expectedIDs: [][]string{{"0", "1", "2", "3", "4"}, {"5", "6", "7", "8", "9"}},
+		},
+		{
+			maxResults:  3,
+			expectedIDs: [][]string{{"0", "1", "2"}, {"3", "4", "5"}, {"6", "7", "8"}, {"9"}},
+		},
+		{
+			maxResults:  9,
+			expectedIDs: [][]string{{"0", "1", "2", "3", "4", "5", "6", "7", "8"}, {"9"}},
+		},
+		{
+			maxResults:  10,
+			expectedIDs: [][]string{{"0", "1", "2", "3", "4", "5", "6", "7", "8", "9"}},
+		},
+	}
+
+	for i, tt := range tests {
+		repo := makeTestUserRepoFromUsers(repoUsers)
+		var tok string
+		gotIDs := [][]string{}
+		done := false
+		for !done {
+			var users []user.User
+			var err error
+			users, tok, err = repo.List(nil, tt.filter, tt.maxResults, tok)
+			if err != nil {
+				t.Errorf("case %d: unexpected err: %v", i, err)
+				done = true
+				continue
+			}
+			ids := []string{}
+			for _, user := range users {
+				ids = append(ids, user.ID)
+			}
+			gotIDs = append(gotIDs, ids)
+			if tok == "" {
+				done = true
+			}
+		}
+		if diff := pretty.Compare(tt.expectedIDs, gotIDs); diff != "" {
+			t.Errorf("case %d: Compare(want, got) = %v", i,
+				diff)
+		}
+	}
+}
+
+func TestListErrorNotFound(t *testing.T) {
+	repo := makeTestUserRepoFromUsers(nil)
+	_, _, err := repo.List(nil, user.UserFilter{}, 10, "")
+	if err != user.ErrorNotFound {
+		t.Errorf("want=%q, got=%q", user.ErrorNotFound, err)
+	}
+}
diff --git a/go-docker b/go-docker
new file mode 100755
index 00000000..f22ddf56
--- /dev/null
+++ b/go-docker
@@ -0,0 +1,21 @@
+#!/bin/bash -e
+#
+# USAGE:
+#
+# With env vars:
+#   MYVAR=foo OTHERVAR=bar DOCKER_ENV=MYVAR,OTHERVAR ./go-docker ./my-script --my-script-arg1 --my-script-arg2
+#
+# Without env vars:
+#   ./go-docker ./my-script --my-script-arg1 --my-script-arg2
+
+
+REPO=github.com/coreos/dex
+
+# forward whitelisted env variables to docker
+ENV_STR=""
+for VAR in ${DOCKER_ENV//,/ }; do
+    ENV_STR="$ENV_STR -e $VAR=${!VAR}"
+done
+
+echo "running with docker, might take a while to pull the image..."
+docker run $ENV_STR --rm --net=host -v `pwd`:/go/src/$REPO -w /go/src/$REPO quay.io/coreos/go-builder:1.3.3 $@
diff --git a/integration/admin_api_test.go b/integration/admin_api_test.go
new file mode 100644
index 00000000..f8c75764
--- /dev/null
+++ b/integration/admin_api_test.go
@@ -0,0 +1,260 @@
+package integration
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/kylelemons/godebug/pretty"
+	"google.golang.org/api/googleapi"
+
+	"github.com/coreos/dex/admin"
+	"github.com/coreos/dex/schema/adminschema"
+	"github.com/coreos/dex/server"
+	"github.com/coreos/dex/user"
+)
+
+type adminAPITestFixtures struct {
+	ur       user.UserRepo
+	pwr      user.PasswordInfoRepo
+	adAPI    *admin.AdminAPI
+	adSrv    *server.AdminServer
+	hSrv     *httptest.Server
+	hc       *http.Client
+	adClient *adminschema.Service
+}
+
+func (t *adminAPITestFixtures) close() {
+	t.hSrv.Close()
+}
+
+var (
+	adminUsers = []user.UserWithRemoteIdentities{
+		{
+			User: user.User{
+				ID:    "ID-1",
+				Email: "Email-1@example.com",
+			},
+		},
+		{
+			User: user.User{
+				ID:    "ID-2",
+				Email: "Email-2@example.com",
+			},
+		},
+		{
+			User: user.User{
+				ID:    "ID-3",
+				Email: "Email-3@example.com",
+			},
+		},
+	}
+
+	adminPasswords = []user.PasswordInfo{
+		{
+			UserID:   "ID-1",
+			Password: []byte("hi."),
+		},
+	}
+)
+
+func makeAdminAPITestFixtures() *adminAPITestFixtures {
+	f := &adminAPITestFixtures{}
+
+	ur, pwr, um := makeUserObjects(adminUsers, adminPasswords)
+	f.ur = ur
+	f.pwr = pwr
+	f.adAPI = admin.NewAdminAPI(um, f.ur, f.pwr, "local")
+	f.adSrv = server.NewAdminServer(f.adAPI, nil)
+	f.hSrv = httptest.NewServer(f.adSrv.HTTPHandler())
+	f.hc = &http.Client{}
+	f.adClient, _ = adminschema.NewWithBasePath(f.hc, f.hSrv.URL)
+
+	return f
+}
+
+func TestGetAdmin(t *testing.T) {
+
+	tests := []struct {
+		id      string
+		errCode int
+	}{
+		{
+			id:      "ID-1",
+			errCode: -1,
+		},
+		{
+			id:      "ID-2",
+			errCode: http.StatusNotFound,
+		},
+	}
+
+	for i, tt := range tests {
+		func() {
+			f := makeAdminAPITestFixtures()
+			defer f.close()
+			admn, err := f.adClient.Admin.Get(tt.id).Do()
+			if tt.errCode != -1 {
+				if err == nil {
+					t.Errorf("case %d: err was nil", i)
+					return
+				}
+				gErr, ok := err.(*googleapi.Error)
+				if !ok {
+					t.Errorf("case %d: not a googleapi Error: %q", i, err)
+					return
+				}
+
+				if gErr.Code != tt.errCode {
+					t.Errorf("case %d: want=%d, got=%d", i, tt.errCode, gErr.Code)
+					return
+				}
+			} else {
+				if err != nil {
+					t.Errorf("case %d: err != nil: %q", i, err)
+				}
+				if admn == nil {
+					t.Errorf("case %d: admn was nil", i)
+				}
+
+				if admn.Id != "ID-1" {
+					t.Errorf("case %d: want=%q, got=%q", i, tt.id, admn.Id)
+				}
+			}
+		}()
+	}
+}
+
+func TestCreateAdmin(t *testing.T) {
+	tests := []struct {
+		admn    *adminschema.Admin
+		errCode int
+	}{
+		{
+			admn: &adminschema.Admin{
+				Email:    "foo@example.com",
+				Password: "foopass",
+			},
+			errCode: -1,
+		},
+		{
+			// duplicate Email
+			admn: &adminschema.Admin{
+				Email:    "Email-1@example.com",
+				Password: "foopass",
+			},
+			errCode: http.StatusBadRequest,
+		},
+		{
+			// missing Email
+			admn: &adminschema.Admin{
+				Password: "foopass",
+			},
+			errCode: http.StatusBadRequest,
+		},
+	}
+	for i, tt := range tests {
+		func() {
+			f := makeAdminAPITestFixtures()
+			defer f.close()
+
+			admn, err := f.adClient.Admin.Create(tt.admn).Do()
+			if tt.errCode != -1 {
+				if err == nil {
+					t.Errorf("case %d: err was nil", i)
+					return
+				}
+				gErr, ok := err.(*googleapi.Error)
+				if !ok {
+					t.Errorf("case %d: not a googleapi Error: %q", i, err)
+					return
+				}
+
+				if gErr.Code != tt.errCode {
+					t.Errorf("case %d: want=%d, got=%d", i, tt.errCode, gErr.Code)
+					return
+				}
+			} else {
+				if err != nil {
+					t.Errorf("case %d: err != nil: %q", i, err)
+				}
+
+				tt.admn.Id = admn.Id
+				if diff := pretty.Compare(tt.admn, admn); diff != "" {
+					t.Errorf("case %d: Compare(want, got) = %v", i, diff)
+				}
+
+				gotAdmn, err := f.adClient.Admin.Get(admn.Id).Do()
+				if err != nil {
+					t.Errorf("case %d: err != nil: %q", i, err)
+				}
+				if diff := pretty.Compare(admn, gotAdmn); diff != "" {
+					t.Errorf("case %d: Compare(want, got) = %v", i, diff)
+				}
+
+				usr, err := f.ur.GetByRemoteIdentity(nil, user.RemoteIdentity{
+					ConnectorID: "local",
+					ID:          tt.admn.Id,
+				})
+				if err != nil {
+					t.Errorf("case %d: err != nil: %q", i, err)
+				}
+
+				if usr.ID != tt.admn.Id {
+					t.Errorf("case %d: want=%q, got=%q", i, tt.admn.Id, usr.ID)
+				}
+
+			}
+		}()
+	}
+}
+
+func TestGetState(t *testing.T) {
+	tests := []struct {
+		addUsers []user.User
+		want     adminschema.State
+	}{
+		{
+			addUsers: []user.User{
+				user.User{
+					ID:    "ID-admin",
+					Email: "Admin@example.com",
+					Admin: true,
+				},
+			},
+			want: adminschema.State{
+				AdminUserCreated: true,
+			},
+		},
+		{
+			want: adminschema.State{
+				AdminUserCreated: false,
+			},
+		},
+	}
+
+	for i, tt := range tests {
+		func() {
+			f := makeAdminAPITestFixtures()
+			defer f.close()
+
+			for _, usr := range tt.addUsers {
+				err := f.ur.Create(nil, usr)
+				if err != nil {
+					t.Fatalf("case %d: err != nil: %v", i, err)
+				}
+			}
+
+			got, err := f.adClient.State.Get().Do()
+			if err != nil {
+				t.Errorf("case %d: err != nil: %q", i, err)
+			}
+
+			if diff := pretty.Compare(tt.want, got); diff != "" {
+				t.Errorf("case %d: Compare(want, got) = %v", i, diff)
+			}
+
+		}()
+	}
+
+}
diff --git a/integration/client_api_test.go b/integration/client_api_test.go
new file mode 100644
index 00000000..f36323ad
--- /dev/null
+++ b/integration/client_api_test.go
@@ -0,0 +1,82 @@
+package integration
+
+import (
+	"net/http"
+	"reflect"
+	"testing"
+
+	schema "github.com/coreos/dex/schema/workerschema"
+	"github.com/coreos/go-oidc/oidc"
+)
+
+func TestClientCreate(t *testing.T) {
+	ci := oidc.ClientIdentity{
+		Credentials: oidc.ClientCredentials{
+			ID:     "72de74a9",
+			Secret: "XXX",
+		},
+	}
+	cis := []oidc.ClientIdentity{ci}
+
+	srv, err := mockServer(cis)
+	if err != nil {
+		t.Fatalf("Unexpected error setting up server: %v", err)
+	}
+
+	oidcClient, err := mockClient(srv, ci)
+	if err != nil {
+		t.Fatalf("Unexpected error setting up OIDC client: %v", err)
+	}
+
+	tok, err := oidcClient.ClientCredsToken([]string{"openid"})
+	if err != nil {
+		t.Fatalf("Failed getting client token: %v", err)
+	}
+
+	callbackURL := "http://example.com/oidc/callback"
+	trans := &tokenHandlerTransport{
+		Handler: srv.HTTPHandler(),
+		Token:   tok.Encode(),
+	}
+	hc := &http.Client{
+		Transport: trans,
+	}
+	iss := srv.IssuerURL.String()
+	svc, err := schema.NewWithBasePath(hc, iss)
+	if err != nil {
+		t.Fatalf("Failed creating API service client: %v", err)
+	}
+
+	newClientInput := &schema.Client{
+		RedirectURIs: []string{callbackURL, "http://example.com"},
+	}
+
+	call := svc.Clients.Create(newClientInput)
+	newClient, err := call.Do()
+	if err != nil {
+		t.Errorf("Call to create client API failed: %v", err)
+	}
+
+	if newClient.Id == "" {
+		t.Error("Expected non-empty Client ID")
+	}
+
+	if newClient.Secret == "" {
+		t.Error("Expected non-empty Client Secret")
+	}
+
+	meta, err := srv.ClientIdentityRepo.Metadata(newClient.Id)
+	if err != nil {
+		t.Errorf("Error looking up client metadata: %v", err)
+	} else if meta == nil {
+		t.Error("Expected new client to exist in repo")
+	}
+
+	gotURLs := make([]string, len(meta.RedirectURLs))
+	for i, u := range meta.RedirectURLs {
+		gotURLs[i] = u.String()
+	}
+	if !reflect.DeepEqual(newClientInput.RedirectURIs, gotURLs) {
+		t.Errorf("Callback URL mismatch, want=%s, got=%s", newClientInput.RedirectURIs, gotURLs)
+	}
+}
diff --git a/integration/common_test.go b/integration/common_test.go
new file mode 100644
index 00000000..f9e33447
--- /dev/null
+++ b/integration/common_test.go
@@ -0,0 +1,52 @@
+package integration
+
+import (
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+
+	"github.com/coreos/go-oidc/key"
+	"github.com/jonboulle/clockwork"
+
+	"github.com/coreos/dex/repo"
+	"github.com/coreos/dex/user"
+)
+
+var (
+	clock = clockwork.NewFakeClock()
+
+	testIssuerURL        = url.URL{Scheme: "https", Host: "auth.example.com"}
+	testClientID         = "XXX"
+	testClientSecret     = "yyy"
+	testRedirectURL      = url.URL{Scheme: "https", Host: "client.example.com", Path: "/redirect"}
+	testResetPasswordURL = url.URL{Scheme: "https", Host: "auth.example.com", Path: "/resetPassword"}
+	testPrivKey, _       = key.GeneratePrivateKey()
+)
+
+type tokenHandlerTransport struct {
+	Handler http.Handler
+	Token   string
+}
+
+func (t *tokenHandlerTransport) RoundTrip(r *http.Request) (*http.Response, error) {
+	r.Header.Set("Authorization", fmt.Sprintf("Bearer %s", t.Token))
+	w := httptest.NewRecorder()
+	t.Handler.ServeHTTP(w, r)
+	resp := http.Response{
+		StatusCode: w.Code,
+		Header:     w.Header(),
+		Body:       ioutil.NopCloser(w.Body),
+	}
+	return &resp, nil
+}
+
+func makeUserObjects(users []user.UserWithRemoteIdentities, passwords []user.PasswordInfo) (user.UserRepo, user.PasswordInfoRepo, *user.Manager) {
+	ur := user.NewUserRepoFromUsers(users)
+	pwr := user.NewPasswordInfoRepoFromPasswordInfos(passwords)
+
+	um := user.NewManager(ur, pwr, repo.InMemTransactionFactory, user.ManagerOptions{})
+	um.Clock = clock
+	return ur, pwr, um
+}
diff --git a/integration/oidc_test.go b/integration/oidc_test.go
new file mode 100644
index 00000000..cf3a67c1
--- /dev/null
+++ b/integration/oidc_test.go
@@ -0,0 +1,330 @@
+package integration
+
+import (
+	"fmt"
+	"html/template"
+	"net/http"
+	"net/url"
+	"testing"
+	"time"
+
+	"github.com/coreos/dex/client"
+	"github.com/coreos/dex/connector"
+	phttp "github.com/coreos/dex/pkg/http"
+	"github.com/coreos/dex/refresh/refreshtest"
+	"github.com/coreos/dex/server"
+	"github.com/coreos/dex/session"
+	"github.com/coreos/dex/user"
+	"github.com/coreos/go-oidc/jose"
+	"github.com/coreos/go-oidc/key"
+	"github.com/coreos/go-oidc/oauth2"
+	"github.com/coreos/go-oidc/oidc"
+)
+
+func mockServer(cis []oidc.ClientIdentity) (*server.Server, error) {
+	k, err := key.GeneratePrivateKey()
+	if err != nil {
+		return nil, fmt.Errorf("Unable to generate private key: %v", err)
+	}
+
+	km := key.NewPrivateKeyManager()
+	err = km.Set(key.NewPrivateKeySet([]*key.PrivateKey{k}, time.Now().Add(time.Minute)))
+	if err != nil {
+		return nil, err
+	}
+
+	sm := session.NewSessionManager(session.NewSessionRepo(), session.NewSessionKeyRepo())
+	srv := &server.Server{
+		IssuerURL:          url.URL{Scheme: "http", Host: "server.example.com"},
+		KeyManager:         km,
+		ClientIdentityRepo: client.NewClientIdentityRepo(cis),
+		SessionManager:     sm,
+	}
+
+	return srv, nil
+}
+
+func mockClient(srv *server.Server, ci oidc.ClientIdentity) (*oidc.Client, error) {
+	hdlr := srv.HTTPHandler()
+	sClient := &phttp.HandlerClient{Handler: hdlr}
+
+	cfg, err := oidc.FetchProviderConfig(sClient, srv.IssuerURL.String())
+	if err != nil {
+		return nil, fmt.Errorf("failed to fetch provider config: %v", err)
+	}
+
+	jwks, err := srv.KeyManager.JWKs()
+	if err != nil {
+		return nil, fmt.Errorf("failed to generate JWKs: %v", err)
+	}
+
+	ks := key.NewPublicKeySet(jwks, time.Now().Add(1*time.Hour))
+	ccfg := oidc.ClientConfig{
+		HTTPClient:     sClient,
+		ProviderConfig: cfg,
+		Credentials:    ci.Credentials,
+		KeySet:         *ks,
+	}
+
+	return oidc.NewClient(ccfg)
+}
+
+func verifyUserClaims(claims jose.Claims, ci *oidc.ClientIdentity, user *user.User, issuerURL url.URL) error {
+	expectedSub, expectedName := ci.Credentials.ID, ci.Credentials.ID
+	if user != nil {
+		expectedSub, expectedName = user.ID, user.DisplayName
+	}
+
+	if aud := claims["aud"].(string); aud != ci.Credentials.ID {
+		return fmt.Errorf("unexpected claim value for aud, got=%v, want=%v", aud, ci.Credentials.ID)
+	}
+
+	if sub := claims["sub"].(string); sub != expectedSub {
+		return fmt.Errorf("unexpected claim value for sub, got=%v, want=%v", sub, expectedSub)
+	}
+
+	if name := claims["name"].(string); name != expectedName {
+		return fmt.Errorf("unexpected claim value for name, got=%v, want=%v", name, expectedName)
+	}
+
+	wantIss := issuerURL.String()
+	if iss := claims["iss"].(string); iss != wantIss {
+		return fmt.Errorf("unexpected claim value for iss, got=%v, want=%v", iss, wantIss)
+	}
+
+	return nil
+}
+
+func TestHTTPExchangeTokenRefreshToken(t *testing.T) {
+	password, err := user.NewPasswordFromPlaintext("woof")
+	if err != nil {
+		t.Fatalf("unexpectd error: %q", err)
+	}
+
+	passwordInfo := user.PasswordInfo{
+		UserID:   "elroy77",
+		Password: password,
+	}
+
+	cfg := &connector.LocalConnectorConfig{
+		PasswordInfos: []user.PasswordInfo{passwordInfo},
+	}
+
+	ci := oidc.ClientIdentity{
+		Credentials: oidc.ClientCredentials{
+			ID:     "72de74a9",
+			Secret: "XXX",
+		},
+	}
+
+	cir := client.NewClientIdentityRepo([]oidc.ClientIdentity{ci})
+
+	issuerURL := url.URL{Scheme: "http", Host: "server.example.com"}
+	sm := session.NewSessionManager(session.NewSessionRepo(), session.NewSessionKeyRepo())
+
+	k, err := key.GeneratePrivateKey()
+	if err != nil {
+		t.Fatalf("Unable to generate RSA key: %v", err)
+	}
+
+	km := key.NewPrivateKeyManager()
+	err = km.Set(key.NewPrivateKeySet([]*key.PrivateKey{k}, time.Now().Add(time.Minute)))
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	usr := user.User{
+		ID:          "ID-test",
+		Email:       "testemail@example.com",
+		DisplayName: "displayname",
+	}
+	userRepo := user.NewUserRepo()
+	if err := userRepo.Create(nil, usr); err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	passwordInfoRepo := user.NewPasswordInfoRepo()
+	refreshTokenRepo, err := refreshtest.NewTestRefreshTokenRepo()
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	srv := &server.Server{
+		IssuerURL:          issuerURL,
+		KeyManager:         km,
+		SessionManager:     sm,
+		ClientIdentityRepo: cir,
+		Templates:          template.New(connector.LoginPageTemplateName),
+		Connectors:         []connector.Connector{},
+		UserRepo:           userRepo,
+		PasswordInfoRepo:   passwordInfoRepo,
+		RefreshTokenRepo:   refreshTokenRepo,
+	}
+
+	if err = srv.AddConnector(cfg); err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	sClient := &phttp.HandlerClient{Handler: srv.HTTPHandler()}
+	pcfg, err := oidc.FetchProviderConfig(sClient, issuerURL.String())
+	if err != nil {
+		t.Fatalf("Failed to fetch provider config: %v", err)
+	}
+
+	ks := key.NewPublicKeySet([]jose.JWK{k.JWK()}, time.Now().Add(1*time.Hour))
+
+	ccfg := oidc.ClientConfig{
+		HTTPClient:     sClient,
+		ProviderConfig: pcfg,
+		Credentials:    ci.Credentials,
+		RedirectURL:    "http://client.example.com",
+		KeySet:         *ks,
+	}
+
+	cl, err := oidc.NewClient(ccfg)
+	if err != nil {
+		t.Fatalf("Failed creating oidc.Client: %v", err)
+	}
+
+	m := http.NewServeMux()
+
+	var claims jose.Claims
+	var refresh string
+
+	m.HandleFunc("/callback", handleCallbackFunc(cl, &claims, &refresh))
+	cClient := &phttp.HandlerClient{Handler: m}
+
+	// this will actually happen due to some interaction between the
+	// end-user and a remote identity provider
+	sessionID, err := sm.NewSession("bogus_idpc", ci.Credentials.ID, "bogus", url.URL{}, "", false)
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+	if _, err = sm.AttachRemoteIdentity(sessionID, passwordInfo.Identity()); err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	if _, err = sm.AttachUser(sessionID, usr.ID); err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	key, err := sm.NewSessionKey(sessionID)
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	req, err := http.NewRequest("GET", fmt.Sprintf("http://client.example.com/callback?code=%s", key), nil)
+	if err != nil {
+		t.Fatalf("Failed creating HTTP request: %v", err)
+	}
+
+	resp, err := cClient.Do(req)
+	if err != nil {
+		t.Fatalf("Failed resolving HTTP requests against /callback: %v", err)
+	}
+
+	if err := verifyUserClaims(claims, &ci, &usr, issuerURL); err != nil {
+		t.Fatalf("Failed to verify claims: %v", err)
+	}
+
+	if resp.StatusCode != http.StatusOK {
+		t.Fatalf("Received status code %d, want %d", resp.StatusCode, http.StatusOK)
+	}
+
+	if refresh == "" {
+		t.Fatalf("No refresh token")
+	}
+
+	// Use refresh token to get a new ID token.
+	token, err := cl.RefreshToken(refresh)
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	claims, err = token.Claims()
+	if err != nil {
+		t.Fatalf("Failed parsing claims from client token: %v", err)
+	}
+
+	if err := verifyUserClaims(claims, &ci, &usr, issuerURL); err != nil {
+		t.Fatalf("Failed to verify claims: %v", err)
+	}
+}
+
+func TestHTTPClientCredsToken(t *testing.T) {
+	ci := oidc.ClientIdentity{
+		Credentials: oidc.ClientCredentials{
+			ID:     "72de74a9",
+			Secret: "XXX",
+		},
+	}
+	cis := []oidc.ClientIdentity{ci}
+
+	srv, err := mockServer(cis)
+	if err != nil {
+		t.Fatalf("Unexpected error setting up server: %v", err)
+	}
+
+	cl, err := mockClient(srv, ci)
+	if err != nil {
+		t.Fatalf("Unexpected error setting up OIDC client: %v", err)
+	}
+
+	tok, err := cl.ClientCredsToken([]string{"openid"})
+	if err != nil {
+		t.Fatalf("Failed getting client token: %v", err)
+	}
+
+	claims, err := tok.Claims()
+	if err != nil {
+		t.Fatalf("Failed parsing claims from client token: %v", err)
+	}
+
+	if err := verifyUserClaims(claims, &ci, nil, srv.IssuerURL); err != nil {
+		t.Fatalf("Failed to verify claims: %v", err)
+	}
+}
+
+func handleCallbackFunc(c *oidc.Client, claims *jose.Claims, refresh *string) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		code := r.URL.Query().Get("code")
+		if code == "" {
+			phttp.WriteError(w, http.StatusBadRequest, "code query param must be set")
+			return
+		}
+
+		oac, err := c.OAuthClient()
+		if err != nil {
+			phttp.WriteError(w, http.StatusInternalServerError, fmt.Sprintf("unable to create oauth client: %v", err))
+			return
+		}
+
+		t, err := oac.RequestToken(oauth2.GrantTypeAuthCode, code)
+		if err != nil {
+			phttp.WriteError(w, http.StatusBadRequest, fmt.Sprintf("unable to verify auth code with issuer: %v", err))
+			return
+		}
+
+		// Get id token and claims.
+		tok, err := jose.ParseJWT(t.IDToken)
+		if err != nil {
+			phttp.WriteError(w, http.StatusBadRequest, fmt.Sprintf("unable to parse id_token: %v", err))
+			return
+		}
+
+		if err := c.VerifyJWT(tok); err != nil {
+			phttp.WriteError(w, http.StatusBadRequest, fmt.Sprintf("unable to verify the JWT: %v", err))
+			return
+		}
+
+		if *claims, err = tok.Claims(); err != nil {
+			phttp.WriteError(w, http.StatusBadRequest, fmt.Sprintf("unable to construct claims: %v", err))
+			return
+		}
+
+		// Get refresh token.
+		*refresh = t.RefreshToken
+
+		w.WriteHeader(http.StatusOK)
+	}
+}
diff --git a/integration/user_api_test.go b/integration/user_api_test.go
new file mode 100644
index 00000000..15d32849
--- /dev/null
+++ b/integration/user_api_test.go
@@ -0,0 +1,519 @@
+package integration
+
+import (
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"testing"
+	"time"
+
+	"github.com/coreos/go-oidc/jose"
+	"github.com/coreos/go-oidc/key"
+	"github.com/coreos/go-oidc/oidc"
+	"github.com/kylelemons/godebug/pretty"
+	"google.golang.org/api/googleapi"
+
+	"github.com/coreos/dex/client"
+	schema "github.com/coreos/dex/schema/workerschema"
+	"github.com/coreos/dex/server"
+	"github.com/coreos/dex/user"
+	"github.com/coreos/dex/user/api"
+)
+
+type userAPITestFixtures struct {
+	client  *schema.Service
+	hSrv    *httptest.Server
+	emailer *testEmailer
+	trans   *tokenHandlerTransport
+}
+
+func (f *userAPITestFixtures) close() {
+	f.hSrv.Close()
+}
+
+var (
+	userUsers = []user.UserWithRemoteIdentities{
+		{
+			User: user.User{
+				ID:    "ID-1",
+				Email: "Email-1@example.com",
+				Admin: true,
+			},
+		},
+		{
+			User: user.User{
+				ID:    "ID-2",
+				Email: "Email-2@example.com",
+			},
+		},
+		{
+			User: user.User{
+				ID:    "ID-3",
+				Email: "Email-3@example.com",
+			},
+		},
+	}
+
+	userPasswords = []user.PasswordInfo{
+		{
+			UserID:   "ID-1",
+			Password: []byte("hi."),
+		},
+	}
+
+	userBadClientID = "ZZZ"
+
+	userGoodToken = makeUserToken(testIssuerURL,
+		"ID-1", testClientID, time.Hour*1, testPrivKey)
+
+	userBadTokenNotAdmin = makeUserToken(testIssuerURL,
+		"ID-2", testClientID, time.Hour*1, testPrivKey)
+
+	userBadTokenClientNotAdmin = makeUserToken(testIssuerURL,
+		"ID-1", userBadClientID, time.Hour*1, testPrivKey)
+
+	userBadTokenExpired = makeUserToken(testIssuerURL,
+		"ID-1", testClientID, time.Hour*-1, testPrivKey)
+)
+
+func makeUserAPITestFixtures() *userAPITestFixtures {
+	f := &userAPITestFixtures{}
+
+	_, _, um := makeUserObjects(userUsers, userPasswords)
+
+	cir := client.NewClientIdentityRepo([]oidc.ClientIdentity{
+		oidc.ClientIdentity{
+			Credentials: oidc.ClientCredentials{
+				ID:     testClientID,
+				Secret: testClientSecret,
+			},
+			Metadata: oidc.ClientMetadata{
+				RedirectURLs: []url.URL{
+					testRedirectURL,
+				},
+			},
+		},
+		oidc.ClientIdentity{
+			Credentials: oidc.ClientCredentials{
+				ID:     userBadClientID,
+				Secret: "secret",
+			},
+			Metadata: oidc.ClientMetadata{
+				RedirectURLs: []url.URL{
+					testRedirectURL,
+				},
+			},
+		},
+	})
+
+	cir.SetDexAdmin(testClientID, true)
+
+	noop := func() error { return nil }
+
+	keysFunc := func() []key.PublicKey {
+		return []key.PublicKey{*key.NewPublicKey(testPrivKey.JWK())}
+	}
+
+	jwtvFactory := func(clientID string) oidc.JWTVerifier {
+		return oidc.NewJWTVerifier(testIssuerURL.String(), clientID, noop, keysFunc)
+	}
+
+	f.emailer = &testEmailer{}
+	api := api.NewUsersAPI(um, cir, f.emailer, "local")
+	usrSrv := server.NewUserMgmtServer(api, jwtvFactory, um, cir)
+	f.hSrv = httptest.NewServer(usrSrv.HTTPHandler())
+
+	f.trans = &tokenHandlerTransport{
+		Handler: usrSrv.HTTPHandler(),
+	}
+	hc := &http.Client{
+		Transport: f.trans,
+	}
+	f.client, _ = schema.NewWithBasePath(hc, f.hSrv.URL)
+
+	return f
+}
+
+func TestGetUser(t *testing.T) {
+	tests := []struct {
+		id string
+
+		token string
+
+		errCode int
+	}{
+		{
+			id: "ID-1",
+
+			token:   userGoodToken,
+			errCode: 0,
+		}, {
+			id: "NOONE",
+
+			token:   userGoodToken,
+			errCode: http.StatusNotFound,
+		}, {
+			id: "ID-1",
+
+			token:   userBadTokenNotAdmin,
+			errCode: http.StatusUnauthorized,
+		}, {
+			id: "ID-1",
+
+			token:   userBadTokenExpired,
+			errCode: http.StatusUnauthorized,
+		}, {
+			id: "ID-1",
+
+			token:   "",
+			errCode: http.StatusUnauthorized,
+		}, {
+			id: "ID-1",
+
+			token:   "gibberish",
+			errCode: http.StatusUnauthorized,
+		},
+	}
+
+	for i, tt := range tests {
+		func() {
+			f := makeUserAPITestFixtures()
+			f.trans.Token = tt.token
+
+			defer f.close()
+			usr, err := f.client.Users.Get(tt.id).Do()
+			if tt.errCode != 0 {
+				if err == nil {
+					t.Errorf("case %d: err was nil", i)
+					return
+				}
+				gErr, ok := err.(*googleapi.Error)
+				if !ok {
+					t.Errorf("case %d: not a googleapi Error: %q", i, err)
+					return
+				}
+
+				if gErr.Code != tt.errCode {
+					t.Errorf("case %d: want=%d, got=%d", i, tt.errCode, gErr.Code)
+					return
+				}
+			} else {
+				if err != nil {
+					t.Errorf("case %d: err != nil: %q", i, err)
+					return
+				}
+				if usr == nil {
+					t.Errorf("case %d: user was nil", i)
+					return
+				}
+
+				if usr.User.Id != "ID-1" {
+					t.Errorf("case %d: want=%q, got=%q", i, tt.id, usr.User.Id)
+					return
+				}
+			}
+		}()
+	}
+
+}
+
+func TestListUsers(t *testing.T) {
+	tests := []struct {
+		maxResults int64
+		pages      int
+
+		token string
+
+		wantCode int
+		wantIDs  [][]string
+	}{
+		{
+			pages:      3,
+			maxResults: 1,
+
+			token: userGoodToken,
+
+			wantIDs: [][]string{{"ID-1"}, {"ID-2"}, {"ID-3"}},
+		},
+		{
+			pages: 1,
+
+			token: userGoodToken,
+
+			maxResults: 3,
+			wantIDs:    [][]string{{"ID-1", "ID-2", "ID-3"}},
+		},
+		{
+			pages: 3,
+
+			// make sure that the endpoint is protected, but don't exhaustively
+			// try every variation like in TestGetUser
+			token: userBadTokenExpired,
+
+			maxResults: 1,
+			wantCode:   http.StatusUnauthorized,
+		},
+		{
+
+			pages: 3,
+
+			token: userGoodToken,
+
+			maxResults: 10000,
+			wantCode:   http.StatusBadRequest,
+		},
+	}
+
+	for i, tt := range tests {
+		func() {
+			f := makeUserAPITestFixtures()
+			defer f.close()
+			f.trans.Token = tt.token
+
+			gotIDs := [][]string{}
+			var next string
+			for x := 0; x < tt.pages; x++ {
+				call := f.client.Users.List()
+				if next != "" {
+					call.NextPageToken(next)
+				}
+				if tt.maxResults != 0 {
+					call.MaxResults(tt.maxResults)
+				}
+				usersResponse, err := call.Do()
+
+				if tt.wantCode != 0 {
+					if err == nil {
+						t.Errorf("case %d want non-nil err", i)
+						return
+					}
+					gErr, ok := err.(*googleapi.Error)
+					if !ok {
+						t.Errorf("case %d: not a googleapi Error: %q %T", i, err, err)
+						return
+					}
+
+					if gErr.Code != tt.wantCode {
+						t.Errorf("case %d: want=%d, got=%d", i, tt.wantCode, gErr.Code)
+						return
+					}
+					return
+				}
+				if err != nil {
+					t.Errorf("case %d: err != nil: %q", i, err)
+					return
+				}
+
+				var ids []string
+				for _, usr := range usersResponse.Users {
+					ids = append(ids, usr.Id)
+				}
+				gotIDs = append(gotIDs, ids)
+
+				next = usersResponse.NextPageToken
+			}
+
+			if diff := pretty.Compare(tt.wantIDs, gotIDs); diff != "" {
+				t.Errorf("case %d: Compare(want, got) = %v", i,
+					diff)
+			}
+		}()
+	}
+}
+
+func TestCreateUser(t *testing.T) {
+	tests := []struct {
+		req       schema.UserCreateRequest
+		cantEmail bool
+
+		token string
+
+		wantResponse schema.UserCreateResponse
+		wantCode     int
+	}{
+		{
+
+			req: schema.UserCreateRequest{
+				User: &schema.User{
+					Email:         "newuser@example.com",
+					DisplayName:   "New User",
+					EmailVerified: true,
+					Admin:         false,
+					CreatedAt:     clock.Now().Format(time.RFC3339),
+				},
+				RedirectURL: testRedirectURL.String(),
+			},
+
+			token: userGoodToken,
+
+			wantResponse: schema.UserCreateResponse{
+				EmailSent: true,
+				User: &schema.User{
+					Email:         "newuser@example.com",
+					DisplayName:   "New User",
+					EmailVerified: true,
+					Admin:         false,
+					CreatedAt:     clock.Now().Format(time.RFC3339),
+				},
+			},
+		},
+		{
+
+			req: schema.UserCreateRequest{
+				User: &schema.User{
+					Email:         "newuser@example.com",
+					DisplayName:   "New User",
+					EmailVerified: true,
+					Admin:         false,
+					CreatedAt:     clock.Now().Format(time.RFC3339),
+				},
+				RedirectURL: testRedirectURL.String(),
+			},
+			cantEmail: true,
+			token:     userGoodToken,
+
+			wantResponse: schema.UserCreateResponse{
+				User: &schema.User{
+					Email:         "newuser@example.com",
+					DisplayName:   "New User",
+					EmailVerified: true,
+					Admin:         false,
+					CreatedAt:     clock.Now().Format(time.RFC3339),
+				},
+				ResetPasswordLink: testResetPasswordURL.String(),
+			},
+		},
+		{
+			req: schema.UserCreateRequest{
+				User: &schema.User{
+					Email:         "newuser@example.com",
+					DisplayName:   "New User",
+					EmailVerified: true,
+					Admin:         false,
+					CreatedAt:     clock.Now().Format(time.RFC3339),
+				},
+				RedirectURL: "http://scammers.com",
+			},
+			token: userGoodToken,
+
+			wantCode: http.StatusBadRequest,
+		},
+		{
+
+			req: schema.UserCreateRequest{
+				User: &schema.User{
+					Email:         "newuser@example.com",
+					DisplayName:   "New User",
+					EmailVerified: true,
+					Admin:         false,
+					CreatedAt:     clock.Now().Format(time.RFC3339),
+				},
+
+				RedirectURL: testRedirectURL.String(),
+			},
+
+			// make sure that the endpoint is protected, but don't exhaustively
+			// try every variation like in TestGetUser
+			token: userBadTokenExpired,
+
+			wantCode: http.StatusUnauthorized,
+		},
+	}
+	for i, tt := range tests {
+		func() {
+			f := makeUserAPITestFixtures()
+			defer f.close()
+			f.trans.Token = tt.token
+			f.emailer.cantEmail = tt.cantEmail
+
+			page, err := f.client.Users.Create(&tt.req).Do()
+			if tt.wantCode != 0 {
+				if err == nil {
+					t.Errorf("case %d: err was nil", i)
+					return
+				}
+				gErr, ok := err.(*googleapi.Error)
+				if !ok {
+					t.Errorf("case %d: not a googleapi Error: %q", i, err)
+					return
+				}
+
+				if gErr.Code != tt.wantCode {
+					t.Errorf("case %d: want=%d, got=%d", i, tt.wantCode, gErr.Code)
+					return
+				}
+				return
+			}
+
+			if err != nil {
+				t.Errorf("case %d: want nil err, got: %v %T ", i, err, err)
+				return
+			}
+
+			newID := page.User.Id
+			if newID == "" {
+				t.Errorf("case %d: expected non-empty newID", i)
+				return
+			}
+
+			tt.wantResponse.User.Id = newID
+			if diff := pretty.Compare(tt.wantResponse, page); diff != "" {
+				t.Errorf("case %d: Compare(want, got) = %v", i,
+					diff)
+				return
+			}
+
+			urlParsed, err := url.Parse(tt.req.RedirectURL)
+			if err != nil {
+				t.Errorf("case %d unexpected err: %v", i, err)
+				return
+			}
+
+			wantEmalier := testEmailer{
+				cantEmail:       tt.cantEmail,
+				lastEmail:       tt.req.User.Email,
+				lastClientID:    "XXX",
+				lastRedirectURL: *urlParsed,
+			}
+			if diff := pretty.Compare(wantEmalier, f.emailer); diff != "" {
+				t.Errorf("case %d: Compare(want, got) = %v", i,
+					diff)
+				return
+			}
+
+		}()
+	}
+}
+
+type testEmailer struct {
+	cantEmail       bool
+	lastEmail       string
+	lastClientID    string
+	lastRedirectURL url.URL
+}
+
+// SendResetPasswordEmail returns resetPasswordURL when it can't email, mimicking the behavior of the real UserEmailer.
+func (t *testEmailer) SendResetPasswordEmail(email string, redirectURL url.URL, clientID string) (*url.URL, error) {
+	t.lastEmail = email
+	t.lastRedirectURL = redirectURL
+	t.lastClientID = clientID
+
+	var retURL *url.URL
+	if t.cantEmail {
+		retURL = &testResetPasswordURL
+	}
+	return retURL, nil
+}
+
+func makeUserToken(issuerURL url.URL, userID, clientID string, expires time.Duration, privKey *key.PrivateKey) string {
+
+	signer := key.NewPrivateKeySet([]*key.PrivateKey{testPrivKey},
+		time.Now().Add(time.Minute)).Active().Signer()
+	claims := oidc.NewClaims(issuerURL.String(), userID, clientID, time.Now(), time.Now().Add(expires))
+	jwt, err := jose.NewSignedJWT(claims, signer)
+	if err != nil {
+		panic(fmt.Sprintf("could not make token: %v", err))
+	}
+	return jwt.Encode()
+}
diff --git a/pkg/crypto/aes.go b/pkg/crypto/aes.go
new file mode 100644
index 00000000..82ffad5b
--- /dev/null
+++ b/pkg/crypto/aes.go
@@ -0,0 +1,94 @@
+package crypto
+
+import (
+	"crypto/aes"
+	"crypto/cipher"
+	"crypto/rand"
+	"errors"
+)
+
+// pad uses the PKCS#7 padding scheme to align the a payload to a specific block size
+func pad(plaintext []byte, bsize int) ([]byte, error) {
+	if bsize >= 256 {
+		return nil, errors.New("bsize must be < 256")
+	}
+	pad := bsize - (len(plaintext) % bsize)
+	if pad == 0 {
+		pad = bsize
+	}
+	for i := 0; i < pad; i++ {
+		plaintext = append(plaintext, byte(pad))
+	}
+	return plaintext, nil
+}
+
+// unpad strips the padding previously added using the PKCS#7 padding scheme
+func unpad(paddedtext []byte) ([]byte, error) {
+	length := len(paddedtext)
+	paddedtext, lbyte := paddedtext[:length-1], paddedtext[length-1]
+	pad := int(lbyte)
+	if pad >= 256 || pad > length {
+		return nil, errors.New("padding malformed")
+	}
+	return paddedtext[:length-(pad)], nil
+}
+
+// AESEncrypt encrypts a payloaded with an AES cipher.
+// The returned ciphertext has three notable properties:
+// 1. ciphertext is aligned to the standard AES block size
+// 2. ciphertext is padded using PKCS#7
+// 3. IV is prepended to the ciphertext
+func AESEncrypt(plaintext, key []byte) ([]byte, error) {
+	plaintext, err := pad(plaintext, aes.BlockSize)
+	if err != nil {
+		return nil, err
+	}
+
+	block, err := aes.NewCipher(key)
+	if err != nil {
+		return nil, err
+	}
+
+	ciphertext := make([]byte, aes.BlockSize+len(plaintext))
+	iv := ciphertext[:aes.BlockSize]
+	if _, err := rand.Read(iv); err != nil {
+		return nil, err
+	}
+
+	mode := cipher.NewCBCEncrypter(block, iv)
+	mode.CryptBlocks(ciphertext[aes.BlockSize:], plaintext)
+
+	return ciphertext, nil
+}
+
+// AESDecrypt decrypts an encrypted payload with an AES cipher.
+// The decryption algorithm makes three assumptions:
+// 1. ciphertext is aligned to the standard AES block size
+// 2. ciphertext is padded using PKCS#7
+// 3. the IV is prepended to ciphertext
+func AESDecrypt(ciphertext, key []byte) ([]byte, error) {
+	if len(ciphertext) < aes.BlockSize {
+		return nil, errors.New("ciphertext too short")
+	}
+
+	iv := ciphertext[:aes.BlockSize]
+	ciphertext = ciphertext[aes.BlockSize:]
+
+	if len(ciphertext)%aes.BlockSize != 0 {
+		return nil, errors.New("ciphertext is not a multiple of the block size")
+	}
+
+	block, err := aes.NewCipher(key)
+	if err != nil {
+		return nil, err
+	}
+
+	mode := cipher.NewCBCDecrypter(block, iv)
+	mode.CryptBlocks(ciphertext, ciphertext)
+
+	if len(ciphertext)%aes.BlockSize != 0 {
+		return nil, errors.New("ciphertext is not a multiple of the block size")
+	}
+
+	return unpad(ciphertext)
+}
diff --git a/pkg/crypto/aes_test.go b/pkg/crypto/aes_test.go
new file mode 100644
index 00000000..eafb5b8b
--- /dev/null
+++ b/pkg/crypto/aes_test.go
@@ -0,0 +1,93 @@
+package crypto
+
+import (
+	"reflect"
+	"testing"
+)
+
+func TestPadUnpad(t *testing.T) {
+	tests := []struct {
+		plaintext []byte
+		bsize     int
+		padded    []byte
+	}{
+		{
+			plaintext: []byte{1, 2, 3, 4},
+			bsize:     7,
+			padded:    []byte{1, 2, 3, 4, 3, 3, 3},
+		},
+		{
+			plaintext: []byte{1, 2, 3, 4, 5, 6, 7},
+			bsize:     3,
+			padded:    []byte{1, 2, 3, 4, 5, 6, 7, 2, 2},
+		},
+		{
+			plaintext: []byte{9, 9, 9, 9},
+			bsize:     4,
+			padded:    []byte{9, 9, 9, 9, 4, 4, 4, 4},
+		},
+	}
+
+	for i, tt := range tests {
+		padded, err := pad(tt.plaintext, tt.bsize)
+		if err != nil {
+			t.Errorf("case %d: unexpected error: %v", i, err)
+			continue
+		}
+		if !reflect.DeepEqual(tt.padded, padded) {
+			t.Errorf("case %d: want=%v got=%v", i, tt.padded, padded)
+			continue
+		}
+
+		plaintext, err := unpad(tt.padded)
+		if err != nil {
+			t.Errorf("case %d: unexpected error: %v", i, err)
+			continue
+		}
+		if !reflect.DeepEqual(tt.plaintext, plaintext) {
+			t.Errorf("case %d: want=%v got=%v", i, tt.plaintext, plaintext)
+			continue
+		}
+	}
+}
+
+func TestPadMaxBlockSize(t *testing.T) {
+	_, err := pad([]byte{1, 2, 3}, 256)
+	if err == nil {
+		t.Errorf("Expected non-nil error")
+	}
+}
+
+func TestAESEncryptDecrypt(t *testing.T) {
+	message := []byte("Let me worry about blank.")
+	key := append([]byte("shark"), make([]byte, 27)...)
+
+	ciphertext, err := AESEncrypt(message, key)
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+	if reflect.DeepEqual(message, ciphertext) {
+		t.Fatal("Encrypted data matches original payload")
+	}
+
+	decrypted, err := AESDecrypt(ciphertext, key)
+	if !reflect.DeepEqual(message, decrypted) {
+		t.Fatalf("Decrypted data does not match original payload: want=%v got=%v", message, decrypted)
+	}
+}
+
+func TestAESDecryptWrongKey(t *testing.T) {
+	message := []byte("My bones!")
+	key := append([]byte("shark"), make([]byte, 27)...)
+
+	ciphertext, err := AESEncrypt(message, key)
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	wrongKey := append([]byte("sheep"), make([]byte, 27)...)
+	decrypted, _ := AESDecrypt(ciphertext, wrongKey)
+	if reflect.DeepEqual(message, decrypted) {
+		t.Fatalf("Data decrypted with different key matches original payload")
+	}
+}
diff --git a/pkg/crypto/rand.go b/pkg/crypto/rand.go
new file mode 100644
index 00000000..2c5260db
--- /dev/null
+++ b/pkg/crypto/rand.go
@@ -0,0 +1,17 @@
+package crypto
+
+import (
+	"crypto/rand"
+	"errors"
+)
+
+func RandBytes(n int) ([]byte, error) {
+	b := make([]byte, n)
+	got, err := rand.Read(b)
+	if err != nil {
+		return nil, err
+	} else if n != got {
+		return nil, errors.New("unable to generate enough random data")
+	}
+	return b, nil
+}
diff --git a/pkg/flag/env.go b/pkg/flag/env.go
new file mode 100644
index 00000000..7fe778ce
--- /dev/null
+++ b/pkg/flag/env.go
@@ -0,0 +1,34 @@
+package flag
+
+import (
+	"flag"
+	"fmt"
+	"os"
+	"strings"
+)
+
+// SetFlagsFromEnv parses all registered flags in the given flagset,
+// and if they are not already set it attempts to set their values from
+// environment variables. Environment variables take the name of the flag but
+// are UPPERCASE, and any dashes are replaced by underscores. Environment
+// variables additionally are prefixed by the given string followed by
+// and underscore. For example, if prefix=PREFIX: some-flag => PREFIX_SOME_FLAG
+func SetFlagsFromEnv(fs *flag.FlagSet, prefix string) error {
+	var err error
+	alreadySet := make(map[string]bool)
+	fs.Visit(func(f *flag.Flag) {
+		alreadySet[f.Name] = true
+	})
+	fs.VisitAll(func(f *flag.Flag) {
+		if !alreadySet[f.Name] {
+			key := prefix + "_" + strings.ToUpper(strings.Replace(f.Name, "-", "_", -1))
+			val := os.Getenv(key)
+			if val != "" {
+				if serr := fs.Set(f.Name, val); serr != nil {
+					err = fmt.Errorf("invalid value %q for %s: %v", val, key, serr)
+				}
+			}
+		}
+	})
+	return err
+}
diff --git a/pkg/flag/env_test.go b/pkg/flag/env_test.go
new file mode 100644
index 00000000..039f082e
--- /dev/null
+++ b/pkg/flag/env_test.go
@@ -0,0 +1,64 @@
+package flag
+
+import (
+	"flag"
+	"os"
+	"testing"
+)
+
+func TestSetFlagsFromEnv(t *testing.T) {
+	fs := flag.NewFlagSet("testing", flag.ExitOnError)
+	fs.String("a", "", "")
+	fs.String("b", "", "")
+	fs.String("c", "", "")
+	fs.Parse([]string{})
+
+	os.Clearenv()
+	// flags should be settable using env vars
+	os.Setenv("DEX_A", "foo")
+	// and command-line flags
+	if err := fs.Set("b", "bar"); err != nil {
+		t.Fatal(err)
+	}
+	// command-line flags take precedence over env vars
+	os.Setenv("DEX_C", "woof")
+	if err := fs.Set("c", "quack"); err != nil {
+		t.Fatal(err)
+	}
+
+	// first verify that flags are as expected before reading the env
+	for f, want := range map[string]string{
+		"a": "",
+		"b": "bar",
+		"c": "quack",
+	} {
+		if got := fs.Lookup(f).Value.String(); got != want {
+			t.Fatalf("flag %q=%q, want %q", f, got, want)
+		}
+	}
+
+	// now read the env and verify flags were updated as expected
+	err := SetFlagsFromEnv(fs, "DEX")
+	if err != nil {
+		t.Errorf("err=%v, want nil", err)
+	}
+	for f, want := range map[string]string{
+		"a": "foo",
+		"b": "bar",
+		"c": "quack",
+	} {
+		if got := fs.Lookup(f).Value.String(); got != want {
+			t.Errorf("flag %q=%q, want %q", f, got, want)
+		}
+	}
+}
+
+func TestSetFlagsFromEnvBad(t *testing.T) {
+	// now verify that an error is propagated
+	fs := flag.NewFlagSet("testing", flag.ExitOnError)
+	fs.Int("x", 0, "")
+	os.Setenv("DEX_X", "not_a_number")
+	if err := SetFlagsFromEnv(fs, "DEX"); err == nil {
+		t.Errorf("err=nil, want != nil")
+	}
+}
diff --git a/pkg/html/html.go b/pkg/html/html.go
new file mode 100644
index 00000000..3ce27e2a
--- /dev/null
+++ b/pkg/html/html.go
@@ -0,0 +1,43 @@
+package html
+
+import (
+	"io"
+	"net/url"
+
+	"github.com/PuerkitoBio/goquery"
+	"golang.org/x/net/html"
+)
+
+// FormValues will return the values of a form on an html document.
+func FormValues(formSelector string, body io.Reader) (url.Values, error) {
+	doc, err := goquery.NewDocumentFromReader(body)
+	if err != nil {
+		return nil, err
+	}
+
+	values := url.Values{}
+	form := doc.Find(formSelector)
+	inputs := form.Find("input")
+	for _, input := range inputs.Nodes {
+		inputName, ok := attrValue(input.Attr, "name")
+		if !ok {
+			continue
+		}
+		val, ok := attrValue(input.Attr, "value")
+		if !ok {
+			continue
+		}
+
+		values.Add(inputName, val)
+	}
+	return values, nil
+}
+
+func attrValue(attrs []html.Attribute, name string) (string, bool) {
+	for _, attr := range attrs {
+		if attr.Key == name {
+			return attr.Val, true
+		}
+	}
+	return "", false
+}
diff --git a/pkg/html/html_test.go b/pkg/html/html_test.go
new file mode 100644
index 00000000..d84fc884
--- /dev/null
+++ b/pkg/html/html_test.go
@@ -0,0 +1,48 @@
+package html
+
+import (
+	"bytes"
+	"testing"
+
+	"github.com/kylelemons/godebug/pretty"
+)
+
+func TestFormValues(t *testing.T) {
+	form := `
+<html>
+  <body>
+    <form id="formy">
+      <input type="text" name="text1" value="textvalue1"/>
+      <div> 
+        <input type="hidden" name="hidden1" value="hiddenvalue1" />
+      </div>
+      <input type="text" name="repeat1" value="repeatval1"/>
+      <input type="text" name="repeat1" value="repeatval2"/>
+      <input type="text" name="repeat1" value="repeatval3"/>
+    </form>
+  </body>
+`
+	want := map[string][]string{
+		"text1": []string{
+			"textvalue1",
+		},
+		"hidden1": []string{
+			"hiddenvalue1",
+		},
+		"repeat1": []string{
+			"repeatval1",
+			"repeatval2",
+			"repeatval3",
+		},
+	}
+
+	values, err := FormValues("#formy", bytes.NewBufferString(form))
+	if err != nil {
+		t.Errorf("expected nil err: %q", err)
+	}
+
+	if diff := pretty.Compare(want, values); diff != "" {
+		t.Errorf("Compare(want, got) = %v", diff)
+	}
+
+}
diff --git a/pkg/http/client.go b/pkg/http/client.go
new file mode 100644
index 00000000..942e2bb1
--- /dev/null
+++ b/pkg/http/client.go
@@ -0,0 +1,51 @@
+package http
+
+import (
+	"io/ioutil"
+	"net/http"
+	"net/http/httptest"
+)
+
+type Client interface {
+	Do(*http.Request) (*http.Response, error)
+}
+
+type HandlerClient struct {
+	Handler http.Handler
+}
+
+func (hc *HandlerClient) Do(r *http.Request) (*http.Response, error) {
+	w := httptest.NewRecorder()
+	hc.Handler.ServeHTTP(w, r)
+
+	resp := http.Response{
+		StatusCode: w.Code,
+		Header:     w.Header(),
+		Body:       ioutil.NopCloser(w.Body),
+	}
+
+	return &resp, nil
+}
+
+type RequestRecorder struct {
+	Response *http.Response
+	Error    error
+
+	Request *http.Request
+}
+
+func (rr *RequestRecorder) Do(req *http.Request) (*http.Response, error) {
+	rr.Request = req
+
+	if rr.Response == nil && rr.Error == nil {
+		panic("RequestRecorder Response and Error cannot both be nil")
+	} else if rr.Response != nil && rr.Error != nil {
+		panic("RequestRecorder Response and Error cannot both be non-nil")
+	}
+
+	return rr.Response, rr.Error
+}
+
+func (rr *RequestRecorder) RoundTrip(req *http.Request) (*http.Response, error) {
+	return rr.Do(req)
+}
diff --git a/pkg/http/http.go b/pkg/http/http.go
new file mode 100644
index 00000000..950bca54
--- /dev/null
+++ b/pkg/http/http.go
@@ -0,0 +1,155 @@
+package http
+
+import (
+	"encoding/base64"
+	"encoding/json"
+	"errors"
+	"net/http"
+	"net/url"
+	"path"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/coreos/dex/pkg/log"
+)
+
+func WriteError(w http.ResponseWriter, code int, msg string) {
+	e := struct {
+		Error string `json:"error"`
+	}{
+		Error: msg,
+	}
+	b, err := json.Marshal(e)
+	if err != nil {
+		log.Errorf("Failed marshaling %#v to JSON: %v", e, err)
+	}
+	w.Header().Set("Content-Type", "application/json")
+	w.WriteHeader(code)
+	w.Write(b)
+}
+
+// BasicAuth parses a username and password from the request's
+// Authorization header. This was pulled from golang master:
+// https://codereview.appspot.com/76540043
+func BasicAuth(r *http.Request) (username, password string, ok bool) {
+	auth := r.Header.Get("Authorization")
+	if auth == "" {
+		return
+	}
+
+	if !strings.HasPrefix(auth, "Basic ") {
+		return
+	}
+	c, err := base64.StdEncoding.DecodeString(strings.TrimPrefix(auth, "Basic "))
+	if err != nil {
+		return
+	}
+	cs := string(c)
+	s := strings.IndexByte(cs, ':')
+	if s < 0 {
+		return
+	}
+	return cs[:s], cs[s+1:], true
+}
+
+func cacheControlMaxAge(hdr string) (time.Duration, bool, error) {
+	for _, field := range strings.Split(hdr, ",") {
+		parts := strings.SplitN(strings.TrimSpace(field), "=", 2)
+		k := strings.ToLower(strings.TrimSpace(parts[0]))
+		if k != "max-age" {
+			continue
+		}
+
+		if len(parts) == 1 {
+			return 0, false, errors.New("max-age has no value")
+		}
+
+		v := strings.TrimSpace(parts[1])
+		if v == "" {
+			return 0, false, errors.New("max-age has empty value")
+		}
+
+		age, err := strconv.Atoi(v)
+		if err != nil {
+			return 0, false, err
+		}
+
+		if age <= 0 {
+			return 0, false, nil
+		}
+
+		return time.Duration(age) * time.Second, true, nil
+	}
+
+	return 0, false, nil
+}
+
+func expires(date, expires string) (time.Duration, bool, error) {
+	if date == "" || expires == "" {
+		return 0, false, nil
+	}
+
+	te, err := time.Parse(time.RFC1123, expires)
+	if err != nil {
+		return 0, false, err
+	}
+
+	td, err := time.Parse(time.RFC1123, date)
+	if err != nil {
+		return 0, false, err
+	}
+
+	ttl := te.Sub(td)
+
+	// headers indicate data already expired, caller should not
+	// have to care about this case
+	if ttl <= 0 {
+		return 0, false, nil
+	}
+
+	return ttl, true, nil
+}
+
+func Cacheable(hdr http.Header) (time.Duration, bool, error) {
+	ttl, ok, err := cacheControlMaxAge(hdr.Get("Cache-Control"))
+	if err != nil || ok {
+		return ttl, ok, err
+	}
+
+	return expires(hdr.Get("Date"), hdr.Get("Expires"))
+}
+
+// MergeQuery appends additional query values to an existing URL.
+func MergeQuery(u url.URL, q url.Values) url.URL {
+	uv := u.Query()
+	for k, vs := range q {
+		for _, v := range vs {
+			uv.Add(k, v)
+		}
+	}
+	u.RawQuery = uv.Encode()
+	return u
+}
+
+// NewResourceLocation appends a resource id to the end of the requested URL path.
+func NewResourceLocation(reqURL *url.URL, id string) string {
+	var u url.URL
+	u = *reqURL
+	u.Path = path.Join(u.Path, id)
+	u.RawQuery = ""
+	u.Fragment = ""
+	return u.String()
+}
+
+// CopyRequest returns a clone of the provided *http.Request.
+// The returned object is a shallow copy of the struct and a
+// deep copy of its Header field.
+func CopyRequest(r *http.Request) *http.Request {
+	r2 := *r
+	r2.Header = make(http.Header)
+	for k, s := range r.Header {
+		r2.Header[k] = s
+	}
+	return &r2
+}
diff --git a/pkg/http/http_test.go b/pkg/http/http_test.go
new file mode 100644
index 00000000..8ec76a24
--- /dev/null
+++ b/pkg/http/http_test.go
@@ -0,0 +1,380 @@
+package http
+
+import (
+	"net/http"
+	"net/url"
+	"reflect"
+	"strings"
+	"testing"
+	"time"
+)
+
+func TestCacheControlMaxAgeSuccess(t *testing.T) {
+	tests := []struct {
+		hdr     string
+		wantAge time.Duration
+		wantOK  bool
+	}{
+		{"max-age=12", 12 * time.Second, true},
+		{"max-age=-12", 0, false},
+		{"max-age=0", 0, false},
+		{"public, max-age=12", 12 * time.Second, true},
+		{"public, max-age=40192, must-revalidate", 40192 * time.Second, true},
+		{"public, not-max-age=12, must-revalidate", time.Duration(0), false},
+	}
+
+	for i, tt := range tests {
+		maxAge, ok, err := cacheControlMaxAge(tt.hdr)
+		if err != nil {
+			t.Errorf("case %d: err=%v", i, err)
+		}
+		if tt.wantAge != maxAge {
+			t.Errorf("case %d: want=%d got=%d", i, tt.wantAge, maxAge)
+		}
+		if tt.wantOK != ok {
+			t.Errorf("case %d: incorrect ok value: want=%t got=%t", i, tt.wantOK, ok)
+		}
+	}
+}
+
+func TestCacheControlMaxAgeFail(t *testing.T) {
+	tests := []string{
+		"max-age=aasdf",
+		"max-age=",
+		"max-age",
+	}
+
+	for i, tt := range tests {
+		_, ok, err := cacheControlMaxAge(tt)
+		if ok {
+			t.Errorf("case %d: want ok=false, got true", i)
+		}
+		if err == nil {
+			t.Errorf("case %d: want non-nil err", i)
+		}
+	}
+}
+
+func TestMergeQuery(t *testing.T) {
+	tests := []struct {
+		u string
+		q url.Values
+		w string
+	}{
+		// No values
+		{
+			u: "http://example.com",
+			q: nil,
+			w: "http://example.com",
+		},
+		// No additional values
+		{
+			u: "http://example.com?foo=bar",
+			q: nil,
+			w: "http://example.com?foo=bar",
+		},
+		// Simple addition
+		{
+			u: "http://example.com",
+			q: url.Values{
+				"foo": []string{"bar"},
+			},
+			w: "http://example.com?foo=bar",
+		},
+		// Addition with existing values
+		{
+			u: "http://example.com?dog=boo",
+			q: url.Values{
+				"foo": []string{"bar"},
+			},
+			w: "http://example.com?dog=boo&foo=bar",
+		},
+		// Merge
+		{
+			u: "http://example.com?dog=boo",
+			q: url.Values{
+				"dog": []string{"elroy"},
+			},
+			w: "http://example.com?dog=boo&dog=elroy",
+		},
+		// Add and merge
+		{
+			u: "http://example.com?dog=boo",
+			q: url.Values{
+				"dog": []string{"elroy"},
+				"foo": []string{"bar"},
+			},
+			w: "http://example.com?dog=boo&dog=elroy&foo=bar",
+		},
+		// Multivalue merge
+		{
+			u: "http://example.com?dog=boo",
+			q: url.Values{
+				"dog": []string{"elroy", "penny"},
+			},
+			w: "http://example.com?dog=boo&dog=elroy&dog=penny",
+		},
+	}
+
+	for i, tt := range tests {
+		ur, err := url.Parse(tt.u)
+		if err != nil {
+			t.Errorf("case %d: failed parsing test url: %v, error: %v", i, tt.u, err)
+		}
+
+		got := MergeQuery(*ur, tt.q)
+		want, err := url.Parse(tt.w)
+		if err != nil {
+			t.Errorf("case %d: failed parsing want url: %v, error: %v", i, tt.w, err)
+		}
+
+		if !reflect.DeepEqual(*want, got) {
+			t.Errorf("case %d: want: %v, got: %v", i, *want, got)
+		}
+	}
+}
+
+func TestExpiresPass(t *testing.T) {
+	tests := []struct {
+		date    string
+		exp     string
+		wantTTL time.Duration
+		wantOK  bool
+	}{
+		// Expires and Date properly set
+		{
+			date:    "Thu, 01 Dec 1983 22:00:00 GMT",
+			exp:     "Fri, 02 Dec 1983 01:00:00 GMT",
+			wantTTL: 10800 * time.Second,
+			wantOK:  true,
+		},
+		// empty headers
+		{
+			date:   "",
+			exp:    "",
+			wantOK: false,
+		},
+		// lack of Expirs short-ciruits Date parsing
+		{
+			date:   "foo",
+			exp:    "",
+			wantOK: false,
+		},
+		// lack of Date short-ciruits Expires parsing
+		{
+			date:   "",
+			exp:    "foo",
+			wantOK: false,
+		},
+		// no Date
+		{
+			exp:     "Thu, 01 Dec 1983 22:00:00 GMT",
+			wantTTL: 0,
+			wantOK:  false,
+		},
+		// no Expires
+		{
+			date:    "Thu, 01 Dec 1983 22:00:00 GMT",
+			wantTTL: 0,
+			wantOK:  false,
+		},
+		// Expires < Date
+		{
+			date:    "Fri, 02 Dec 1983 01:00:00 GMT",
+			exp:     "Thu, 01 Dec 1983 22:00:00 GMT",
+			wantTTL: 0,
+			wantOK:  false,
+		},
+	}
+
+	for i, tt := range tests {
+		ttl, ok, err := expires(tt.date, tt.exp)
+		if err != nil {
+			t.Errorf("case %d: err=%v", i, err)
+		}
+		if tt.wantTTL != ttl {
+			t.Errorf("case %d: want=%d got=%d", i, tt.wantTTL, ttl)
+		}
+		if tt.wantOK != ok {
+			t.Errorf("case %d: incorrect ok value: want=%t got=%t", i, tt.wantOK, ok)
+		}
+	}
+}
+
+func TestExpiresFail(t *testing.T) {
+	tests := []struct {
+		date string
+		exp  string
+	}{
+		// malformed Date header
+		{
+			date: "foo",
+			exp:  "Fri, 02 Dec 1983 01:00:00 GMT",
+		},
+		// malformed exp header
+		{
+			date: "Fri, 02 Dec 1983 01:00:00 GMT",
+			exp:  "bar",
+		},
+	}
+
+	for i, tt := range tests {
+		_, _, err := expires(tt.date, tt.exp)
+		if err == nil {
+			t.Errorf("case %d: expected non-nil error", i)
+		}
+	}
+}
+
+func TestCacheablePass(t *testing.T) {
+	tests := []struct {
+		headers http.Header
+		wantTTL time.Duration
+		wantOK  bool
+	}{
+		// valid Cache-Control
+		{
+			headers: http.Header{
+				"Cache-Control": []string{"max-age=100"},
+			},
+			wantTTL: 100 * time.Second,
+			wantOK:  true,
+		},
+		// valid Date/Expires
+		{
+			headers: http.Header{
+				"Date":    []string{"Thu, 01 Dec 1983 22:00:00 GMT"},
+				"Expires": []string{"Fri, 02 Dec 1983 01:00:00 GMT"},
+			},
+			wantTTL: 10800 * time.Second,
+			wantOK:  true,
+		},
+		// Cache-Control supersedes Date/Expires
+		{
+			headers: http.Header{
+				"Cache-Control": []string{"max-age=100"},
+				"Date":          []string{"Thu, 01 Dec 1983 22:00:00 GMT"},
+				"Expires":       []string{"Fri, 02 Dec 1983 01:00:00 GMT"},
+			},
+			wantTTL: 100 * time.Second,
+			wantOK:  true,
+		},
+		// no caching headers
+		{
+			headers: http.Header{},
+			wantOK:  false,
+		},
+	}
+
+	for i, tt := range tests {
+		ttl, ok, err := Cacheable(tt.headers)
+		if err != nil {
+			t.Errorf("case %d: err=%v", i, err)
+			continue
+		}
+		if tt.wantTTL != ttl {
+			t.Errorf("case %d: want=%d got=%d", i, tt.wantTTL, ttl)
+		}
+		if tt.wantOK != ok {
+			t.Errorf("case %d: incorrect ok value: want=%t got=%t", i, tt.wantOK, ok)
+		}
+	}
+}
+
+func TestCacheableFail(t *testing.T) {
+	tests := []http.Header{
+		// invalid Cache-Control short-circuits
+		http.Header{
+			"Cache-Control": []string{"max-age"},
+			"Date":          []string{"Thu, 01 Dec 1983 22:00:00 GMT"},
+			"Expires":       []string{"Fri, 02 Dec 1983 01:00:00 GMT"},
+		},
+		// no Cache-Control, invalid Expires
+		http.Header{
+			"Date":    []string{"Thu, 01 Dec 1983 22:00:00 GMT"},
+			"Expires": []string{"boo"},
+		},
+	}
+
+	for i, tt := range tests {
+		_, _, err := Cacheable(tt)
+		if err == nil {
+			t.Errorf("case %d: want non-nil err", i)
+		}
+	}
+}
+
+func TestNewResourceLocation(t *testing.T) {
+	tests := []struct {
+		ru   *url.URL
+		id   string
+		want string
+	}{
+		{
+			ru: &url.URL{
+				Scheme: "http",
+				Host:   "example.com",
+			},
+			id:   "foo",
+			want: "http://example.com/foo",
+		},
+		// https
+		{
+			ru: &url.URL{
+				Scheme: "https",
+				Host:   "example.com",
+			},
+			id:   "foo",
+			want: "https://example.com/foo",
+		},
+		// with path
+		{
+			ru: &url.URL{
+				Scheme: "http",
+				Host:   "example.com",
+				Path:   "one/two/three",
+			},
+			id:   "foo",
+			want: "http://example.com/one/two/three/foo",
+		},
+		// with fragment
+		{
+			ru: &url.URL{
+				Scheme:   "http",
+				Host:     "example.com",
+				Fragment: "frag",
+			},
+			id:   "foo",
+			want: "http://example.com/foo",
+		},
+		// with query
+		{
+			ru: &url.URL{
+				Scheme:   "http",
+				Host:     "example.com",
+				RawQuery: "dog=elroy",
+			},
+			id:   "foo",
+			want: "http://example.com/foo",
+		},
+	}
+
+	for i, tt := range tests {
+		got := NewResourceLocation(tt.ru, tt.id)
+		if tt.want != got {
+			t.Errorf("case %d: want=%s, got=%s", i, tt.want, got)
+		}
+	}
+}
+
+func TestCopyRequest(t *testing.T) {
+	r1, err := http.NewRequest("GET", "http://example.com", strings.NewReader("foo"))
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	r2 := CopyRequest(r1)
+	if !reflect.DeepEqual(r1, r2) {
+		t.Fatalf("Result of CopyRequest incorrect: %#v != %#v", r1, r2)
+	}
+}
diff --git a/pkg/log/log.go b/pkg/log/log.go
new file mode 100644
index 00000000..75ccfff3
--- /dev/null
+++ b/pkg/log/log.go
@@ -0,0 +1,86 @@
+package log
+
+import (
+	"fmt"
+	"io"
+	"log"
+	"os"
+)
+
+const (
+	calldepth = 2
+)
+
+var (
+	logger = log.New(os.Stderr, "", 0)
+	debug  = false
+)
+
+func EnableTimestamps() {
+	logger.SetFlags(logger.Flags() | log.Ldate | log.Ltime)
+}
+
+func EnableDebug() {
+	debug = true
+}
+
+func Debug(v ...interface{}) {
+	if debug {
+		logger.Output(calldepth, header("DEBUG", fmt.Sprint(v...)))
+	}
+}
+
+func Debugf(format string, v ...interface{}) {
+	if debug {
+		logger.Output(calldepth, header("DEBUG", fmt.Sprintf(format, v...)))
+	}
+}
+
+func Info(v ...interface{}) {
+	logger.Output(calldepth, header("INFO", fmt.Sprint(v...)))
+}
+
+func Infof(format string, v ...interface{}) {
+	logger.Output(calldepth, header("INFO", fmt.Sprintf(format, v...)))
+}
+
+func Error(v ...interface{}) {
+	logger.Output(calldepth, header("ERROR", fmt.Sprint(v...)))
+}
+
+func Errorf(format string, v ...interface{}) {
+	logger.Output(calldepth, header("ERROR", fmt.Sprintf(format, v...)))
+}
+
+func Warning(v ...interface{}) {
+	logger.Output(calldepth, header("WARN", fmt.Sprint(v...)))
+}
+
+func Warningf(format string, v ...interface{}) {
+	logger.Output(calldepth, header("WARN", fmt.Sprintf(format, v...)))
+}
+
+func Fatal(v ...interface{}) {
+	logger.Output(calldepth, header("FATAL", fmt.Sprint(v...)))
+	os.Exit(1)
+}
+
+func Fatalf(format string, v ...interface{}) {
+	logger.Output(calldepth, header("FATAL", fmt.Sprintf(format, v...)))
+	os.Exit(1)
+}
+
+func header(lvl, msg string) string {
+	return fmt.Sprintf("%s: %s", lvl, msg)
+}
+
+type logWriter string
+
+func (l logWriter) Write(p []byte) (n int, err error) {
+	logger.Output(calldepth, header(string(l), string(p)))
+	return len(p), nil
+}
+
+func InfoWriter() io.Writer {
+	return logWriter("INFO")
+}
diff --git a/pkg/net/url.go b/pkg/net/url.go
new file mode 100644
index 00000000..4036f1fe
--- /dev/null
+++ b/pkg/net/url.go
@@ -0,0 +1,20 @@
+package net
+
+import (
+	"net/url"
+	"strings"
+)
+
+// URLEqual checks two urls for equality using only the host and path portions.
+func URLEqual(url1, url2 string) bool {
+	u1, err := url.Parse(url1)
+	if err != nil {
+		return false
+	}
+	u2, err := url.Parse(url2)
+	if err != nil {
+		return false
+	}
+
+	return strings.ToLower(u1.Host+u1.Path) == strings.ToLower(u2.Host+u2.Path)
+}
diff --git a/pkg/net/url_test.go b/pkg/net/url_test.go
new file mode 100644
index 00000000..21c6d4c3
--- /dev/null
+++ b/pkg/net/url_test.go
@@ -0,0 +1,30 @@
+package net
+
+import (
+	"testing"
+)
+
+func TestURLEqual(t *testing.T) {
+	tests := []struct {
+		a     string
+		b     string
+		equal bool
+	}{
+		{"https://accounts.example.com", "accounts.example.com", true},
+		{"accounts.example.com", "accounts.example.com", true},
+		{"accounts.example.com/FOO", "accounts.example.com/foo", true},
+		{"https://accounts.example.com", "https://accounts.example.com", true},
+		{"https://example.com/path1", "https://example.com/path2", false},
+		{"https://example.com/path", "https://example.com/path", true},
+		{"https://example.com/path?asdf=123", "example.com/path?foo=bar", true},
+		{"foo.com", "bar.com", false},
+		{"foo.com/foo", "foo.com/bar", false},
+	}
+
+	for i, tt := range tests {
+		equal := URLEqual(tt.a, tt.b)
+		if tt.equal != equal {
+			t.Errorf("case %d: want=%t got=%t", i, tt.equal, equal)
+		}
+	}
+}
diff --git a/pkg/time/backoff.go b/pkg/time/backoff.go
new file mode 100644
index 00000000..9838fed3
--- /dev/null
+++ b/pkg/time/backoff.go
@@ -0,0 +1,15 @@
+package time
+
+import (
+	"time"
+)
+
+func ExpBackoff(prev, max time.Duration) time.Duration {
+	if prev == 0 {
+		return time.Second
+	}
+	if prev > max/2 {
+		return max
+	}
+	return 2 * prev
+}
diff --git a/pkg/time/backoff_test.go b/pkg/time/backoff_test.go
new file mode 100644
index 00000000..c2ee4b71
--- /dev/null
+++ b/pkg/time/backoff_test.go
@@ -0,0 +1,52 @@
+package time
+
+import (
+	"testing"
+	"time"
+)
+
+func TestExpBackoff(t *testing.T) {
+	tests := []struct {
+		prev time.Duration
+		max  time.Duration
+		want time.Duration
+	}{
+		{
+			prev: time.Duration(0),
+			max:  time.Minute,
+			want: time.Second,
+		},
+		{
+			prev: time.Second,
+			max:  time.Minute,
+			want: 2 * time.Second,
+		},
+		{
+			prev: 16 * time.Second,
+			max:  time.Minute,
+			want: 32 * time.Second,
+		},
+		{
+			prev: 32 * time.Second,
+			max:  time.Minute,
+			want: time.Minute,
+		},
+		{
+			prev: time.Minute,
+			max:  time.Minute,
+			want: time.Minute,
+		},
+		{
+			prev: 2 * time.Minute,
+			max:  time.Minute,
+			want: time.Minute,
+		},
+	}
+
+	for i, tt := range tests {
+		got := ExpBackoff(tt.prev, tt.max)
+		if tt.want != got {
+			t.Errorf("case %d: want=%v got=%v", i, tt.want, got)
+		}
+	}
+}
diff --git a/refresh/refreshtest/repo.go b/refresh/refreshtest/repo.go
new file mode 100644
index 00000000..8026a7c6
--- /dev/null
+++ b/refresh/refreshtest/repo.go
@@ -0,0 +1,18 @@
+package refreshtest
+
+import (
+	"fmt"
+
+	"github.com/coreos/dex/refresh"
+)
+
+// NewTestRefreshTokenRepo returns a test repo whose tokens monotonically increase.
+// The tokens are in the form { refresh-1, refresh-2 ... refresh-n}.
+func NewTestRefreshTokenRepo() (refresh.RefreshTokenRepo, error) {
+	var tokenIdx int
+	tokenGenerator := func() (string, error) {
+		tokenIdx++
+		return fmt.Sprintf("refresh-%d", tokenIdx), nil
+	}
+	return refresh.NewRefreshTokenRepoWithTokenGenerator(tokenGenerator), nil
+}
diff --git a/refresh/repo.go b/refresh/repo.go
new file mode 100644
index 00000000..df8d5482
--- /dev/null
+++ b/refresh/repo.go
@@ -0,0 +1,166 @@
+package refresh
+
+import (
+	"crypto/rand"
+	"encoding/base64"
+	"errors"
+	"fmt"
+	"strconv"
+	"strings"
+)
+
+const (
+	DefaultRefreshTokenPayloadLength = 64
+	TokenDelimer                     = "/"
+)
+
+var (
+	ErrorInvalidUserID   = errors.New("invalid user ID")
+	ErrorInvalidClientID = errors.New("invalid client ID")
+	ErrorInvalidToken    = errors.New("invalid token")
+)
+
+type RefreshTokenGenerator func() (string, error)
+
+func (g RefreshTokenGenerator) Generate() (string, error) {
+	return g()
+}
+
+func DefaultRefreshTokenGenerator() (string, error) {
+	// TODO(yifan) Remove this duplicated token generate function.
+	b := make([]byte, DefaultRefreshTokenPayloadLength)
+	n, err := rand.Read(b)
+	if err != nil {
+		return "", err
+	} else if n != DefaultRefreshTokenPayloadLength {
+		return "", errors.New("unable to read enough random bytes")
+	}
+	return base64.URLEncoding.EncodeToString(b), nil
+}
+
+type RefreshTokenRepo interface {
+	// Create generates and returns a new refresh token for the given client-user pair.
+	// On success the token will be return.
+	Create(userID, clientID string) (string, error)
+
+	// Verify verifies that a token belongs to the client, and returns the corresponding user ID.
+	// Note that this assumes the client validation is currently done in the application layer,
+	Verify(clientID, token string) (string, error)
+
+	// Revoke deletes the refresh token if the token belongs to the given userID.
+	Revoke(userID, token string) error
+}
+
+type refreshToken struct {
+	payload  string
+	userID   string
+	clientID string
+}
+
+type memRefreshTokenRepo struct {
+	store          map[int]refreshToken
+	tokenGenerator RefreshTokenGenerator
+}
+
+// buildToken combines the token ID and token payload to create a new token.
+func buildToken(tokenID int, tokenPayload string) string {
+	return fmt.Sprintf("%d%s%s", tokenID, TokenDelimer, tokenPayload)
+}
+
+// parseToken parses a token and returns the token ID and token payload.
+func parseToken(token string) (int, string, error) {
+	parts := strings.SplitN(token, TokenDelimer, 2)
+	if len(parts) != 2 {
+		return -1, "", ErrorInvalidToken
+	}
+	id, err := strconv.Atoi(parts[0])
+	if err != nil {
+		return -1, "", ErrorInvalidToken
+	}
+	return id, parts[1], nil
+}
+
+// NewRefreshTokenRepo returns an in-memory RefreshTokenRepo useful for development.
+func NewRefreshTokenRepo() RefreshTokenRepo {
+	return NewRefreshTokenRepoWithTokenGenerator(DefaultRefreshTokenGenerator)
+}
+
+func NewRefreshTokenRepoWithTokenGenerator(tokenGenerator RefreshTokenGenerator) RefreshTokenRepo {
+	repo := &memRefreshTokenRepo{}
+	repo.store = make(map[int]refreshToken)
+	repo.tokenGenerator = tokenGenerator
+	return repo
+}
+
+func (r *memRefreshTokenRepo) Create(userID, clientID string) (string, error) {
+	// Validate userID.
+	if userID == "" {
+		return "", ErrorInvalidUserID
+	}
+
+	// Validate clientID.
+	if clientID == "" {
+		return "", ErrorInvalidClientID
+	}
+
+	// Generate and store token.
+	tokenPayload, err := r.tokenGenerator.Generate()
+	if err != nil {
+		return "", err
+	}
+
+	tokenID := len(r.store) // Should only be used in single threaded tests.
+
+	// No limits on the number of tokens per user/client for this in-memory repo.
+	r.store[tokenID] = refreshToken{
+		payload:  tokenPayload,
+		userID:   userID,
+		clientID: clientID,
+	}
+	return buildToken(tokenID, tokenPayload), nil
+}
+
+func (r *memRefreshTokenRepo) Verify(clientID, token string) (string, error) {
+	tokenID, tokenPayload, err := parseToken(token)
+	if err != nil {
+		return "", err
+	}
+
+	record, ok := r.store[tokenID]
+	if !ok {
+		return "", ErrorInvalidToken
+	}
+
+	if record.payload != tokenPayload {
+		return "", ErrorInvalidToken
+	}
+
+	if record.clientID != clientID {
+		return "", ErrorInvalidClientID
+	}
+
+	return record.userID, nil
+}
+
+func (r *memRefreshTokenRepo) Revoke(userID, token string) error {
+	tokenID, tokenPayload, err := parseToken(token)
+	if err != nil {
+		return err
+	}
+
+	record, ok := r.store[tokenID]
+	if !ok {
+		return ErrorInvalidToken
+	}
+
+	if record.payload != tokenPayload {
+		return ErrorInvalidToken
+	}
+
+	if record.userID != userID {
+		return ErrorInvalidUserID
+	}
+
+	delete(r.store, tokenID)
+	return nil
+}
diff --git a/repo/repo.go b/repo/repo.go
new file mode 100644
index 00000000..b764d58c
--- /dev/null
+++ b/repo/repo.go
@@ -0,0 +1,41 @@
+package repo
+
+import "errors"
+
+// Transaction is an abstraction of transactions typically found in database systems.
+// One of Commit() or Rollback() must be called on each transaction.
+type Transaction interface {
+	// Commit will persist the changes in the transaction.
+	Commit() error
+
+	// Rollback undoes the changes in a transaction
+	Rollback() error
+}
+
+type TransactionFactory func() (Transaction, error)
+
+// InMemTransaction satisifies the Transaction interface for in-memory systems.
+// However, the only thing it really does is ensure that the same transaction is
+// can't be committed/rolled back more than once. As such, this can lead to data
+// corruption and should not be used in production systems.
+type InMemTransaction bool
+
+func InMemTransactionFactory() (Transaction, error) {
+	return new(InMemTransaction), nil
+}
+
+func (i *InMemTransaction) Commit() error {
+	return i.commitOrRollback()
+}
+
+func (i *InMemTransaction) Rollback() error {
+	return i.commitOrRollback()
+}
+
+func (i *InMemTransaction) commitOrRollback() error {
+	if *i {
+		return errors.New("Already committed/rolled-back.")
+	}
+	*i = true
+	return nil
+}
diff --git a/schema/adminschema/util.go b/schema/adminschema/util.go
new file mode 100644
index 00000000..622d40b7
--- /dev/null
+++ b/schema/adminschema/util.go
@@ -0,0 +1,14 @@
+package adminschema
+
+import (
+	"net/http"
+	"strings"
+)
+
+func NewWithBasePath(client *http.Client, basePath string) (*Service, error) {
+	s, err := New(client)
+	if err == nil {
+		s.BasePath = strings.Replace(s.BasePath, "$ENDPOINT", basePath, 1)
+	}
+	return s, nil
+}
diff --git a/schema/adminschema/v1-gen.go b/schema/adminschema/v1-gen.go
new file mode 100644
index 00000000..88da0c92
--- /dev/null
+++ b/schema/adminschema/v1-gen.go
@@ -0,0 +1,289 @@
+// Package adminschema provides access to the Dex Admin API.
+//
+// See http://github.com/coreos/dex
+//
+// Usage example:
+//
+//   import "github.com/coreos/dex/Godeps/_workspace/src/google.golang.org/api/adminschema/v1"
+//   ...
+//   adminschemaService, err := adminschema.New(oauthHttpClient)
+package adminschema
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"strconv"
+	"strings"
+
+	"google.golang.org/api/googleapi"
+)
+
+// Always reference these packages, just in case the auto-generated code
+// below doesn't.
+var _ = bytes.NewBuffer
+var _ = strconv.Itoa
+var _ = fmt.Sprintf
+var _ = json.NewDecoder
+var _ = io.Copy
+var _ = url.Parse
+var _ = googleapi.Version
+var _ = errors.New
+var _ = strings.Replace
+
+const apiId = "dex:v1"
+const apiName = "adminschema"
+const apiVersion = "v1"
+const basePath = "$ENDPOINT/api/v1/"
+
+func New(client *http.Client) (*Service, error) {
+	if client == nil {
+		return nil, errors.New("client is nil")
+	}
+	s := &Service{client: client, BasePath: basePath}
+	s.Admin = NewAdminService(s)
+	s.State = NewStateService(s)
+	return s, nil
+}
+
+type Service struct {
+	client   *http.Client
+	BasePath string // API endpoint base URL
+
+	Admin *AdminService
+
+	State *StateService
+}
+
+func NewAdminService(s *Service) *AdminService {
+	rs := &AdminService{s: s}
+	return rs
+}
+
+type AdminService struct {
+	s *Service
+}
+
+func NewStateService(s *Service) *StateService {
+	rs := &StateService{s: s}
+	return rs
+}
+
+type StateService struct {
+	s *Service
+}
+
+type Admin struct {
+	Email string `json:"email,omitempty"`
+
+	Id string `json:"id,omitempty"`
+
+	Password string `json:"password,omitempty"`
+}
+
+type State struct {
+	AdminUserCreated bool `json:"AdminUserCreated,omitempty"`
+}
+
+// method id "dex.admin.Admin.Create":
+
+type AdminCreateCall struct {
+	s     *Service
+	admin *Admin
+	opt_  map[string]interface{}
+}
+
+// Create: Create a new admin user.
+func (r *AdminService) Create(admin *Admin) *AdminCreateCall {
+	c := &AdminCreateCall{s: r.s, opt_: make(map[string]interface{})}
+	c.admin = admin
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *AdminCreateCall) Fields(s ...googleapi.Field) *AdminCreateCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *AdminCreateCall) Do() (*Admin, error) {
+	var body io.Reader = nil
+	body, err := googleapi.WithoutDataWrapper.JSONReader(c.admin)
+	if err != nil {
+		return nil, err
+	}
+	ctype := "application/json"
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "admin")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("POST", urls, body)
+	googleapi.SetOpaque(req.URL)
+	req.Header.Set("Content-Type", ctype)
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *Admin
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Create a new admin user.",
+	//   "httpMethod": "POST",
+	//   "id": "dex.admin.Admin.Create",
+	//   "path": "admin",
+	//   "request": {
+	//     "$ref": "Admin"
+	//   },
+	//   "response": {
+	//     "$ref": "Admin"
+	//   }
+	// }
+
+}
+
+// method id "dex.admin.Admin.Get":
+
+type AdminGetCall struct {
+	s    *Service
+	id   string
+	opt_ map[string]interface{}
+}
+
+// Get: Retrieve information about an admin user.
+func (r *AdminService) Get(id string) *AdminGetCall {
+	c := &AdminGetCall{s: r.s, opt_: make(map[string]interface{})}
+	c.id = id
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *AdminGetCall) Fields(s ...googleapi.Field) *AdminGetCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *AdminGetCall) Do() (*Admin, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "admin/{id}")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"id": c.id,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *Admin
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Retrieve information about an admin user.",
+	//   "httpMethod": "GET",
+	//   "id": "dex.admin.Admin.Get",
+	//   "parameterOrder": [
+	//     "id"
+	//   ],
+	//   "parameters": {
+	//     "id": {
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "admin/{id}",
+	//   "response": {
+	//     "$ref": "Admin"
+	//   }
+	// }
+
+}
+
+// method id "dex.admin.State.Get":
+
+type StateGetCall struct {
+	s    *Service
+	opt_ map[string]interface{}
+}
+
+// Get: Get the state of the Dex DB
+func (r *StateService) Get() *StateGetCall {
+	c := &StateGetCall{s: r.s, opt_: make(map[string]interface{})}
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *StateGetCall) Fields(s ...googleapi.Field) *StateGetCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *StateGetCall) Do() (*State, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "state")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.SetOpaque(req.URL)
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *State
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Get the state of the Dex DB",
+	//   "httpMethod": "GET",
+	//   "id": "dex.admin.State.Get",
+	//   "path": "state",
+	//   "response": {
+	//     "$ref": "State"
+	//   }
+	// }
+
+}
diff --git a/schema/adminschema/v1-json.go b/schema/adminschema/v1-json.go
new file mode 100644
index 00000000..8110bff7
--- /dev/null
+++ b/schema/adminschema/v1-json.go
@@ -0,0 +1,108 @@
+package adminschema
+
+//
+// This file is automatically generated by schema/generator
+//
+// **** DO NOT EDIT ****
+//
+const DiscoveryJSON = `{
+  "kind": "discovery#restDescription",
+  "discoveryVersion": "v1",
+  "id": "dex:v1",
+  "name": "adminschema",
+  "version": "v1",
+  "title": "Dex Admin API",
+  "description": "The Dex Admin API.",
+  "documentationLink": "http://github.com/coreos/dex",
+  "protocol": "rest",
+  "icons": {
+    "x16": "",
+    "x32": ""
+  },
+  "labels": [],
+  "baseUrl": "$ENDPOINT/api/v1/",
+  "basePath": "/api/v1/",
+  "rootUrl": "$ENDPOINT/",
+  "servicePath": "api/v1/",
+  "batchPath": "batch",
+  "parameters": {},
+  "auth": {},
+  "schemas": {
+      "Admin": {
+          "id": "Admin",
+          "type": "object",
+          "properties": {
+              "id": {
+                  "type": "string"
+              },
+              "email": {
+                  "type": "string"
+              },
+              "password": {
+                  "type": "string"
+              }
+          }
+      },
+      "State": {
+          "id": "State",
+          "type": "object",
+          "properties": {
+              "AdminUserCreated": {
+                  "type": "boolean"
+              }
+          }
+      }
+  },
+  "resources": {
+      "Admin": {
+          "methods": {
+              "Get": {
+                  "id": "dex.admin.Admin.Get",
+                  "description": "Retrieve information about an admin user.",
+                  "httpMethod": "GET",
+                  "path": "admin/{id}",
+                  "parameters": {
+                      "id": {
+                          "type": "string",
+                          "required": true,
+                          "location": "path"
+                      }
+                  },
+                  "parameterOrder": [
+                      "id"
+                  ],
+                  "response": {
+                      "$ref": "Admin"
+                  }
+                  
+              },
+              "Create": {
+                  "id": "dex.admin.Admin.Create",
+                  "description": "Create a new admin user.",
+                  "httpMethod": "POST",
+                  "path": "admin",
+                  "request": {
+                      "$ref": "Admin"
+                  },
+                  "response": {
+                      "$ref": "Admin"
+                  }
+              }
+          }
+      },
+      "State": {
+          "methods": {
+              "Get": {
+                  "id": "dex.admin.State.Get",
+                  "description": "Get the state of the Dex DB",
+                  "httpMethod": "GET",
+                  "path": "state",
+                  "response": {
+                      "$ref": "State"
+                  }
+              }
+          }
+      }
+  }
+}
+`
diff --git a/schema/adminschema/v1.json b/schema/adminschema/v1.json
new file mode 100644
index 00000000..52fe0662
--- /dev/null
+++ b/schema/adminschema/v1.json
@@ -0,0 +1,100 @@
+{
+  "kind": "discovery#restDescription",
+  "discoveryVersion": "v1",
+  "id": "dex:v1",
+  "name": "adminschema",
+  "version": "v1",
+  "title": "Dex Admin API",
+  "description": "The Dex Admin API.",
+  "documentationLink": "http://github.com/coreos/dex",
+  "protocol": "rest",
+  "icons": {
+    "x16": "",
+    "x32": ""
+  },
+  "labels": [],
+  "baseUrl": "$ENDPOINT/api/v1/",
+  "basePath": "/api/v1/",
+  "rootUrl": "$ENDPOINT/",
+  "servicePath": "api/v1/",
+  "batchPath": "batch",
+  "parameters": {},
+  "auth": {},
+  "schemas": {
+      "Admin": {
+          "id": "Admin",
+          "type": "object",
+          "properties": {
+              "id": {
+                  "type": "string"
+              },
+              "email": {
+                  "type": "string"
+              },
+              "password": {
+                  "type": "string"
+              }
+          }
+      },
+      "State": {
+          "id": "State",
+          "type": "object",
+          "properties": {
+              "AdminUserCreated": {
+                  "type": "boolean"
+              }
+          }
+      }
+  },
+  "resources": {
+      "Admin": {
+          "methods": {
+              "Get": {
+                  "id": "dex.admin.Admin.Get",
+                  "description": "Retrieve information about an admin user.",
+                  "httpMethod": "GET",
+                  "path": "admin/{id}",
+                  "parameters": {
+                      "id": {
+                          "type": "string",
+                          "required": true,
+                          "location": "path"
+                      }
+                  },
+                  "parameterOrder": [
+                      "id"
+                  ],
+                  "response": {
+                      "$ref": "Admin"
+                  }
+                  
+              },
+              "Create": {
+                  "id": "dex.admin.Admin.Create",
+                  "description": "Create a new admin user.",
+                  "httpMethod": "POST",
+                  "path": "admin",
+                  "request": {
+                      "$ref": "Admin"
+                  },
+                  "response": {
+                      "$ref": "Admin"
+                  }
+              }
+          }
+      },
+      "State": {
+          "methods": {
+              "Get": {
+                  "id": "dex.admin.State.Get",
+                  "description": "Get the state of the Dex DB",
+                  "httpMethod": "GET",
+                  "path": "state",
+                  "response": {
+                      "$ref": "State"
+                  }
+              }
+          }
+      }
+  }
+}
diff --git a/schema/generator b/schema/generator
new file mode 100755
index 00000000..ffb974c9
--- /dev/null
+++ b/schema/generator
@@ -0,0 +1,56 @@
+#!/bin/bash -eu
+
+
+if [ $# -eq 0 ]; then
+    SCHEMA='worker'
+else
+    SCHEMA=$1
+fi
+
+if [ $SCHEMA = "worker" ]; then
+    IN="schema/workerschema/v1.json"
+    OUT="schema/workerschema/v1-json.go"
+    GEN="schema/workerschema/v1-gen.go"
+    GOPKG="workerschema"
+elif [ $SCHEMA = 'admin' ]; then
+    IN="schema/adminschema/v1.json"
+    OUT="schema/adminschema/v1-json.go"
+    GEN="schema/adminschema/v1-gen.go"
+    GOPKG="adminschema"
+else
+    echo "Usage: generator [worker|admin]"
+    exit 1
+fi
+
+# See schema/generator_import.go for instructions on updating the dependency
+PKG="google.golang.org/api/google-api-go-generator"
+
+# First, write the discovery document into a go file so it can be served statically by the API
+cat << EOF > "${OUT}"
+package $GOPKG
+//
+// This file is automatically generated by schema/generator
+//
+// **** DO NOT EDIT ****
+//
+EOF
+
+echo -n 'const DiscoveryJSON = `' >> ${OUT}
+cat ${IN} >> "${OUT}"
+echo -n '`' >> "${OUT}"
+
+# Now build google-api-go-generator - we vendor so this is consistently reproducible
+GEN_PATH="bin/google-api-go-generator"
+if [ ! -f ${GEN_PATH} ]; then
+	GOPATH="${PWD}/Godeps/_workspace" go build -o ${GEN_PATH} ${PKG}
+fi
+
+# Build the bindings
+GOPATH=${PWD}/gopath ./bin/google-api-go-generator \
+    -googleapi_pkg "google.golang.org/api/googleapi" \
+    -api_json_file "${IN}" \
+    -output "${GEN}"
+
+# Finally, fix the import in the bindings to refer to the vendored google-api package
+sed -i '' -e "s%google.golang.org%github.com/coreos/dex/Godeps/_workspace/src/google.golang.org%" "${GEN}"
+goimports -w ${GEN}
diff --git a/schema/generator_import.go b/schema/generator_import.go
new file mode 100644
index 00000000..09e9419a
--- /dev/null
+++ b/schema/generator_import.go
@@ -0,0 +1,12 @@
+package schema
+
+// This file exists to ensure Godep manages a vendored copy of the
+// `google-api-go-generator` library, used by the 'generate' script.
+// Unfortunately since this is a binary package and hence is not importable, we
+// need to trick godep into managing it. To update the dependency, do the following steps:
+// 1. Uncomment the import line below
+// 2. Update the package in GOPATH as appropriate (e.g. `go get -u google.golang.org/api/google-api-go-generator`)
+// 3. Run `godep save` as usual across the entire project (e.g. `godep save ./...`)
+// 4. Revert this file (i.e. comment the line again, and revert to the original import) as it may not build properly
+
+// import _ "google.golang.org/api/google-api-go-generator"
diff --git a/schema/workerschema/mapper.go b/schema/workerschema/mapper.go
new file mode 100644
index 00000000..6236f59b
--- /dev/null
+++ b/schema/workerschema/mapper.go
@@ -0,0 +1,57 @@
+package workerschema
+
+import (
+	"errors"
+	"net/url"
+
+	"github.com/coreos/go-oidc/oidc"
+)
+
+func MapSchemaClientToClientIdentity(sc Client) (oidc.ClientIdentity, error) {
+	ci := oidc.ClientIdentity{
+		Credentials: oidc.ClientCredentials{
+			ID: sc.Id,
+		},
+		Metadata: oidc.ClientMetadata{
+			RedirectURLs: make([]url.URL, len(sc.RedirectURIs)),
+		},
+	}
+
+	for i, ru := range sc.RedirectURIs {
+		if ru == "" {
+			return oidc.ClientIdentity{}, errors.New("redirect URL empty")
+		}
+
+		u, err := url.Parse(ru)
+		if err != nil {
+			return oidc.ClientIdentity{}, errors.New("redirect URL invalid")
+		}
+
+		ci.Metadata.RedirectURLs[i] = *u
+	}
+
+	return ci, nil
+}
+
+func MapClientIdentityToSchemaClient(c oidc.ClientIdentity) Client {
+	cl := Client{
+		Id:           c.Credentials.ID,
+		RedirectURIs: make([]string, len(c.Metadata.RedirectURLs)),
+	}
+	for i, u := range c.Metadata.RedirectURLs {
+		cl.RedirectURIs[i] = u.String()
+	}
+	return cl
+}
+
+func MapClientIdentityToSchemaClientWithSecret(c oidc.ClientIdentity) ClientWithSecret {
+	cl := ClientWithSecret{
+		Id:           c.Credentials.ID,
+		Secret:       c.Credentials.Secret,
+		RedirectURIs: make([]string, len(c.Metadata.RedirectURLs)),
+	}
+	for i, u := range c.Metadata.RedirectURLs {
+		cl.RedirectURIs[i] = u.String()
+	}
+	return cl
+}
diff --git a/schema/workerschema/util.go b/schema/workerschema/util.go
new file mode 100644
index 00000000..08ab0740
--- /dev/null
+++ b/schema/workerschema/util.go
@@ -0,0 +1,14 @@
+package workerschema
+
+import (
+	"net/http"
+	"strings"
+)
+
+func NewWithBasePath(client *http.Client, basePath string) (*Service, error) {
+	s, err := New(client)
+	if err == nil {
+		s.BasePath = strings.Replace(s.BasePath, "$ENDPOINT", basePath, 1)
+	}
+	return s, nil
+}
diff --git a/schema/workerschema/v1-gen.go b/schema/workerschema/v1-gen.go
new file mode 100644
index 00000000..f090b79f
--- /dev/null
+++ b/schema/workerschema/v1-gen.go
@@ -0,0 +1,514 @@
+// Package workerschema provides access to the Dex API.
+//
+// See http://github.com/coreos/dex
+//
+// Usage example:
+//
+//   import "google.golang.org/api/workerschema/v1"
+//   ...
+//   workerschemaService, err := workerschema.New(oauthHttpClient)
+package workerschema
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"strconv"
+	"strings"
+
+	"google.golang.org/api/googleapi"
+)
+
+// Always reference these packages, just in case the auto-generated code
+// below doesn't.
+var _ = bytes.NewBuffer
+var _ = strconv.Itoa
+var _ = fmt.Sprintf
+var _ = json.NewDecoder
+var _ = io.Copy
+var _ = url.Parse
+var _ = googleapi.Version
+var _ = errors.New
+var _ = strings.Replace
+
+const apiId = "dex:v1"
+const apiName = "workerschema"
+const apiVersion = "v1"
+const basePath = "$ENDPOINT/api/v1/"
+
+func New(client *http.Client) (*Service, error) {
+	if client == nil {
+		return nil, errors.New("client is nil")
+	}
+	s := &Service{client: client, BasePath: basePath}
+	s.Clients = NewClientsService(s)
+	s.Users = NewUsersService(s)
+	return s, nil
+}
+
+type Service struct {
+	client   *http.Client
+	BasePath string // API endpoint base URL
+
+	Clients *ClientsService
+
+	Users *UsersService
+}
+
+func NewClientsService(s *Service) *ClientsService {
+	rs := &ClientsService{s: s}
+	return rs
+}
+
+type ClientsService struct {
+	s *Service
+}
+
+func NewUsersService(s *Service) *UsersService {
+	rs := &UsersService{s: s}
+	return rs
+}
+
+type UsersService struct {
+	s *Service
+}
+
+type Client struct {
+	Id string `json:"id,omitempty"`
+
+	RedirectURIs []string `json:"redirectURIs,omitempty"`
+}
+
+type ClientPage struct {
+	Clients []*Client `json:"clients,omitempty"`
+
+	NextPageToken string `json:"nextPageToken,omitempty"`
+}
+
+type ClientWithSecret struct {
+	Id string `json:"id,omitempty"`
+
+	RedirectURIs []string `json:"redirectURIs,omitempty"`
+
+	Secret string `json:"secret,omitempty"`
+}
+
+type Error struct {
+	Error string `json:"error,omitempty"`
+
+	Error_description string `json:"error_description,omitempty"`
+}
+
+type User struct {
+	Admin bool `json:"admin,omitempty"`
+
+	CreatedAt string `json:"createdAt,omitempty"`
+
+	DisplayName string `json:"displayName,omitempty"`
+
+	Email string `json:"email,omitempty"`
+
+	EmailVerified bool `json:"emailVerified,omitempty"`
+
+	Id string `json:"id,omitempty"`
+}
+
+type UserCreateRequest struct {
+	RedirectURL string `json:"redirectURL,omitempty"`
+
+	User *User `json:"user,omitempty"`
+}
+
+type UserCreateResponse struct {
+	EmailSent bool `json:"emailSent,omitempty"`
+
+	ResetPasswordLink string `json:"resetPasswordLink,omitempty"`
+
+	User *User `json:"user,omitempty"`
+}
+
+type UserCreateResponseUser struct {
+}
+
+type UserResponse struct {
+	User *User `json:"user,omitempty"`
+}
+
+type UsersResponse struct {
+	NextPageToken string `json:"nextPageToken,omitempty"`
+
+	Users []*User `json:"users,omitempty"`
+}
+
+// method id "dex.Client.Create":
+
+type ClientsCreateCall struct {
+	s      *Service
+	client *Client
+	opt_   map[string]interface{}
+}
+
+// Create: Register a new Client.
+func (r *ClientsService) Create(client *Client) *ClientsCreateCall {
+	c := &ClientsCreateCall{s: r.s, opt_: make(map[string]interface{})}
+	c.client = client
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *ClientsCreateCall) Fields(s ...googleapi.Field) *ClientsCreateCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *ClientsCreateCall) Do() (*ClientWithSecret, error) {
+	var body io.Reader = nil
+	body, err := googleapi.WithoutDataWrapper.JSONReader(c.client)
+	if err != nil {
+		return nil, err
+	}
+	ctype := "application/json"
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "clients")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("POST", urls, body)
+	googleapi.SetOpaque(req.URL)
+	req.Header.Set("Content-Type", ctype)
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *ClientWithSecret
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Register a new Client.",
+	//   "httpMethod": "POST",
+	//   "id": "dex.Client.Create",
+	//   "path": "clients",
+	//   "request": {
+	//     "$ref": "Client"
+	//   },
+	//   "response": {
+	//     "$ref": "ClientWithSecret"
+	//   }
+	// }
+
+}
+
+// method id "dex.Client.List":
+
+type ClientsListCall struct {
+	s    *Service
+	opt_ map[string]interface{}
+}
+
+// List: Retrieve a page of Client objects.
+func (r *ClientsService) List() *ClientsListCall {
+	c := &ClientsListCall{s: r.s, opt_: make(map[string]interface{})}
+	return c
+}
+
+// NextPageToken sets the optional parameter "nextPageToken":
+func (c *ClientsListCall) NextPageToken(nextPageToken string) *ClientsListCall {
+	c.opt_["nextPageToken"] = nextPageToken
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *ClientsListCall) Fields(s ...googleapi.Field) *ClientsListCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *ClientsListCall) Do() (*ClientPage, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["nextPageToken"]; ok {
+		params.Set("nextPageToken", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "clients")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.SetOpaque(req.URL)
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *ClientPage
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Retrieve a page of Client objects.",
+	//   "httpMethod": "GET",
+	//   "id": "dex.Client.List",
+	//   "parameters": {
+	//     "nextPageToken": {
+	//       "location": "query",
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "clients",
+	//   "response": {
+	//     "$ref": "ClientPage"
+	//   }
+	// }
+
+}
+
+// method id "dex.User.Create":
+
+type UsersCreateCall struct {
+	s                 *Service
+	usercreaterequest *UserCreateRequest
+	opt_              map[string]interface{}
+}
+
+// Create: Create a new User.
+func (r *UsersService) Create(usercreaterequest *UserCreateRequest) *UsersCreateCall {
+	c := &UsersCreateCall{s: r.s, opt_: make(map[string]interface{})}
+	c.usercreaterequest = usercreaterequest
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *UsersCreateCall) Fields(s ...googleapi.Field) *UsersCreateCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *UsersCreateCall) Do() (*UserCreateResponse, error) {
+	var body io.Reader = nil
+	body, err := googleapi.WithoutDataWrapper.JSONReader(c.usercreaterequest)
+	if err != nil {
+		return nil, err
+	}
+	ctype := "application/json"
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "users")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("POST", urls, body)
+	googleapi.SetOpaque(req.URL)
+	req.Header.Set("Content-Type", ctype)
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *UserCreateResponse
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Create a new User.",
+	//   "httpMethod": "POST",
+	//   "id": "dex.User.Create",
+	//   "path": "users",
+	//   "request": {
+	//     "$ref": "UserCreateRequest"
+	//   },
+	//   "response": {
+	//     "$ref": "UserCreateResponse"
+	//   }
+	// }
+
+}
+
+// method id "dex.User.Get":
+
+type UsersGetCall struct {
+	s    *Service
+	id   string
+	opt_ map[string]interface{}
+}
+
+// Get: Get a single use object.
+func (r *UsersService) Get(id string) *UsersGetCall {
+	c := &UsersGetCall{s: r.s, opt_: make(map[string]interface{})}
+	c.id = id
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *UsersGetCall) Fields(s ...googleapi.Field) *UsersGetCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *UsersGetCall) Do() (*UserResponse, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "users/{id}")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.Expand(req.URL, map[string]string{
+		"id": c.id,
+	})
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *UserResponse
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Get a single use object.",
+	//   "httpMethod": "GET",
+	//   "id": "dex.User.Get",
+	//   "parameterOrder": [
+	//     "id"
+	//   ],
+	//   "parameters": {
+	//     "id": {
+	//       "location": "path",
+	//       "required": true,
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "users/{id}",
+	//   "response": {
+	//     "$ref": "UserResponse"
+	//   }
+	// }
+
+}
+
+// method id "dex.User.List":
+
+type UsersListCall struct {
+	s    *Service
+	opt_ map[string]interface{}
+}
+
+// List: Retrieve a page of User objects.
+func (r *UsersService) List() *UsersListCall {
+	c := &UsersListCall{s: r.s, opt_: make(map[string]interface{})}
+	return c
+}
+
+// MaxResults sets the optional parameter "maxResults":
+func (c *UsersListCall) MaxResults(maxResults int64) *UsersListCall {
+	c.opt_["maxResults"] = maxResults
+	return c
+}
+
+// NextPageToken sets the optional parameter "nextPageToken":
+func (c *UsersListCall) NextPageToken(nextPageToken string) *UsersListCall {
+	c.opt_["nextPageToken"] = nextPageToken
+	return c
+}
+
+// Fields allows partial responses to be retrieved.
+// See https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
+// for more information.
+func (c *UsersListCall) Fields(s ...googleapi.Field) *UsersListCall {
+	c.opt_["fields"] = googleapi.CombineFields(s)
+	return c
+}
+
+func (c *UsersListCall) Do() (*UsersResponse, error) {
+	var body io.Reader = nil
+	params := make(url.Values)
+	params.Set("alt", "json")
+	if v, ok := c.opt_["maxResults"]; ok {
+		params.Set("maxResults", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["nextPageToken"]; ok {
+		params.Set("nextPageToken", fmt.Sprintf("%v", v))
+	}
+	if v, ok := c.opt_["fields"]; ok {
+		params.Set("fields", fmt.Sprintf("%v", v))
+	}
+	urls := googleapi.ResolveRelative(c.s.BasePath, "users")
+	urls += "?" + params.Encode()
+	req, _ := http.NewRequest("GET", urls, body)
+	googleapi.SetOpaque(req.URL)
+	req.Header.Set("User-Agent", "google-api-go-client/0.5")
+	res, err := c.s.client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer googleapi.CloseBody(res)
+	if err := googleapi.CheckResponse(res); err != nil {
+		return nil, err
+	}
+	var ret *UsersResponse
+	if err := json.NewDecoder(res.Body).Decode(&ret); err != nil {
+		return nil, err
+	}
+	return ret, nil
+	// {
+	//   "description": "Retrieve a page of User objects.",
+	//   "httpMethod": "GET",
+	//   "id": "dex.User.List",
+	//   "parameters": {
+	//     "maxResults": {
+	//       "location": "query",
+	//       "type": "integer"
+	//     },
+	//     "nextPageToken": {
+	//       "location": "query",
+	//       "type": "string"
+	//     }
+	//   },
+	//   "path": "users",
+	//   "response": {
+	//     "$ref": "UsersResponse"
+	//   }
+	// }
+
+}
diff --git a/schema/workerschema/v1-json.go b/schema/workerschema/v1-json.go
new file mode 100644
index 00000000..0e9d7665
--- /dev/null
+++ b/schema/workerschema/v1-json.go
@@ -0,0 +1,260 @@
+package workerschema
+
+//
+// This file is automatically generated by schema/generator
+//
+// **** DO NOT EDIT ****
+//
+const DiscoveryJSON = `{
+  "kind": "discovery#restDescription",
+  "discoveryVersion": "v1",
+  "id": "dex:v1",
+  "name": "workerschema",
+  "version": "v1",
+  "title": "Dex API",
+  "description": "The Dex REST API",
+  "documentationLink": "http://github.com/coreos/dex",
+  "protocol": "rest",
+  "icons": {
+    "x16": "",
+    "x32": ""
+  },
+  "labels": [],
+  "baseUrl": "$ENDPOINT/api/v1/",
+  "basePath": "/api/v1/",
+  "rootUrl": "$ENDPOINT/",
+  "servicePath": "api/v1/",
+  "batchPath": "batch",
+  "parameters": {},
+  "auth": {},
+  "schemas": {
+    "Error": {
+      "id": "Error",
+      "type": "object",
+      "properties": {
+        "error": {
+          "type": "string"
+        },
+        "error_description": {
+          "type": "string"
+        }
+      }
+    },
+    "Client": {
+      "id": "Client",
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string"
+        },
+        "redirectURIs": {
+          "required": true,
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "ClientWithSecret": {
+      "id": "Client",
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string"
+        },
+        "secret": {
+          "type": "string"
+        },
+        "redirectURIs": {
+          "required": true,
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "ClientPage": {
+      "id": "ClientPage",
+      "type": "object",
+      "properties": {
+        "clients": {
+          "type": "array",
+          "items": {
+            "$ref": "Client"
+          }
+        },
+        "nextPageToken": {
+          "type": "string"
+        }
+      }
+    },
+    "User": {
+      "id": "User",
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string"
+        },
+        "email": {
+          "type": "string"
+        },
+        "displayName": {
+          "type": "string"
+        },
+        "emailVerified": {
+          "type": "boolean"
+        },
+        "admin": {
+          "type": "boolean"
+        },
+        "createdAt": {
+          "type": "string",
+          "format": "date-time"
+        }
+      }
+    },
+    "UserResponse": {
+      "id": "UserResponse",
+      "type": "object",
+      "properties": {
+        "user": {
+            "$ref": "User"
+        }
+      }
+    },
+    "UsersResponse": {
+      "id": "UsersResponse",
+      "type": "object",
+      "properties": {
+        "users": {
+          "type": "array",
+          "items": {
+            "$ref": "User"
+          }
+        },
+        "nextPageToken": {
+          "type": "string"
+        }
+      }
+    },
+    "UserCreateRequest": {
+      "id": "UserCreateRequest",
+      "type": "object",
+      "properties": {
+        "user": {
+          "$ref": "User"
+        },
+        "redirectURL": {
+          "type": "string",
+          "format": "url"
+        }
+      }
+    },
+    "UserCreateResponse": {
+      "id": "UserCreateResponse",
+      "type": "object",
+      "properties": {
+        "user": {
+          "type": "object",
+          "$ref": "User"
+        },
+        "resetPasswordLink": {
+          "type": "string"
+        },
+        "emailSent": {
+          "type": "boolean"
+        }
+      }
+    }
+  },
+  "resources": {
+    "Clients": {
+      "methods": {
+        "List": {
+          "id": "dex.Client.List",
+          "description": "Retrieve a page of Client objects.",
+          "httpMethod": "GET",
+          "path": "clients",
+          "parameters": {
+            "nextPageToken": {
+              "type": "string",
+              "location": "query"
+            }
+          },
+          "response": {
+            "$ref": "ClientPage"
+          }
+        },
+        "Create": {
+          "id": "dex.Client.Create",
+          "description": "Register a new Client.",
+          "httpMethod": "POST",
+          "path": "clients",
+          "request": {
+            "$ref": "Client"
+          },
+          "response": {
+            "$ref": "ClientWithSecret"
+          }
+        }
+      }
+    },
+    "Users": {
+      "methods": {
+        "List": {
+          "id": "dex.User.List",
+          "description": "Retrieve a page of User objects.",
+          "httpMethod": "GET",
+          "path": "users",
+          "parameters": {
+            "nextPageToken": {
+              "type": "string",
+              "location": "query"
+            },
+            "maxResults": {
+              "type": "integer",
+              "location": "query"
+            }
+          },
+          "response": {
+            "$ref": "UsersResponse"
+          }
+        },
+        "Get": {
+          "id": "dex.User.Get",
+          "description": "Get a single use object.",
+          "httpMethod": "GET",
+          "path": "users/{id}",
+          "parameters": {
+            "id": {
+              "type": "string",
+              "required": true,
+              "location": "path"
+            }
+          },
+          "parameterOrder": [
+            "id"
+          ],
+          "response": {
+            "$ref": "UserResponse"
+          }
+        },
+        "Create": {
+          "id": "dex.User.Create",
+          "description": "Create a new User.",
+          "httpMethod": "POST",
+          "path": "users",
+          "request": {
+            "$ref": "UserCreateRequest"
+          },
+          "response": {
+            "$ref": "UserCreateResponse"
+          }
+        }
+      }
+    }
+  }
+}
+`
diff --git a/schema/workerschema/v1.json b/schema/workerschema/v1.json
new file mode 100644
index 00000000..546f3efa
--- /dev/null
+++ b/schema/workerschema/v1.json
@@ -0,0 +1,252 @@
+{
+  "kind": "discovery#restDescription",
+  "discoveryVersion": "v1",
+  "id": "dex:v1",
+  "name": "workerschema",
+  "version": "v1",
+  "title": "Dex API",
+  "description": "The Dex REST API",
+  "documentationLink": "http://github.com/coreos/dex",
+  "protocol": "rest",
+  "icons": {
+    "x16": "",
+    "x32": ""
+  },
+  "labels": [],
+  "baseUrl": "$ENDPOINT/api/v1/",
+  "basePath": "/api/v1/",
+  "rootUrl": "$ENDPOINT/",
+  "servicePath": "api/v1/",
+  "batchPath": "batch",
+  "parameters": {},
+  "auth": {},
+  "schemas": {
+    "Error": {
+      "id": "Error",
+      "type": "object",
+      "properties": {
+        "error": {
+          "type": "string"
+        },
+        "error_description": {
+          "type": "string"
+        }
+      }
+    },
+    "Client": {
+      "id": "Client",
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string"
+        },
+        "redirectURIs": {
+          "required": true,
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "ClientWithSecret": {
+      "id": "Client",
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string"
+        },
+        "secret": {
+          "type": "string"
+        },
+        "redirectURIs": {
+          "required": true,
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "ClientPage": {
+      "id": "ClientPage",
+      "type": "object",
+      "properties": {
+        "clients": {
+          "type": "array",
+          "items": {
+            "$ref": "Client"
+          }
+        },
+        "nextPageToken": {
+          "type": "string"
+        }
+      }
+    },
+    "User": {
+      "id": "User",
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string"
+        },
+        "email": {
+          "type": "string"
+        },
+        "displayName": {
+          "type": "string"
+        },
+        "emailVerified": {
+          "type": "boolean"
+        },
+        "admin": {
+          "type": "boolean"
+        },
+        "createdAt": {
+          "type": "string",
+          "format": "date-time"
+        }
+      }
+    },
+    "UserResponse": {
+      "id": "UserResponse",
+      "type": "object",
+      "properties": {
+        "user": {
+            "$ref": "User"
+        }
+      }
+    },
+    "UsersResponse": {
+      "id": "UsersResponse",
+      "type": "object",
+      "properties": {
+        "users": {
+          "type": "array",
+          "items": {
+            "$ref": "User"
+          }
+        },
+        "nextPageToken": {
+          "type": "string"
+        }
+      }
+    },
+    "UserCreateRequest": {
+      "id": "UserCreateRequest",
+      "type": "object",
+      "properties": {
+        "user": {
+          "$ref": "User"
+        },
+        "redirectURL": {
+          "type": "string",
+          "format": "url"
+        }
+      }
+    },
+    "UserCreateResponse": {
+      "id": "UserCreateResponse",
+      "type": "object",
+      "properties": {
+        "user": {
+          "type": "object",
+          "$ref": "User"
+        },
+        "resetPasswordLink": {
+          "type": "string"
+        },
+        "emailSent": {
+          "type": "boolean"
+        }
+      }
+    }
+  },
+  "resources": {
+    "Clients": {
+      "methods": {
+        "List": {
+          "id": "dex.Client.List",
+          "description": "Retrieve a page of Client objects.",
+          "httpMethod": "GET",
+          "path": "clients",
+          "parameters": {
+            "nextPageToken": {
+              "type": "string",
+              "location": "query"
+            }
+          },
+          "response": {
+            "$ref": "ClientPage"
+          }
+        },
+        "Create": {
+          "id": "dex.Client.Create",
+          "description": "Register a new Client.",
+          "httpMethod": "POST",
+          "path": "clients",
+          "request": {
+            "$ref": "Client"
+          },
+          "response": {
+            "$ref": "ClientWithSecret"
+          }
+        }
+      }
+    },
+    "Users": {
+      "methods": {
+        "List": {
+          "id": "dex.User.List",
+          "description": "Retrieve a page of User objects.",
+          "httpMethod": "GET",
+          "path": "users",
+          "parameters": {
+            "nextPageToken": {
+              "type": "string",
+              "location": "query"
+            },
+            "maxResults": {
+              "type": "integer",
+              "location": "query"
+            }
+          },
+          "response": {
+            "$ref": "UsersResponse"
+          }
+        },
+        "Get": {
+          "id": "dex.User.Get",
+          "description": "Get a single use object.",
+          "httpMethod": "GET",
+          "path": "users/{id}",
+          "parameters": {
+            "id": {
+              "type": "string",
+              "required": true,
+              "location": "path"
+            }
+          },
+          "parameterOrder": [
+            "id"
+          ],
+          "response": {
+            "$ref": "UserResponse"
+          }
+        },
+        "Create": {
+          "id": "dex.User.Create",
+          "description": "Create a new User.",
+          "httpMethod": "POST",
+          "path": "users",
+          "request": {
+            "$ref": "UserCreateRequest"
+          },
+          "response": {
+            "$ref": "UserCreateResponse"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/server/admin.go b/server/admin.go
new file mode 100644
index 00000000..d142516d
--- /dev/null
+++ b/server/admin.go
@@ -0,0 +1,111 @@
+package server
+
+import (
+	"encoding/json"
+	"net/http"
+	"path"
+
+	"github.com/coreos/pkg/health"
+	"github.com/julienschmidt/httprouter"
+
+	"github.com/coreos/dex/admin"
+	"github.com/coreos/dex/pkg/log"
+	"github.com/coreos/dex/schema/adminschema"
+	"github.com/coreos/go-oidc/key"
+)
+
+const (
+	AdminAPIVersion = "v1"
+)
+
+var (
+	AdminGetEndpoint      = addBasePath("/admin/:id")
+	AdminCreateEndpoint   = addBasePath("/admin")
+	AdminGetStateEndpoint = addBasePath("/state")
+)
+
+// AdminServer serves the admin API.
+type AdminServer struct {
+	adminAPI *admin.AdminAPI
+	checker  health.Checker
+}
+
+func NewAdminServer(adminAPI *admin.AdminAPI, rotator *key.PrivateKeyRotator) *AdminServer {
+	return &AdminServer{
+		adminAPI: adminAPI,
+		checker: health.Checker{
+			Checks: []health.Checkable{
+				rotator,
+			},
+		},
+	}
+}
+
+func (s *AdminServer) HTTPHandler() http.Handler {
+	r := httprouter.New()
+	r.GET(AdminGetEndpoint, s.getAdmin)
+	r.POST(AdminCreateEndpoint, s.createAdmin)
+	r.GET(AdminGetStateEndpoint, s.getState)
+	r.Handler("GET", httpPathHealth, s.checker)
+	r.HandlerFunc("GET", httpPathDebugVars, health.ExpvarHandler)
+	return r
+}
+
+func (s *AdminServer) getAdmin(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+	id := ps.ByName("id")
+
+	admn, err := s.adminAPI.GetAdmin(id)
+	if err != nil {
+		s.writeError(w, err)
+		return
+	}
+
+	writeResponseWithBody(w, http.StatusOK, admn)
+}
+
+func (s *AdminServer) createAdmin(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
+	admn := adminschema.Admin{}
+	err := json.NewDecoder(r.Body).Decode(&admn)
+	if err != nil {
+		writeInvalidRequest(w, "cannot parse JSON body")
+		return
+	}
+
+	id, err := s.adminAPI.CreateAdmin(admn)
+	if err != nil {
+		s.writeError(w, err)
+		return
+	}
+
+	admn.Id = id
+	w.Header().Set("Location", AdminCreateEndpoint+"/"+id)
+	writeResponseWithBody(w, http.StatusOK, admn)
+}
+
+func (s *AdminServer) getState(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+	state, err := s.adminAPI.GetState()
+	if err != nil {
+		s.writeError(w, err)
+		return
+	}
+
+	writeResponseWithBody(w, http.StatusOK, state)
+}
+
+func (s *AdminServer) writeError(w http.ResponseWriter, err error) {
+	log.Errorf("Error calling admin API: %v: ", err)
+	if adminErr, ok := err.(admin.Error); ok {
+		writeAPIError(w, adminErr.Code, newAPIError(adminErr.Type, adminErr.Desc))
+		return
+	}
+
+	writeAPIError(w, http.StatusInternalServerError, newAPIError(errorServerError, err.Error()))
+}
+
+func writeInvalidRequest(w http.ResponseWriter, msg string) {
+	writeAPIError(w, http.StatusBadRequest, newAPIError(errorInvalidRequest, msg))
+}
+
+func addBasePath(s string) string {
+	return path.Join(httpPathAPI, APIVersion, s)
+}
diff --git a/server/auth_middleware.go b/server/auth_middleware.go
new file mode 100644
index 00000000..340a9a6c
--- /dev/null
+++ b/server/auth_middleware.go
@@ -0,0 +1,120 @@
+package server
+
+import (
+	"errors"
+	"fmt"
+	"net/http"
+
+	"github.com/coreos/dex/client"
+	"github.com/coreos/dex/pkg/log"
+	"github.com/coreos/go-oidc/jose"
+	"github.com/coreos/go-oidc/key"
+	"github.com/coreos/go-oidc/oidc"
+)
+
+type clientTokenMiddleware struct {
+	issuerURL string
+	ciRepo    client.ClientIdentityRepo
+	keysFunc  func() ([]key.PublicKey, error)
+	next      http.Handler
+}
+
+func (c *clientTokenMiddleware) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	respondError := func() {
+		writeAPIError(w, http.StatusUnauthorized, newAPIError(errorAccessDenied, "missing or invalid token"))
+	}
+
+	if c.keysFunc == nil {
+		log.Errorf("Misconfigured clientTokenMiddleware, keysFunc is not set")
+		respondError()
+		return
+	}
+
+	if c.ciRepo == nil {
+		log.Errorf("Misconfigured clientTokenMiddleware, ClientIdentityRepo is not set")
+		respondError()
+		return
+	}
+
+	rawToken, err := oidc.ExtractBearerToken(r)
+	if err != nil {
+		log.Errorf("Failed to extract token from request: %v", err)
+		respondError()
+		return
+	}
+
+	jwt, err := jose.ParseJWT(rawToken)
+	if err != nil {
+		log.Errorf("Failed to parse JWT from token: %v", err)
+		respondError()
+		return
+	}
+
+	keys, err := c.keysFunc()
+	if err != nil {
+		log.Errorf("Failed to get keys: %v", err)
+		writeAPIError(w, http.StatusUnauthorized, newAPIError(errorAccessDenied, ""))
+		respondError()
+		return
+	} else if len(keys) == 0 {
+		log.Error("No keys available for verification in client token middleware")
+		writeAPIError(w, http.StatusUnauthorized, newAPIError(errorAccessDenied, ""))
+		respondError()
+		return
+	}
+
+	ok, err := oidc.VerifySignature(jwt, keys)
+	if err != nil {
+		log.Errorf("Failed to verify signature: %v", err)
+		respondError()
+		return
+	} else if !ok {
+		log.Info("Invalid token")
+		respondError()
+		return
+	}
+
+	clientID, err := oidc.VerifyClientClaims(jwt, c.issuerURL)
+	if err != nil {
+		log.Errorf("Failed to verify JWT claims: %v", err)
+		respondError()
+		return
+	}
+
+	md, err := c.ciRepo.Metadata(clientID)
+	if md == nil || err != nil {
+		log.Errorf("Failed to find clientID: %s, error=%v", clientID, err)
+		respondError()
+		return
+	}
+
+	log.Infof("Authenticated token for client ID %s", clientID)
+	c.next.ServeHTTP(w, r)
+}
+
+// getClientIDFromAuthorizedRequest will extract the clientID from the bearer token.
+func getClientIDFromAuthorizedRequest(r *http.Request) (string, error) {
+	rawToken, err := oidc.ExtractBearerToken(r)
+	if err != nil {
+		return "", err
+	}
+
+	jwt, err := jose.ParseJWT(rawToken)
+	if err != nil {
+		return "", err
+	}
+
+	claims, err := jwt.Claims()
+	if err != nil {
+		return "", err
+	}
+
+	sub, ok, err := claims.StringClaim("sub")
+	if err != nil {
+		return "", fmt.Errorf("failed to parse 'sub' claim: %v", err)
+	} else if !ok || sub == "" {
+		return "", errors.New("missing required 'sub' claim")
+	}
+
+	return sub, nil
+}
diff --git a/server/auth_middleware_test.go b/server/auth_middleware_test.go
new file mode 100644
index 00000000..693f971e
--- /dev/null
+++ b/server/auth_middleware_test.go
@@ -0,0 +1,200 @@
+package server
+
+import (
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+	"time"
+
+	"github.com/coreos/dex/client"
+	"github.com/coreos/go-oidc/jose"
+	"github.com/coreos/go-oidc/key"
+	"github.com/coreos/go-oidc/oidc"
+)
+
+type staticHandler struct{}
+
+func (h staticHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	w.WriteHeader(http.StatusOK)
+}
+
+func TestClientToken(t *testing.T) {
+	now := time.Now()
+	tomorrow := now.Add(24 * time.Hour)
+	validClientID := "valid-client"
+	ci := oidc.ClientIdentity{
+		Credentials: oidc.ClientCredentials{
+			ID: validClientID,
+		},
+	}
+	repo := client.NewClientIdentityRepo([]oidc.ClientIdentity{ci})
+
+	privKey, err := key.GeneratePrivateKey()
+	if err != nil {
+		t.Fatalf("Failed to generate private key, error=%v", err)
+	}
+	signer := privKey.Signer()
+	pubKey := *key.NewPublicKey(privKey.JWK())
+
+	validIss := "https://example.com"
+
+	makeToken := func(iss, sub, aud string, iat, exp time.Time) string {
+		claims := oidc.NewClaims(iss, sub, aud, iat, exp)
+		jwt, err := jose.NewSignedJWT(claims, signer)
+		if err != nil {
+			t.Fatalf("Failed to generate JWT, error=%v", err)
+		}
+		return jwt.Encode()
+	}
+
+	validJWT := makeToken(validIss, validClientID, validClientID, now, tomorrow)
+	invalidJWT := makeToken("", "", "", now, tomorrow)
+
+	tests := []struct {
+		keys     []key.PublicKey
+		repo     client.ClientIdentityRepo
+		header   string
+		wantCode int
+	}{
+		// valid token
+		{
+			keys:     []key.PublicKey{pubKey},
+			repo:     repo,
+			header:   fmt.Sprintf("BEARER %s", validJWT),
+			wantCode: http.StatusOK,
+		},
+		// invalid token
+		{
+			keys:     []key.PublicKey{pubKey},
+			repo:     repo,
+			header:   fmt.Sprintf("BEARER %s", invalidJWT),
+			wantCode: http.StatusUnauthorized,
+		},
+		// empty header
+		{
+			keys:     []key.PublicKey{pubKey},
+			repo:     repo,
+			header:   "",
+			wantCode: http.StatusUnauthorized,
+		},
+		// unparsable token
+		{
+			keys:     []key.PublicKey{pubKey},
+			repo:     repo,
+			header:   "BEARER xxx",
+			wantCode: http.StatusUnauthorized,
+		},
+		// no verification keys
+		{
+			keys:     []key.PublicKey{},
+			repo:     repo,
+			header:   fmt.Sprintf("BEARER %s", validJWT),
+			wantCode: http.StatusUnauthorized,
+		},
+		// nil repo
+		{
+			keys:     []key.PublicKey{pubKey},
+			repo:     nil,
+			header:   fmt.Sprintf("BEARER %s", validJWT),
+			wantCode: http.StatusUnauthorized,
+		},
+		// empty repo
+		{
+			keys:     []key.PublicKey{pubKey},
+			repo:     client.NewClientIdentityRepo(nil),
+			header:   fmt.Sprintf("BEARER %s", validJWT),
+			wantCode: http.StatusUnauthorized,
+		},
+		// client not in repo
+		{
+			keys:     []key.PublicKey{pubKey},
+			repo:     repo,
+			header:   fmt.Sprintf("BEARER %s", makeToken(validIss, "DOESNT-EXIST", "DOESNT-EXIST", now, tomorrow)),
+			wantCode: http.StatusUnauthorized,
+		},
+	}
+
+	for i, tt := range tests {
+		w := httptest.NewRecorder()
+		mw := &clientTokenMiddleware{
+			issuerURL: validIss,
+			ciRepo:    tt.repo,
+			keysFunc: func() ([]key.PublicKey, error) {
+				return tt.keys, nil
+			},
+			next: staticHandler{},
+		}
+		req := &http.Request{
+			Header: http.Header{
+				"Authorization": []string{tt.header},
+			},
+		}
+
+		mw.ServeHTTP(w, req)
+		if tt.wantCode != w.Code {
+			t.Errorf("case %d: invalid response code, want=%d, got=%d", i, tt.wantCode, w.Code)
+		}
+	}
+}
+
+func TestGetClientIDFromAuthorizedRequest(t *testing.T) {
+	now := time.Now()
+	tomorrow := now.Add(24 * time.Hour)
+
+	privKey, err := key.GeneratePrivateKey()
+	if err != nil {
+		t.Fatalf("Failed to generate private key, error=%v", err)
+	}
+
+	signer := privKey.Signer()
+
+	makeToken := func(iss, sub, aud string, iat, exp time.Time) string {
+		claims := oidc.NewClaims(iss, sub, aud, iat, exp)
+		jwt, err := jose.NewSignedJWT(claims, signer)
+		if err != nil {
+			t.Fatalf("Failed to generate JWT, error=%v", err)
+		}
+		return jwt.Encode()
+	}
+
+	tests := []struct {
+		header     string
+		wantClient string
+		wantErr    bool
+	}{
+		{
+			header:     fmt.Sprintf("BEARER %s", makeToken("iss", "CLIENT_ID", "", now, tomorrow)),
+			wantClient: "CLIENT_ID",
+			wantErr:    false,
+		},
+		{
+			header:  fmt.Sprintf("BEARER %s", makeToken("iss", "", "", now, tomorrow)),
+			wantErr: true,
+		},
+	}
+
+	for i, tt := range tests {
+		req := &http.Request{
+			Header: http.Header{
+				"Authorization": []string{tt.header},
+			},
+		}
+		gotClient, err := getClientIDFromAuthorizedRequest(req)
+		if tt.wantErr {
+			if err == nil {
+				t.Errorf("case %d: want non-nil err", i)
+			}
+			continue
+		}
+
+		if err != nil {
+			t.Errorf("case %d: got err: %q", i, err)
+			continue
+		}
+
+		if gotClient != tt.wantClient {
+			t.Errorf("case %d: want=%v, got=%v", i, tt.wantClient, gotClient)
+		}
+	}
+}
diff --git a/server/client_resource.go b/server/client_resource.go
new file mode 100644
index 00000000..c1df3862
--- /dev/null
+++ b/server/client_resource.go
@@ -0,0 +1,110 @@
+package server
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"path"
+
+	"github.com/coreos/dex/client"
+	phttp "github.com/coreos/dex/pkg/http"
+	"github.com/coreos/dex/pkg/log"
+	schema "github.com/coreos/dex/schema/workerschema"
+	"github.com/coreos/go-oidc/oidc"
+)
+
+type clientResource struct {
+	repo client.ClientIdentityRepo
+}
+
+func registerClientResource(prefix string, repo client.ClientIdentityRepo) (string, http.Handler) {
+	mux := http.NewServeMux()
+	c := &clientResource{
+		repo: repo,
+	}
+	relPath := "clients"
+	absPath := path.Join(prefix, relPath)
+	mux.Handle(absPath, c)
+	return relPath, mux
+}
+
+func (c *clientResource) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	switch r.Method {
+	case "GET":
+		c.list(w, r)
+	case "POST":
+		c.create(w, r)
+	default:
+		msg := fmt.Sprintf("HTTP %s method not supported for this resource", r.Method)
+		writeAPIError(w, http.StatusMethodNotAllowed, newAPIError(errorInvalidRequest, msg))
+	}
+}
+
+func (c *clientResource) list(w http.ResponseWriter, r *http.Request) {
+	cs, err := c.repo.All()
+	if err != nil {
+		writeAPIError(w, http.StatusInternalServerError, newAPIError(errorServerError, "error listing clients"))
+		return
+	}
+
+	scs := make([]*schema.Client, len(cs))
+	for i, ci := range cs {
+		sc := schema.MapClientIdentityToSchemaClient(ci)
+		scs[i] = &sc
+	}
+
+	page := schema.ClientPage{
+		Clients: scs,
+	}
+	writeResponseWithBody(w, http.StatusOK, page)
+}
+
+func (c *clientResource) create(w http.ResponseWriter, r *http.Request) {
+	ct := r.Header.Get("content-type")
+	if ct != "application/json" {
+		log.Debugf("Unsupported request content-type: %v", ct)
+		writeAPIError(w, http.StatusBadRequest, newAPIError(errorInvalidRequest, "unsupported content-type"))
+		return
+	}
+
+	var sc schema.Client
+	dec := json.NewDecoder(r.Body)
+	err := dec.Decode(&sc)
+	if err != nil {
+		log.Debugf("Error decoding request body: %v", err)
+		writeAPIError(w, http.StatusBadRequest, newAPIError(errorInvalidRequest, "unable to decode request body"))
+		return
+	}
+
+	ci, err := schema.MapSchemaClientToClientIdentity(sc)
+	if err != nil {
+		log.Debugf("Invalid request data: %v", err)
+		writeAPIError(w, http.StatusBadRequest, newAPIError(errorInvalidClientMetadata, "missing or invalid field: redirectURIs"))
+		return
+	}
+
+	if err := ci.Metadata.Valid(); err != nil {
+		log.Debugf("ClientMetadata invalid: %v", err)
+		writeAPIError(w, http.StatusBadRequest, newAPIError(errorInvalidClientMetadata, err.Error()))
+		return
+	}
+
+	clientID, err := oidc.GenClientID(ci.Metadata.RedirectURLs[0].Host)
+	if err != nil {
+		log.Errorf("Failed generating ID for new client: %v", err)
+		writeAPIError(w, http.StatusInternalServerError, newAPIError(errorServerError, "unable to generate client ID"))
+		return
+	}
+
+	creds, err := c.repo.New(clientID, ci.Metadata)
+	if err != nil {
+		log.Errorf("Failed creating client: %v", err)
+		writeAPIError(w, http.StatusInternalServerError, newAPIError(errorServerError, "unable to create client"))
+		return
+	}
+	ci.Credentials = *creds
+
+	ssc := schema.MapClientIdentityToSchemaClientWithSecret(ci)
+	w.Header().Add("Location", phttp.NewResourceLocation(r.URL, ci.Credentials.ID))
+	writeResponseWithBody(w, http.StatusCreated, ssc)
+}
diff --git a/server/client_resource_test.go b/server/client_resource_test.go
new file mode 100644
index 00000000..a1d4490d
--- /dev/null
+++ b/server/client_resource_test.go
@@ -0,0 +1,256 @@
+package server
+
+import (
+	"encoding/json"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"reflect"
+	"strings"
+	"testing"
+
+	"github.com/coreos/dex/client"
+	schema "github.com/coreos/dex/schema/workerschema"
+	"github.com/coreos/go-oidc/oidc"
+)
+
+func makeBody(s string) io.ReadCloser {
+	return ioutil.NopCloser(strings.NewReader(s))
+}
+
+func TestCreateInvalidRequest(t *testing.T) {
+	u := &url.URL{Scheme: "http", Host: "example.com", Path: "clients"}
+	h := http.Header{"Content-Type": []string{"application/json"}}
+	repo := client.NewClientIdentityRepo(nil)
+	res := &clientResource{repo: repo}
+	tests := []struct {
+		req      *http.Request
+		wantCode int
+		wantBody string
+	}{
+		// invalid content-type
+		{
+			req:      &http.Request{Method: "POST", URL: u, Header: http.Header{"Content-Type": []string{"application/xml"}}},
+			wantCode: http.StatusBadRequest,
+			wantBody: `{"error":"invalid_request","error_description":"unsupported content-type"}`,
+		},
+		// invalid method
+		{
+			req:      &http.Request{Method: "DELETE", URL: u, Header: h},
+			wantCode: http.StatusMethodNotAllowed,
+			wantBody: `{"error":"invalid_request","error_description":"HTTP DELETE method not supported for this resource"}`,
+		},
+		// invalid method
+		{
+			req:      &http.Request{Method: "PUT", URL: u, Header: h},
+			wantCode: http.StatusMethodNotAllowed,
+			wantBody: `{"error":"invalid_request","error_description":"HTTP PUT method not supported for this resource"}`,
+		},
+		// invalid method
+		{
+			req:      &http.Request{Method: "HEAD", URL: u, Header: h},
+			wantCode: http.StatusMethodNotAllowed,
+			wantBody: `{"error":"invalid_request","error_description":"HTTP HEAD method not supported for this resource"}`,
+		},
+		// unserializable body
+		{
+			req:      &http.Request{Method: "POST", URL: u, Header: h, Body: makeBody("asdf")},
+			wantCode: http.StatusBadRequest,
+			wantBody: `{"error":"invalid_request","error_description":"unable to decode request body"}`,
+		},
+		// empty body
+		{
+			req:      &http.Request{Method: "POST", URL: u, Header: h, Body: makeBody("")},
+			wantCode: http.StatusBadRequest,
+			wantBody: `{"error":"invalid_request","error_description":"unable to decode request body"}`,
+		},
+		// missing url field
+		{
+			req:      &http.Request{Method: "POST", URL: u, Header: h, Body: makeBody(`{"id":"foo"}`)},
+			wantCode: http.StatusBadRequest,
+			wantBody: `{"error":"invalid_client_metadata","error_description":"zero redirect URLs"}`,
+		},
+		// empty url array
+		{
+			req:      &http.Request{Method: "POST", URL: u, Header: h, Body: makeBody(`{"redirectURIs":[]}`)},
+			wantCode: http.StatusBadRequest,
+			wantBody: `{"error":"invalid_client_metadata","error_description":"zero redirect URLs"}`,
+		},
+		// array with empty string
+		{
+			req:      &http.Request{Method: "POST", URL: u, Header: h, Body: makeBody(`{"redirectURIs":[""]}`)},
+			wantCode: http.StatusBadRequest,
+			wantBody: `{"error":"invalid_client_metadata","error_description":"missing or invalid field: redirectURIs"}`,
+		},
+		// uri with unusable scheme
+		{
+			req:      &http.Request{Method: "POST", URL: u, Header: h, Body: makeBody(`{"redirectURIs":["asdf.com"]}`)},
+			wantCode: http.StatusBadRequest,
+			wantBody: `{"error":"invalid_client_metadata","error_description":"invalid redirect URL: scheme not http/https"}`,
+		},
+		// uri missing host
+		{
+			req:      &http.Request{Method: "POST", URL: u, Header: h, Body: makeBody(`{"redirectURIs":["http://"]}`)},
+			wantCode: http.StatusBadRequest,
+			wantBody: `{"error":"invalid_client_metadata","error_description":"invalid redirect URL: host empty"}`,
+		},
+	}
+
+	for i, tt := range tests {
+		w := httptest.NewRecorder()
+		res.ServeHTTP(w, tt.req)
+
+		if w.Code != tt.wantCode {
+			t.Errorf("case %d: invalid response code, want=%d, got=%d", i, tt.wantCode, w.Code)
+		}
+
+		gotBody := w.Body.String()
+		if gotBody != tt.wantBody {
+			t.Errorf("case %d: invalid response body, want=%s, got=%s", i, tt.wantBody, gotBody)
+		}
+	}
+}
+
+func TestCreate(t *testing.T) {
+	repo := client.NewClientIdentityRepo(nil)
+	res := &clientResource{repo: repo}
+	tests := [][]string{
+		[]string{"http://example.com"},
+		[]string{"https://example.com"},
+		[]string{"http://example.com/foo"},
+		[]string{"http://example.com/bar", "http://example.com/foo"},
+	}
+	endpoint := "http://example.com/clients"
+
+	for i, tt := range tests {
+		body := strings.NewReader(fmt.Sprintf(`{"redirectURIs":["%s"]}`, strings.Join(tt, `","`)))
+		r, err := http.NewRequest("POST", endpoint, body)
+		if err != nil {
+			t.Fatalf("Failed creating http.Request: %v", err)
+		}
+		r.Header.Set("content-type", "application/json")
+		w := httptest.NewRecorder()
+		res.ServeHTTP(w, r)
+
+		if w.Code != http.StatusCreated {
+			t.Errorf("case %d: invalid response code, want=%d, got=%d", i, http.StatusCreated, w.Code)
+		}
+
+		var client schema.ClientWithSecret
+		if err := json.Unmarshal(w.Body.Bytes(), &client); err != nil {
+			t.Errorf("case %d: unexpected error=%v", i, err)
+		}
+		if len(client.RedirectURIs) != len(tt) {
+			t.Errorf("case %d: unexpected number of redirect URIs, want=%d, got=%d", i, len(tt), len(client.RedirectURIs))
+		}
+
+		if !reflect.DeepEqual(tt, client.RedirectURIs) {
+			t.Errorf("case %d: unexpected client redirect URIs: want=%v got=%v", i, tt, client.RedirectURIs)
+		}
+
+		if client.Id == "" {
+			t.Errorf("case %d: empty client ID in response", i)
+		}
+
+		if client.Secret == "" {
+			t.Errorf("case %d: empty client secret in response", i)
+		}
+
+		wantLoc := fmt.Sprintf("%s/%s", endpoint, client.Id)
+		gotLoc := w.Header().Get("Location")
+		if gotLoc != wantLoc {
+			t.Errorf("case %d: invalid location header, want=%v, got=%v", i, wantLoc, gotLoc)
+		}
+	}
+}
+
+func TestList(t *testing.T) {
+	tests := []struct {
+		cs   []oidc.ClientIdentity
+		want []*schema.Client
+	}{
+		// empty repo
+		{
+			cs:   nil,
+			want: nil,
+		},
+		// single client
+		{
+			cs: []oidc.ClientIdentity{
+				oidc.ClientIdentity{
+					Credentials: oidc.ClientCredentials{ID: "foo", Secret: "bar"},
+					Metadata: oidc.ClientMetadata{
+						RedirectURLs: []url.URL{
+							url.URL{Scheme: "http", Host: "example.com"},
+						},
+					},
+				},
+			},
+			want: []*schema.Client{
+				&schema.Client{
+					Id:           "foo",
+					RedirectURIs: []string{"http://example.com"},
+				},
+			},
+		},
+		// multi client
+		{
+			cs: []oidc.ClientIdentity{
+				oidc.ClientIdentity{
+					Credentials: oidc.ClientCredentials{ID: "foo", Secret: "bar"},
+					Metadata: oidc.ClientMetadata{
+						RedirectURLs: []url.URL{
+							url.URL{Scheme: "http", Host: "example.com"},
+						},
+					},
+				},
+				oidc.ClientIdentity{
+					Credentials: oidc.ClientCredentials{ID: "biz", Secret: "bang"},
+					Metadata: oidc.ClientMetadata{
+						RedirectURLs: []url.URL{
+							url.URL{Scheme: "https", Host: "example.com", Path: "one/two/three"},
+						},
+					},
+				},
+			},
+			want: []*schema.Client{
+				&schema.Client{
+					Id:           "biz",
+					RedirectURIs: []string{"https://example.com/one/two/three"},
+				},
+				&schema.Client{
+					Id:           "foo",
+					RedirectURIs: []string{"http://example.com"},
+				},
+			},
+		},
+	}
+
+	for i, tt := range tests {
+		repo := client.NewClientIdentityRepo(tt.cs)
+		res := &clientResource{repo: repo}
+
+		r, err := http.NewRequest("GET", "http://example.com/clients", nil)
+		if err != nil {
+			t.Fatalf("Failed creating http.Request: %v", err)
+		}
+		w := httptest.NewRecorder()
+		res.ServeHTTP(w, r)
+
+		if w.Code != http.StatusOK {
+			t.Errorf("case %d: invalid response code, want=%d, got=%d", i, http.StatusOK, w.Code)
+		}
+
+		var resp schema.ClientPage
+		if err := json.Unmarshal(w.Body.Bytes(), &resp); err != nil {
+			t.Errorf("case %d: unexpected error=%v", i, err)
+		}
+
+		if !reflect.DeepEqual(tt.want, resp.Clients) {
+			t.Errorf("case %d: invalid response body, want=%#v, got=%#v", i, tt.want, resp.Clients)
+		}
+	}
+}
diff --git a/server/config.go b/server/config.go
new file mode 100644
index 00000000..17171d52
--- /dev/null
+++ b/server/config.go
@@ -0,0 +1,295 @@
+package server
+
+import (
+	"errors"
+	"fmt"
+	"html/template"
+	"net/url"
+	"os"
+	"path/filepath"
+	texttemplate "text/template"
+	"time"
+
+	"github.com/coreos/go-oidc/key"
+	"github.com/coreos/pkg/health"
+
+	"github.com/coreos/dex/client"
+	"github.com/coreos/dex/connector"
+	"github.com/coreos/dex/db"
+	"github.com/coreos/dex/email"
+	"github.com/coreos/dex/refresh"
+	"github.com/coreos/dex/repo"
+	"github.com/coreos/dex/session"
+	"github.com/coreos/dex/user"
+	useremail "github.com/coreos/dex/user/email"
+)
+
+type ServerConfig struct {
+	IssuerURL         string
+	TemplateDir       string
+	EmailTemplateDirs []string
+	EmailFromAddress  string
+	EmailerConfigFile string
+	StateConfig       StateConfigurer
+}
+
+type StateConfigurer interface {
+	Configure(*Server) error
+}
+
+type SingleServerConfig struct {
+	ClientsFile    string
+	ConnectorsFile string
+	UsersFile      string
+}
+
+type MultiServerConfig struct {
+	KeySecret      string
+	DatabaseConfig db.Config
+}
+
+func (cfg *ServerConfig) Server() (*Server, error) {
+	iu, err := url.Parse(cfg.IssuerURL)
+	if err != nil {
+		return nil, err
+	}
+
+	tpl, err := getTemplates(cfg.TemplateDir)
+	if err != nil {
+		return nil, err
+	}
+
+	km := key.NewPrivateKeyManager()
+	srv := Server{
+		IssuerURL:  *iu,
+		KeyManager: km,
+		Templates:  tpl,
+
+		HealthChecks: []health.Checkable{km},
+		Connectors:   []connector.Connector{},
+	}
+
+	err = cfg.StateConfig.Configure(&srv)
+	if err != nil {
+		return nil, err
+	}
+
+	err = setTemplates(&srv, tpl)
+	if err != nil {
+		return nil, err
+	}
+
+	err = setEmailer(&srv, cfg.EmailFromAddress, cfg.EmailerConfigFile, cfg.EmailTemplateDirs)
+	if err != nil {
+		return nil, err
+	}
+	return &srv, nil
+}
+
+func (cfg *SingleServerConfig) Configure(srv *Server) error {
+	k, err := key.GeneratePrivateKey()
+	if err != nil {
+		return err
+	}
+
+	ks := key.NewPrivateKeySet([]*key.PrivateKey{k}, time.Now().Add(24*time.Hour))
+	kRepo := key.NewPrivateKeySetRepo()
+	if err = kRepo.Set(ks); err != nil {
+		return err
+	}
+
+	cf, err := os.Open(cfg.ClientsFile)
+	if err != nil {
+		return fmt.Errorf("unable to read clients from file %s: %v", cfg.ClientsFile, err)
+	}
+	defer cf.Close()
+	ciRepo, err := client.NewClientIdentityRepoFromReader(cf)
+	if err != nil {
+		return fmt.Errorf("unable to read client identities from file %s: %v", cfg.ClientsFile, err)
+	}
+
+	cfgRepo, err := connector.NewConnectorConfigRepoFromFile(cfg.ConnectorsFile)
+	if err != nil {
+		return fmt.Errorf("unable to create ConnectorConfigRepo: %v", err)
+	}
+
+	sRepo := session.NewSessionRepo()
+	skRepo := session.NewSessionKeyRepo()
+	sm := session.NewSessionManager(sRepo, skRepo)
+
+	userRepo, err := user.NewUserRepoFromFile(cfg.UsersFile)
+	if err != nil {
+		return fmt.Errorf("unable to read users from file: %v", err)
+	}
+
+	pwiRepo := user.NewPasswordInfoRepo()
+
+	refTokRepo := refresh.NewRefreshTokenRepo()
+
+	txnFactory := repo.InMemTransactionFactory
+	userManager := user.NewManager(userRepo, pwiRepo, txnFactory, user.ManagerOptions{})
+	srv.ClientIdentityRepo = ciRepo
+	srv.KeySetRepo = kRepo
+	srv.ConnectorConfigRepo = cfgRepo
+	srv.UserRepo = userRepo
+	srv.UserManager = userManager
+	srv.PasswordInfoRepo = pwiRepo
+	srv.SessionManager = sm
+	srv.RefreshTokenRepo = refTokRepo
+	return nil
+
+}
+
+func (cfg *MultiServerConfig) Configure(srv *Server) error {
+	if cfg.KeySecret == "" {
+		return errors.New("missing key secret")
+	}
+
+	if cfg.DatabaseConfig.DSN == "" {
+		return errors.New("missing database connection string")
+	}
+
+	dbc, err := db.NewConnection(cfg.DatabaseConfig)
+	if err != nil {
+		return fmt.Errorf("unable to initialize database connection: %v", err)
+	}
+
+	kRepo, err := db.NewPrivateKeySetRepo(dbc, cfg.KeySecret)
+	if err != nil {
+		return fmt.Errorf("unable to create PrivateKeySetRepo: %v", err)
+	}
+
+	ciRepo := db.NewClientIdentityRepo(dbc)
+	sRepo := db.NewSessionRepo(dbc)
+	skRepo := db.NewSessionKeyRepo(dbc)
+	cfgRepo := db.NewConnectorConfigRepo(dbc)
+	userRepo := db.NewUserRepo(dbc)
+	pwiRepo := db.NewPasswordInfoRepo(dbc)
+	userManager := user.NewManager(userRepo, pwiRepo, db.TransactionFactory(dbc), user.ManagerOptions{})
+	refreshTokenRepo := db.NewRefreshTokenRepo(dbc)
+
+	sm := session.NewSessionManager(sRepo, skRepo)
+
+	srv.ClientIdentityRepo = ciRepo
+	srv.KeySetRepo = kRepo
+	srv.ConnectorConfigRepo = cfgRepo
+	srv.UserRepo = userRepo
+	srv.UserManager = userManager
+	srv.PasswordInfoRepo = pwiRepo
+	srv.SessionManager = sm
+	srv.RefreshTokenRepo = refreshTokenRepo
+	return nil
+}
+
+func getTemplates(dir string) (*template.Template, error) {
+	return template.ParseGlob(dir + "/*.html")
+}
+
+func setTemplates(srv *Server, tpls *template.Template) error {
+	ltpl, err := findTemplate(LoginPageTemplateName, tpls)
+	if err != nil {
+		return err
+	}
+	srv.LoginTemplate = ltpl
+
+	rtpl, err := findTemplate(RegisterTemplateName, tpls)
+	if err != nil {
+		return err
+	}
+	srv.RegisterTemplate = rtpl
+
+	vtpl, err := findTemplate(VerifyEmailTemplateName, tpls)
+	if err != nil {
+		return err
+	}
+	srv.VerifyEmailTemplate = vtpl
+
+	srtpl, err := findTemplate(SendResetPasswordEmailTemplateName, tpls)
+	if err != nil {
+		return err
+	}
+	srv.SendResetPasswordEmailTemplate = srtpl
+
+	rpwtpl, err := findTemplate(ResetPasswordTemplateName, tpls)
+	if err != nil {
+		return err
+	}
+	srv.ResetPasswordTemplate = rpwtpl
+
+	return nil
+}
+
+func setEmailer(srv *Server, fromAddress, emailerConfigFile string, emailTemplateDirs []string) error {
+
+	cfg, err := email.NewEmailerConfigFromFile(emailerConfigFile)
+	if err != nil {
+		return err
+	}
+
+	emailer, err := cfg.Emailer()
+	if err != nil {
+		return err
+	}
+
+	getFileNames := func(dir, ext string) ([]string, error) {
+		fns, err := filepath.Glob(dir + "/*." + ext)
+		if err != nil {
+			return nil, err
+		}
+		return fns, nil
+	}
+	getTextFiles := func(dir string) ([]string, error) {
+		return getFileNames(dir, "txt")
+	}
+	getHTMLFiles := func(dir string) ([]string, error) {
+		return getFileNames(dir, "html")
+	}
+
+	textTemplates := texttemplate.New("textTemplates")
+	htmlTemplates := template.New("htmlTemplates")
+	for _, dir := range emailTemplateDirs {
+		textFileNames, err := getTextFiles(dir)
+		if err != nil {
+			return err
+		}
+		if len(textFileNames) != 0 {
+			textTemplates, err = textTemplates.ParseFiles(textFileNames...)
+		}
+		if err != nil {
+			return err
+		}
+
+		htmlFileNames, err := getHTMLFiles(dir)
+		if err != nil {
+			return err
+		}
+		if len(htmlFileNames) != 0 {
+			htmlTemplates, err = htmlTemplates.ParseFiles(htmlFileNames...)
+		}
+		if err != nil {
+			return err
+		}
+	}
+	tMailer := email.NewTemplatizedEmailerFromTemplates(textTemplates, htmlTemplates, emailer)
+
+	ue := useremail.NewUserEmailer(srv.UserRepo,
+		srv.PasswordInfoRepo,
+		srv.KeyManager.Signer,
+		srv.SessionManager.ValidityWindow,
+		srv.IssuerURL,
+		tMailer,
+		fromAddress,
+		srv.absURL(httpPathResetPassword),
+		srv.absURL(httpPathEmailVerify))
+
+	srv.UserEmailer = ue
+	return nil
+}
+
+func findTemplate(name string, tpls *template.Template) (*template.Template, error) {
+	tpl := tpls.Lookup(name)
+	if tpl == nil {
+		return nil, fmt.Errorf("unable to find template: %q", name)
+	}
+	return tpl, nil
+}
diff --git a/server/discovery_resource.go b/server/discovery_resource.go
new file mode 100644
index 00000000..9d72971d
--- /dev/null
+++ b/server/discovery_resource.go
@@ -0,0 +1,29 @@
+package server
+
+import (
+	"net/http"
+	"path"
+
+	"github.com/coreos/dex/pkg/log"
+	schema "github.com/coreos/dex/schema/workerschema"
+)
+
+type discoveryResource struct{}
+
+func registerDiscoveryResource(prefix string, mux *http.ServeMux) {
+	c := &discoveryResource{}
+	p := path.Join(prefix, "discovery")
+	mux.Handle(p, c)
+}
+
+func (d *discoveryResource) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	if r.Method != "GET" {
+		writeAPIError(w, http.StatusMethodNotAllowed, newAPIError(errorInvalidRequest, "only HTTP GET supported against this resource"))
+		return
+	}
+	w.Header().Set("Content-Type", "application/json")
+	if _, err := w.Write([]byte(schema.DiscoveryJSON)); err != nil {
+		log.Errorf("Failed sending discovery JSON HTTP response body: %v", err)
+		writeAPIError(w, http.StatusInternalServerError, newAPIError(errorServerError, "error serving discovery JSON"))
+	}
+}
diff --git a/server/discovery_resource_test.go b/server/discovery_resource_test.go
new file mode 100644
index 00000000..606660d4
--- /dev/null
+++ b/server/discovery_resource_test.go
@@ -0,0 +1,50 @@
+package server
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	schema "github.com/coreos/dex/schema/workerschema"
+)
+
+func TestDiscoveryInvalidMethods(t *testing.T) {
+	for _, verb := range []string{"POST", "PUT", "DELETE"} {
+		res := &discoveryResource{}
+		w := httptest.NewRecorder()
+		r, err := http.NewRequest(verb, "http://example.com/discovery", nil)
+		if err != nil {
+			t.Fatalf("Failed creating http.Request: %v", err)
+		}
+		res.ServeHTTP(w, r)
+		if w.Code != http.StatusMethodNotAllowed {
+			t.Errorf("invalid response code for method=%s, want=%d, got=%d", verb, http.StatusMethodNotAllowed, w.Code)
+		}
+	}
+}
+
+func TestDiscoveryBody(t *testing.T) {
+	res := &discoveryResource{}
+	w := httptest.NewRecorder()
+	req, err := http.NewRequest("GET", "http://example.com/discovery", nil)
+	if err != nil {
+		t.Fatalf("Failed creating http.Request: %v", err)
+	}
+	res.ServeHTTP(w, req)
+	if w.Code != http.StatusOK {
+		t.Errorf("Expected 200, got %d", w.Code)
+	}
+	ct := w.HeaderMap["Content-Type"]
+	if len(ct) != 1 {
+		t.Errorf("Response has wrong number of Content-Type values: %v", ct)
+	} else if ct[0] != "application/json" {
+		t.Errorf("Expected application/json, got %s", ct)
+	}
+	if w.Body == nil {
+		t.Error("Received nil response body")
+	} else {
+		if w.Body.String() != schema.DiscoveryJSON {
+			t.Error("Received unexpected body!")
+		}
+	}
+}
diff --git a/server/email_verification.go b/server/email_verification.go
new file mode 100644
index 00000000..08356772
--- /dev/null
+++ b/server/email_verification.go
@@ -0,0 +1,246 @@
+package server
+
+import (
+	"encoding/json"
+	"html/template"
+	"net/http"
+	"net/url"
+	"time"
+
+	"github.com/coreos/go-oidc/jose"
+	"github.com/coreos/go-oidc/key"
+	"github.com/coreos/go-oidc/oidc"
+
+	"github.com/coreos/dex/client"
+	"github.com/coreos/dex/pkg/log"
+	"github.com/coreos/dex/user"
+	useremail "github.com/coreos/dex/user/email"
+)
+
+// handleVerifyEmailResendFunc will resend an email-verification email given a valid JWT for the user and a redirect URL.
+// This handler is meant to be wrapped in clientTokenMiddleware, so a valid
+// bearer token for the client is expected to be present.
+// The user's JWT should be in the "token" parameter and the redirect URL should
+// be in the "redirect_uri" param. Note that this re
+func handleVerifyEmailResendFunc(
+	issuerURL url.URL,
+	srvKeysFunc func() ([]key.PublicKey, error),
+	emailer *useremail.UserEmailer,
+	userRepo user.UserRepo,
+	clientIdentityRepo client.ClientIdentityRepo) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		decoder := json.NewDecoder(r.Body)
+		var params struct {
+			Token       string `json:"token"`
+			RedirectURI string `json:"redirectURI"`
+		}
+		err := decoder.Decode(&params)
+		if err != nil {
+			writeAPIError(w, http.StatusBadRequest, newAPIError(errorInvalidRequest,
+				"unable to parse body as JSON"))
+			return
+		}
+
+		token := params.Token
+		if token == "" {
+			writeAPIError(w, http.StatusBadRequest,
+				newAPIError(errorInvalidRequest, "missing valid JWT"))
+			return
+		}
+
+		clientID, err := getClientIDFromAuthorizedRequest(r)
+		if err != nil {
+			log.Errorf("Failed to extract clientID: %v", err)
+			writeAPIError(w, http.StatusUnauthorized,
+				newAPIError(errorInvalidRequest, "cilent could not be extracted from bearer token."))
+			return
+		}
+
+		cm, err := clientIdentityRepo.Metadata(clientID)
+		if err == client.ErrorNotFound {
+			log.Errorf("No such client: %v", err)
+			writeAPIError(w, http.StatusBadRequest,
+				newAPIError(errorInvalidRequest, "invalid client_id"))
+			return
+
+		}
+		if err != nil {
+			log.Errorf("Error getting ClientMetadata: %v", err)
+			writeAPIError(w, http.StatusInternalServerError,
+				newAPIError(errorServerError, "could not send email at this time"))
+			return
+		}
+
+		noop := func() error { return nil }
+		keysFunc := func() []key.PublicKey {
+			keys, err := srvKeysFunc()
+			if err != nil {
+				log.Errorf("Error getting keys: %v", err)
+			}
+			return keys
+		}
+
+		jwt, err := jose.ParseJWT(token)
+		if err != nil {
+			log.Errorf("Failed to Parse JWT: %v", err)
+			writeAPIError(w, http.StatusBadRequest,
+				newAPIError(errorInvalidRequest, "token could not be parsed"))
+			return
+		}
+
+		verifier := oidc.NewJWTVerifier(issuerURL.String(), clientID, noop, keysFunc)
+		if err := verifier.Verify(jwt); err != nil {
+			log.Errorf("Failed to Verify JWT: %v", err)
+			writeAPIError(w, http.StatusUnauthorized,
+				newAPIError(errorAccessDenied, "invalid token could not be verified"))
+			return
+		}
+
+		claims, err := jwt.Claims()
+		if err != nil {
+			log.Errorf("Failed to extract claims from JWT: %v", err)
+			writeAPIError(w, http.StatusBadRequest,
+				newAPIError(errorInvalidRequest, "invalid token could not be parsed"))
+			return
+		}
+
+		sub, ok, err := claims.StringClaim("sub")
+		if err != nil || !ok || sub == "" {
+			log.Errorf("Failed to extract sub claim from JWT: err:%q ok:%v", err, ok)
+			writeAPIError(w, http.StatusBadRequest,
+				newAPIError(errorInvalidRequest, "could not extract sub claim from token"))
+			return
+		}
+
+		usr, err := userRepo.Get(nil, sub)
+		if err != nil {
+			if err == user.ErrorNotFound {
+				log.Errorf("Failed to find user specified by token: %v", err)
+				writeAPIError(w, http.StatusBadRequest,
+					newAPIError(errorInvalidRequest, "could not find user"))
+				return
+			}
+			log.Errorf("Failed to fetch user: %v", err)
+			writeAPIError(w, http.StatusInternalServerError,
+				newAPIError(errorServerError, "could not send email at this time"))
+			return
+		}
+
+		if usr.EmailVerified {
+			log.Errorf("User's email already verified")
+			writeAPIError(w, http.StatusBadRequest,
+				newAPIError(errorInvalidRequest, "email already verified"))
+			return
+		}
+
+		aud, _, _ := claims.StringClaim("aud")
+		if aud != clientID {
+			log.Errorf("aud of token and sub of bearer token must match: %v", err)
+			writeAPIError(w, http.StatusForbidden,
+				newAPIError(errorAccessDenied, "JWT is from another client."))
+			return
+		}
+
+		redirectURLStr := params.RedirectURI
+		if redirectURLStr == "" {
+			log.Errorf("No redirect URL: %v", err)
+			writeAPIError(w, http.StatusBadRequest,
+				newAPIError(errorInvalidRequest, "must provide a redirect_uri"))
+			return
+		}
+
+		redirectURL, err := url.Parse(redirectURLStr)
+		if err != nil {
+			log.Errorf("Unparsable URL: %v", err)
+			writeAPIError(w, http.StatusBadRequest,
+				newAPIError(errorInvalidRequest, "invalid redirect_uri"))
+			return
+		}
+
+		*redirectURL, err = client.ValidRedirectURL(redirectURL, cm.RedirectURLs)
+		if err != nil {
+			switch err {
+			case (client.ErrorInvalidRedirectURL):
+				log.Errorf("Request provided unregistered redirect URL: %s", redirectURLStr)
+				writeAPIError(w, http.StatusBadRequest,
+					newAPIError(errorInvalidRequest, "invalid redirect_uri"))
+				return
+			case (client.ErrorNoValidRedirectURLs):
+				log.Errorf("There are no registered URLs for the requested client: %s", redirectURL)
+				writeAPIError(w, http.StatusBadRequest,
+					newAPIError(errorInvalidRequest, "invalid redirect_uri"))
+				return
+			}
+		}
+
+		_, err = emailer.SendEmailVerification(usr.ID, clientID, *redirectURL)
+		if err != nil {
+			log.Errorf("Failed to send email verification email: %v", err)
+			writeAPIError(w, http.StatusInternalServerError,
+				newAPIError(errorServerError, "could not send email at this time"))
+			return
+		}
+		writeResponseWithBody(w, http.StatusOK, struct{}{})
+	}
+}
+
+type emailVerifiedTemplateData struct {
+	Error   string
+	Message string
+}
+
+func handleEmailVerifyFunc(verifiedTpl *template.Template, issuer url.URL, keysFunc func() ([]key.PublicKey,
+	error), userManager *user.Manager) http.HandlerFunc {
+
+	return func(w http.ResponseWriter, r *http.Request) {
+		q := r.URL.Query()
+		token := q.Get("token")
+
+		keys, err := keysFunc()
+		if err != nil {
+			execTemplateWithStatus(w, verifiedTpl, emailVerifiedTemplateData{
+				Error:   "There's been an error processing your request.",
+				Message: "Plesae try again later.",
+			}, http.StatusInternalServerError)
+			return
+		}
+
+		ev, err := user.ParseAndVerifyEmailVerificationToken(token, issuer, keys)
+		if err != nil {
+			execTemplateWithStatus(w, verifiedTpl, emailVerifiedTemplateData{
+				Error:   "Bad Email Verification Token",
+				Message: "That was not a verifiable token.",
+			}, http.StatusBadRequest)
+			return
+		}
+
+		cbURL, err := userManager.VerifyEmail(ev)
+		if err != nil {
+			switch err {
+			case user.ErrorEmailAlreadyVerified:
+				execTemplateWithStatus(w, verifiedTpl, emailVerifiedTemplateData{
+					Error:   "Invalid Verification Link",
+					Message: "Your email link has expired or has already been verified.",
+				}, http.StatusBadRequest)
+			case user.ErrorEVEmailDoesntMatch:
+				execTemplateWithStatus(w, verifiedTpl, emailVerifiedTemplateData{
+					Error:   "Invalid Verification Link",
+					Message: "Your email link does not match the email address on file. Perhaps you have a more recent verification link?",
+				}, http.StatusBadRequest)
+			default:
+				execTemplateWithStatus(w, verifiedTpl, emailVerifiedTemplateData{
+					Error:   "Error Processing Request",
+					Message: "Please try again later.",
+				}, http.StatusInternalServerError)
+			}
+			return
+		}
+		http.SetCookie(w, &http.Cookie{
+			HttpOnly: true,
+			Name:     "ShowEmailVerifiedMessage",
+			MaxAge:   int(60 * 5),
+			Expires:  time.Now().Add(time.Minute * 5),
+		})
+		http.Redirect(w, r, cbURL.String(), http.StatusSeeOther)
+	}
+}
diff --git a/server/email_verification_test.go b/server/email_verification_test.go
new file mode 100644
index 00000000..3b0494a9
--- /dev/null
+++ b/server/email_verification_test.go
@@ -0,0 +1,162 @@
+package server
+
+import (
+	"bytes"
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"testing"
+	"time"
+
+	"github.com/coreos/go-oidc/jose"
+	"github.com/coreos/go-oidc/key"
+	"github.com/coreos/go-oidc/oidc"
+)
+
+func TestHandleVerifyEmailResend(t *testing.T) {
+	now := time.Now()
+	tomorrow := now.Add(24 * time.Hour)
+	yesterday := now.Add(-24 * time.Hour)
+
+	privKey, err := key.GeneratePrivateKey()
+	if err != nil {
+		t.Fatalf("Failed to generate private key, error=%v", err)
+	}
+
+	signer := privKey.Signer()
+
+	pubKey := *key.NewPublicKey(privKey.JWK())
+	keysFunc := func() ([]key.PublicKey, error) {
+		return []key.PublicKey{pubKey}, nil
+	}
+
+	makeToken := func(iss, sub, aud string, iat, exp time.Time) string {
+		claims := oidc.NewClaims(iss, sub, aud, iat, exp)
+		jwt, err := jose.NewSignedJWT(claims, signer)
+		if err != nil {
+			t.Fatalf("Failed to generate JWT, error=%v", err)
+		}
+		return jwt.Encode()
+	}
+
+	tests := []struct {
+		bearerJWT         string
+		userJWT           string
+		redirectURL       url.URL
+		wantCode          int
+		verifyEmailUserID string
+	}{
+		{
+			// The happy case
+			bearerJWT: makeToken(testIssuerURL.String(),
+				testClientID, testClientID, now, tomorrow),
+			userJWT: makeToken(testIssuerURL.String(),
+				"ID-1", testClientID, now, tomorrow),
+			redirectURL: testRedirectURL,
+			wantCode:    http.StatusOK,
+		},
+		{
+			// Already verified
+			bearerJWT: makeToken(testIssuerURL.String(),
+				testClientID, testClientID, now, tomorrow),
+			userJWT: makeToken(testIssuerURL.String(),
+				"ID-1", testClientID, now, tomorrow),
+			redirectURL:       testRedirectURL,
+			wantCode:          http.StatusBadRequest,
+			verifyEmailUserID: "ID-1",
+		},
+		{
+			// Expired userJWT
+			bearerJWT: makeToken(testIssuerURL.String(),
+				testClientID, testClientID, now, tomorrow),
+			userJWT: makeToken(testIssuerURL.String(),
+				"ID-1", testClientID, now, yesterday),
+			redirectURL: testRedirectURL,
+			wantCode:    http.StatusUnauthorized,
+		},
+		{
+			// Client ID is unknown
+			bearerJWT: makeToken(testIssuerURL.String(),
+				"fakeclientid", testClientID, now, tomorrow),
+			userJWT: makeToken(testIssuerURL.String(),
+				"ID-1", testClientID, now, tomorrow),
+			redirectURL: testRedirectURL,
+			wantCode:    http.StatusBadRequest,
+		},
+		{
+			// No sub in user JWT
+			bearerJWT: makeToken(testIssuerURL.String(),
+				testClientID, testClientID, now, tomorrow),
+			userJWT: makeToken(testIssuerURL.String(),
+				"", testClientID, now, tomorrow),
+			redirectURL: testRedirectURL,
+			wantCode:    http.StatusBadRequest,
+		},
+		{
+			// Unknown user
+			bearerJWT: makeToken(testIssuerURL.String(),
+				testClientID, testClientID, now, tomorrow),
+			userJWT: makeToken(testIssuerURL.String(),
+				"NonExistent", testClientID, now, tomorrow),
+			redirectURL: testRedirectURL,
+			wantCode:    http.StatusBadRequest,
+		},
+		{
+			// No redirect URL
+			bearerJWT: makeToken(testIssuerURL.String(),
+				testClientID, testClientID, now, tomorrow),
+			userJWT: makeToken(testIssuerURL.String(),
+				"ID-1", testClientID, now, tomorrow),
+			redirectURL: url.URL{},
+			wantCode:    http.StatusBadRequest,
+		},
+	}
+
+	for i, tt := range tests {
+		f, err := makeTestFixtures()
+		if tt.verifyEmailUserID != "" {
+			usr, _ := f.userRepo.Get(nil, tt.verifyEmailUserID)
+			usr.EmailVerified = true
+			f.userRepo.Update(nil, usr)
+		}
+
+		if err != nil {
+			t.Fatalf("case %d: could not make test fixtures: %v", i, err)
+		}
+
+		hdlr := handleVerifyEmailResendFunc(
+			testIssuerURL,
+			keysFunc,
+			f.srv.UserEmailer,
+			f.userRepo,
+			f.clientIdentityRepo)
+
+		w := httptest.NewRecorder()
+		u := "http://example.com"
+		q := struct {
+			Token       string `json:"token"`
+			RedirectURI string `json:"redirectURI"`
+		}{
+			Token:       tt.userJWT,
+			RedirectURI: tt.redirectURL.String(),
+		}
+		qBytes, err := json.Marshal(&q)
+		if err != nil {
+			t.Errorf("case %d: unable to marshal JSON: %q", i, err)
+		}
+
+		req, err := http.NewRequest("POST", u, bytes.NewReader(qBytes))
+		req.Header.Set("Authorization", "Bearer "+tt.bearerJWT)
+
+		if err != nil {
+			t.Errorf("case %d: unable to form HTTP request: %v", i, err)
+		}
+
+		hdlr.ServeHTTP(w, req)
+		if tt.wantCode != w.Code {
+			t.Errorf("case %d: wantCode=%v, got=%v", i, tt.wantCode, w.Code)
+			t.Logf("case %d: response body was: %v", i, w.Body.String())
+		}
+	}
+}
diff --git a/server/error.go b/server/error.go
new file mode 100644
index 00000000..6bb2fc2f
--- /dev/null
+++ b/server/error.go
@@ -0,0 +1,85 @@
+package server
+
+import (
+	"net/http"
+	"net/url"
+
+	"github.com/coreos/go-oidc/oauth2"
+)
+
+const (
+	errorInvalidClientMetadata = "invalid_client_metadata"
+	errorInvalidRequest        = "invalid_request"
+	errorServerError           = "server_error"
+	errorAccessDenied          = "access_denied"
+)
+
+type apiError struct {
+	Type        string `json:"error"`
+	Description string `json:"error_description,omitempty"`
+}
+
+func (e *apiError) Error() string {
+	return e.Type
+}
+
+func newAPIError(typ, desc string) *apiError {
+	return &apiError{Type: typ, Description: desc}
+}
+
+func writeAPIError(w http.ResponseWriter, code int, err error) {
+	aerr, ok := err.(*apiError)
+	if !ok {
+		aerr = newAPIError(errorServerError, "")
+	}
+	if aerr.Type == "" {
+		aerr.Type = errorServerError
+	}
+	if code == 0 {
+		code = http.StatusInternalServerError
+	}
+	writeResponseWithBody(w, code, aerr)
+}
+
+func writeTokenError(w http.ResponseWriter, err error, state string) {
+	oerr, ok := err.(*oauth2.Error)
+	if !ok {
+		oerr = oauth2.NewError(oauth2.ErrorServerError)
+	}
+	oerr.State = state
+
+	var status int
+	switch oerr.Type {
+	case oauth2.ErrorInvalidClient:
+		status = http.StatusUnauthorized
+		w.Header().Set("WWW-Authenticate", "Basic")
+	default:
+		status = http.StatusBadRequest
+	}
+
+	writeResponseWithBody(w, status, oerr)
+}
+
+func writeAuthError(w http.ResponseWriter, err error, state string) {
+	oerr, ok := err.(*oauth2.Error)
+	if !ok {
+		oerr = oauth2.NewError(oauth2.ErrorServerError)
+	}
+	oerr.State = state
+	writeResponseWithBody(w, http.StatusBadRequest, oerr)
+}
+
+func redirectAuthError(w http.ResponseWriter, err error, state string, redirectURL url.URL) {
+	oerr, ok := err.(*oauth2.Error)
+	if !ok {
+		oerr = oauth2.NewError(oauth2.ErrorServerError)
+	}
+
+	q := redirectURL.Query()
+	q.Set("error", oerr.Type)
+	q.Set("state", state)
+	redirectURL.RawQuery = q.Encode()
+
+	w.Header().Set("Location", redirectURL.String())
+	w.WriteHeader(http.StatusTemporaryRedirect)
+}
diff --git a/server/error_test.go b/server/error_test.go
new file mode 100644
index 00000000..f86e408b
--- /dev/null
+++ b/server/error_test.go
@@ -0,0 +1,261 @@
+package server
+
+import (
+	"errors"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"reflect"
+	"testing"
+
+	"github.com/coreos/go-oidc/oauth2"
+)
+
+func TestWriteAPIError(t *testing.T) {
+	tests := []struct {
+		err      error
+		code     int
+		wantCode int
+		wantBody string
+	}{
+		// standard
+		{
+			err:      newAPIError(errorInvalidRequest, "foo"),
+			code:     http.StatusBadRequest,
+			wantCode: http.StatusBadRequest,
+			wantBody: `{"error":"invalid_request","error_description":"foo"}`,
+		},
+		// no description
+		{
+			err:      newAPIError(errorInvalidRequest, ""),
+			code:     http.StatusBadRequest,
+			wantCode: http.StatusBadRequest,
+			wantBody: `{"error":"invalid_request"}`,
+		},
+		// no type
+		{
+			err:      newAPIError("", ""),
+			code:     http.StatusBadRequest,
+			wantCode: http.StatusBadRequest,
+			wantBody: `{"error":"server_error"}`,
+		},
+		// generic error
+		{
+			err:      errors.New("generic failure"),
+			code:     http.StatusTeapot,
+			wantCode: http.StatusTeapot,
+			wantBody: `{"error":"server_error"}`,
+		},
+		// nil error
+		{
+			err:      nil,
+			code:     http.StatusTeapot,
+			wantCode: http.StatusTeapot,
+			wantBody: `{"error":"server_error"}`,
+		},
+		// empty code
+		{
+			err:      nil,
+			code:     0,
+			wantCode: http.StatusInternalServerError,
+			wantBody: `{"error":"server_error"}`,
+		},
+	}
+
+	for i, tt := range tests {
+		w := httptest.NewRecorder()
+		writeAPIError(w, tt.code, tt.err)
+
+		if tt.wantCode != w.Code {
+			t.Errorf("case %d: incorrect HTTP status: want=%d got=%d", i, tt.wantCode, w.Code)
+		}
+
+		gotBody := w.Body.String()
+		if tt.wantBody != gotBody {
+			t.Errorf("case %d: incorrect HTTP body: want=%q got=%q", i, tt.wantBody, gotBody)
+		}
+	}
+}
+
+func TestWriteTokenError(t *testing.T) {
+	tests := []struct {
+		err        error
+		state      string
+		wantCode   int
+		wantHeader http.Header
+		wantBody   string
+	}{
+		{
+			err:      oauth2.NewError(oauth2.ErrorInvalidRequest),
+			state:    "bazinga",
+			wantCode: http.StatusBadRequest,
+			wantHeader: http.Header{
+				"Content-Type": []string{"application/json"},
+			},
+			wantBody: `{"error":"invalid_request","state":"bazinga"}`,
+		},
+		{
+			err:      oauth2.NewError(oauth2.ErrorInvalidRequest),
+			wantCode: http.StatusBadRequest,
+			wantHeader: http.Header{
+				"Content-Type": []string{"application/json"},
+			},
+			wantBody: `{"error":"invalid_request"}`,
+		},
+		{
+			err:      oauth2.NewError(oauth2.ErrorInvalidGrant),
+			wantCode: http.StatusBadRequest,
+			wantHeader: http.Header{
+				"Content-Type": []string{"application/json"},
+			},
+			wantBody: `{"error":"invalid_grant"}`,
+		},
+		{
+			err:      oauth2.NewError(oauth2.ErrorInvalidClient),
+			wantCode: http.StatusUnauthorized,
+			wantHeader: http.Header{
+				"Content-Type":     []string{"application/json"},
+				"Www-Authenticate": []string{"Basic"},
+			},
+			wantBody: `{"error":"invalid_client"}`,
+		},
+		{
+			err:      oauth2.NewError(oauth2.ErrorServerError),
+			wantCode: http.StatusBadRequest,
+			wantHeader: http.Header{
+				"Content-Type": []string{"application/json"},
+			},
+			wantBody: `{"error":"server_error"}`,
+		},
+		{
+			err:      oauth2.NewError(oauth2.ErrorUnsupportedGrantType),
+			wantCode: http.StatusBadRequest,
+			wantHeader: http.Header{
+				"Content-Type": []string{"application/json"},
+			},
+			wantBody: `{"error":"unsupported_grant_type"}`,
+		},
+		{
+			err:      errors.New("generic failure"),
+			wantCode: http.StatusBadRequest,
+			wantHeader: http.Header{
+				"Content-Type": []string{"application/json"},
+			},
+			wantBody: `{"error":"server_error"}`,
+		},
+	}
+
+	for i, tt := range tests {
+		w := httptest.NewRecorder()
+		writeTokenError(w, tt.err, tt.state)
+
+		if tt.wantCode != w.Code {
+			t.Errorf("case %d: incorrect HTTP status: want=%d got=%d", i, tt.wantCode, w.Code)
+		}
+
+		gotHeader := w.Header()
+		if !reflect.DeepEqual(tt.wantHeader, gotHeader) {
+			t.Errorf("case %d: incorrect HTTP headers: want=%#v got=%#v", i, tt.wantHeader, gotHeader)
+		}
+
+		gotBody := w.Body.String()
+		if tt.wantBody != gotBody {
+			t.Errorf("case %d: incorrect HTTP body: want=%q got=%q", i, tt.wantBody, gotBody)
+		}
+	}
+}
+
+func TestWriteAuthError(t *testing.T) {
+	wantCode := http.StatusBadRequest
+	wantHeader := http.Header{"Content-Type": []string{"application/json"}}
+	tests := []struct {
+		err      error
+		state    string
+		wantBody string
+	}{
+		{
+			err:      errors.New("foobar"),
+			state:    "bazinga",
+			wantBody: `{"error":"server_error","state":"bazinga"}`,
+		},
+		{
+			err:      oauth2.NewError(oauth2.ErrorInvalidRequest),
+			state:    "foo",
+			wantBody: `{"error":"invalid_request","state":"foo"}`,
+		},
+		{
+			err:      oauth2.NewError(oauth2.ErrorUnsupportedResponseType),
+			state:    "bar",
+			wantBody: `{"error":"unsupported_response_type","state":"bar"}`,
+		},
+	}
+
+	for i, tt := range tests {
+		w := httptest.NewRecorder()
+		writeAuthError(w, tt.err, tt.state)
+
+		if wantCode != w.Code {
+			t.Errorf("case %d: incorrect HTTP status: want=%d got=%d", i, wantCode, w.Code)
+		}
+
+		gotHeader := w.Header()
+		if !reflect.DeepEqual(wantHeader, gotHeader) {
+			t.Errorf("case %d: incorrect HTTP headers: want=%#v got=%#v", i, wantHeader, gotHeader)
+		}
+
+		gotBody := w.Body.String()
+		if tt.wantBody != gotBody {
+			t.Errorf("case %d: incorrect HTTP body: want=%q got=%q", i, tt.wantBody, gotBody)
+		}
+	}
+}
+
+func TestRedirectAuthError(t *testing.T) {
+	wantCode := http.StatusTemporaryRedirect
+
+	tests := []struct {
+		err         error
+		state       string
+		redirectURL url.URL
+		wantLoc     string
+	}{
+		{
+			err:         errors.New("foobar"),
+			state:       "bazinga",
+			redirectURL: url.URL{Scheme: "http", Host: "server.example.com"},
+			wantLoc:     "http://server.example.com?error=server_error&state=bazinga",
+		},
+		{
+			err:         oauth2.NewError(oauth2.ErrorInvalidRequest),
+			state:       "foo",
+			redirectURL: url.URL{Scheme: "http", Host: "server.example.com"},
+			wantLoc:     "http://server.example.com?error=invalid_request&state=foo",
+		},
+		{
+			err:         oauth2.NewError(oauth2.ErrorUnsupportedResponseType),
+			state:       "bar",
+			redirectURL: url.URL{Scheme: "http", Host: "server.example.com"},
+			wantLoc:     "http://server.example.com?error=unsupported_response_type&state=bar",
+		},
+	}
+
+	for i, tt := range tests {
+		w := httptest.NewRecorder()
+		redirectAuthError(w, tt.err, tt.state, tt.redirectURL)
+
+		if wantCode != w.Code {
+			t.Errorf("case %d: incorrect HTTP status: want=%d got=%d", i, wantCode, w.Code)
+		}
+
+		wantHeader := http.Header{"Location": []string{tt.wantLoc}}
+		gotHeader := w.Header()
+		if !reflect.DeepEqual(wantHeader, gotHeader) {
+			t.Errorf("case %d: incorrect HTTP headers: want=%#v got=%#v", i, wantHeader, gotHeader)
+		}
+
+		gotBody := w.Body.String()
+		if gotBody != "" {
+			t.Errorf("case %d: incorrect empty HTTP body, got=%q", i, gotBody)
+		}
+	}
+}
diff --git a/server/http.go b/server/http.go
new file mode 100644
index 00000000..3a775646
--- /dev/null
+++ b/server/http.go
@@ -0,0 +1,520 @@
+package server
+
+import (
+	"encoding/json"
+	"fmt"
+	"html/template"
+	"net/http"
+	"net/url"
+	"strings"
+	"time"
+
+	"github.com/coreos/go-oidc/jose"
+	"github.com/coreos/go-oidc/key"
+	"github.com/coreos/go-oidc/oauth2"
+	"github.com/coreos/go-oidc/oidc"
+	"github.com/coreos/pkg/health"
+	"github.com/jonboulle/clockwork"
+
+	"github.com/coreos/dex/client"
+	"github.com/coreos/dex/connector"
+	phttp "github.com/coreos/dex/pkg/http"
+	"github.com/coreos/dex/pkg/log"
+)
+
+const (
+	lastSeenMaxAge  = time.Minute * 5
+	discoveryMaxAge = time.Hour * 24
+)
+
+var (
+	httpPathDiscovery         = "/.well-known/openid-configuration"
+	httpPathToken             = "/token"
+	httpPathKeys              = "/keys"
+	httpPathAuth              = "/auth"
+	httpPathHealth            = "/health"
+	httpPathAPI               = "/api"
+	httpPathRegister          = "/register"
+	httpPathEmailVerify       = "/verify-email"
+	httpPathVerifyEmailResend = "/resend-verify-email"
+	httpPathSendResetPassword = "/send-reset-password"
+	httpPathResetPassword     = "/reset-password"
+	httpPathDebugVars         = "/debug/vars"
+
+	cookieLastSeen                 = "LastSeen"
+	cookieShowEmailVerifiedMessage = "ShowEmailVerifiedMessage"
+)
+
+func handleDiscoveryFunc(cfg oidc.ProviderConfig) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		if r.Method != "GET" {
+			w.Header().Set("Allow", "GET")
+			phttp.WriteError(w, http.StatusMethodNotAllowed, "GET only acceptable method")
+			return
+		}
+
+		b, err := json.Marshal(cfg)
+		if err != nil {
+			log.Errorf("Unable to marshal %#v to JSON: %v", cfg, err)
+		}
+
+		w.Header().Set("Cache-Control", fmt.Sprintf("public, max-age=%d", int(discoveryMaxAge.Seconds())))
+		w.Header().Set("Content-Type", "application/json")
+		w.Write(b)
+	}
+}
+
+func handleKeysFunc(km key.PrivateKeyManager, clock clockwork.Clock) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		if r.Method != "GET" {
+			w.Header().Set("Allow", "GET")
+			phttp.WriteError(w, http.StatusMethodNotAllowed, "GET only acceptable method")
+			return
+		}
+
+		jwks, err := km.JWKs()
+		if err != nil {
+			log.Errorf("Failed to get JWKs while serving HTTP request: %v", err)
+			phttp.WriteError(w, http.StatusInternalServerError, "")
+			return
+		}
+
+		keys := struct {
+			Keys []jose.JWK `json:"keys"`
+		}{
+			Keys: jwks,
+		}
+
+		b, err := json.Marshal(keys)
+		if err != nil {
+			log.Errorf("Unable to marshal signing key to JSON: %v", err)
+		}
+
+		exp := km.ExpiresAt()
+		w.Header().Set("Expires", exp.Format(time.RFC1123))
+
+		ttl := int(exp.Sub(clock.Now()).Seconds())
+		w.Header().Set("Cache-Control", fmt.Sprintf("public, max-age=%d", ttl))
+
+		w.Header().Set("Content-Type", "application/json")
+		w.WriteHeader(http.StatusOK)
+		w.Write(b)
+	}
+}
+
+type Link struct {
+	URL         string
+	ID          string
+	DisplayName string
+}
+
+type templateData struct {
+	Error                    bool
+	Message                  string
+	Instruction              string
+	Detail                   string
+	Register                 bool
+	RegisterOrLoginURL       string
+	MsgCode                  string
+	ShowEmailVerifiedMessage bool
+	Links                    []Link
+}
+
+// TODO(sym3tri): store this with the connector config
+var connectorDisplayNameMap = map[string]string{
+	"google": "Google",
+	"local":  "Email",
+}
+
+func execTemplate(w http.ResponseWriter, tpl *template.Template, data interface{}) {
+	execTemplateWithStatus(w, tpl, data, http.StatusOK)
+}
+
+func execTemplateWithStatus(w http.ResponseWriter, tpl *template.Template, data interface{}, status int) {
+	w.WriteHeader(status)
+	if err := tpl.Execute(w, data); err != nil {
+		log.Errorf("Error loading page: %q", err)
+		phttp.WriteError(w, http.StatusInternalServerError, "error loading page")
+		return
+	}
+}
+
+func renderLoginPage(w http.ResponseWriter, r *http.Request, srv OIDCServer, idpcs []connector.Connector, register bool, tpl *template.Template) {
+	if tpl == nil {
+		phttp.WriteError(w, http.StatusInternalServerError, "error loading login page")
+		return
+	}
+
+	td := templateData{
+		Message:                  "Error",
+		Instruction:              "Please try again or contact the system administrator",
+		Register:                 register,
+		ShowEmailVerifiedMessage: consumeShowEmailVerifiedCookie(r, w),
+	}
+
+	// Render error if remote IdP connector errored and redirected here.
+	q := r.URL.Query()
+	e := q.Get("error")
+	connectorID := q.Get("connector_id")
+	if e != "" {
+		td.Error = true
+		td.Message = "Authentication Error"
+		remoteMsg := q.Get("error_description")
+		if remoteMsg == "" {
+			remoteMsg = q.Get("error")
+		}
+		if connectorID == "" {
+			td.Detail = remoteMsg
+		} else {
+			td.Detail = fmt.Sprintf("Error from %s: %s.", connectorID, remoteMsg)
+		}
+		execTemplate(w, tpl, td)
+		return
+	}
+
+	if q.Get("msg_code") != "" {
+		td.MsgCode = q.Get("msg_code")
+	}
+
+	// Render error message if client id is invalid.
+	clientID := q.Get("client_id")
+	cm, err := srv.ClientMetadata(clientID)
+	if err != nil {
+		log.Errorf("Failed fetching client %q from repo: %v", clientID, err)
+		td.Error = true
+		td.Message = "Server Error"
+		execTemplate(w, tpl, td)
+		return
+	} else if cm == nil {
+		td.Error = true
+		td.Message = "Authentication Error"
+		td.Detail = "Invalid client ID"
+		execTemplate(w, tpl, td)
+		return
+	}
+
+	if len(idpcs) == 0 {
+		td.Error = true
+		td.Message = "Server Error"
+		td.Instruction = "Unable to authenticate users at this time"
+		td.Detail = "Authentication service may be misconfigured"
+		execTemplate(w, tpl, td)
+		return
+	}
+
+	link := *r.URL
+	linkParams := link.Query()
+	if !register {
+		linkParams.Set("register", "1")
+	} else {
+		linkParams.Del("register")
+	}
+	linkParams.Del("msg_code")
+	linkParams.Del("show_connectors")
+	link.RawQuery = linkParams.Encode()
+	td.RegisterOrLoginURL = link.String()
+
+	var showConnectors map[string]struct{}
+
+	// Only show the following connectors, if param is present
+	if q.Get("show_connectors") != "" {
+		conns := strings.Split(q.Get("show_connectors"), ",")
+		if len(conns) != 0 {
+			showConnectors = make(map[string]struct{})
+			for _, connID := range conns {
+				showConnectors[connID] = struct{}{}
+			}
+		}
+	}
+
+	for _, idpc := range idpcs {
+		id := idpc.ID()
+		if showConnectors != nil {
+			if _, ok := showConnectors[id]; !ok {
+				continue
+			}
+		}
+		var link Link
+		link.ID = id
+
+		displayName, ok := connectorDisplayNameMap[id]
+		if !ok {
+			displayName = id
+		}
+		link.DisplayName = displayName
+
+		v := r.URL.Query()
+		v.Set("connector_id", idpc.ID())
+		v.Set("response_type", "code")
+		link.URL = httpPathAuth + "?" + v.Encode()
+		td.Links = append(td.Links, link)
+	}
+
+	execTemplate(w, tpl, td)
+}
+
+func handleAuthFunc(srv OIDCServer, idpcs []connector.Connector, tpl *template.Template) http.HandlerFunc {
+	idx := makeConnectorMap(idpcs)
+	return func(w http.ResponseWriter, r *http.Request) {
+		if r.Method != "GET" {
+			w.Header().Set("Allow", "GET")
+			phttp.WriteError(w, http.StatusMethodNotAllowed, "GET only acceptable method")
+			return
+		}
+
+		q := r.URL.Query()
+		register := q.Get("register") == "1"
+		e := q.Get("error")
+		if e != "" {
+			sessionKey := q.Get("state")
+			if err := srv.KillSession(sessionKey); err != nil {
+				log.Errorf("Failed killing sessionKey %q: %v", sessionKey, err)
+			}
+			renderLoginPage(w, r, srv, idpcs, register, tpl)
+			return
+		}
+
+		connectorID := q.Get("connector_id")
+		idpc, ok := idx[connectorID]
+		if !ok {
+			renderLoginPage(w, r, srv, idpcs, register, tpl)
+			return
+		}
+
+		acr, err := oauth2.ParseAuthCodeRequest(q)
+		if err != nil {
+			log.Errorf("Invalid auth request: %v", err)
+			writeAuthError(w, err, acr.State)
+			return
+		}
+
+		cm, err := srv.ClientMetadata(acr.ClientID)
+		if err != nil {
+			log.Errorf("Failed fetching client %q from repo: %v", acr.ClientID, err)
+			writeAuthError(w, oauth2.NewError(oauth2.ErrorServerError), acr.State)
+			return
+		}
+		if cm == nil {
+			log.Errorf("Client %q not found", acr.ClientID)
+			writeAuthError(w, oauth2.NewError(oauth2.ErrorInvalidRequest), acr.State)
+			return
+		}
+
+		if len(cm.RedirectURLs) == 0 {
+			log.Errorf("Client %q has no redirect URLs", acr.ClientID)
+			writeAuthError(w, oauth2.NewError(oauth2.ErrorServerError), acr.State)
+			return
+		}
+
+		redirectURL, err := client.ValidRedirectURL(acr.RedirectURL, cm.RedirectURLs)
+		if err != nil {
+			switch err {
+			case (client.ErrorCantChooseRedirectURL):
+				log.Errorf("Request must provide redirect URL as client %q has registered many", acr.ClientID)
+				writeAuthError(w, oauth2.NewError(oauth2.ErrorInvalidRequest), acr.State)
+				return
+			case (client.ErrorInvalidRedirectURL):
+				log.Errorf("Request provided unregistered redirect URL: %s", acr.RedirectURL)
+				writeAuthError(w, oauth2.NewError(oauth2.ErrorInvalidRequest), acr.State)
+				return
+			case (client.ErrorNoValidRedirectURLs):
+				log.Errorf("There are no registered URLs for the requested client: %s", acr.RedirectURL)
+				writeAuthError(w, oauth2.NewError(oauth2.ErrorInvalidRequest), acr.State)
+				return
+			}
+		}
+
+		if acr.ResponseType != oauth2.ResponseTypeCode {
+			log.Errorf("unexpected ResponseType: %v: ", acr.ResponseType)
+			redirectAuthError(w, oauth2.NewError(oauth2.ErrorUnsupportedResponseType), acr.State, redirectURL)
+			return
+		}
+
+		nonce := q.Get("nonce")
+
+		key, err := srv.NewSession(connectorID, acr.ClientID, acr.State, redirectURL, nonce, register)
+		if err != nil {
+			log.Errorf("Error creating new session: %v: ", err)
+			redirectAuthError(w, err, acr.State, redirectURL)
+			return
+		}
+
+		if register {
+			_, ok := idpc.(*connector.LocalConnector)
+			if ok {
+				q := url.Values{}
+				q.Set("code", key)
+				ru := httpPathRegister + "?" + q.Encode()
+				w.Header().Set("Location", ru)
+				w.WriteHeader(http.StatusTemporaryRedirect)
+				return
+			}
+		}
+
+		var p string
+		if register {
+			p = "select_account consent"
+		}
+		if shouldReprompt(r) || register {
+			p = "select_account"
+		}
+		lu, err := idpc.LoginURL(key, p)
+		if err != nil {
+			log.Errorf("Connector.LoginURL failed: %v", err)
+			redirectAuthError(w, err, acr.State, redirectURL)
+			return
+		}
+
+		http.SetCookie(w, createLastSeenCookie())
+		w.Header().Set("Location", lu)
+		w.WriteHeader(http.StatusTemporaryRedirect)
+		return
+	}
+}
+
+func handleTokenFunc(srv OIDCServer) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		if r.Method != "POST" {
+			w.Header().Set("Allow", "POST")
+			phttp.WriteError(w, http.StatusMethodNotAllowed, fmt.Sprintf("POST only acceptable method"))
+			return
+		}
+
+		err := r.ParseForm()
+		if err != nil {
+			log.Errorf("error parsing request: %v", err)
+			writeTokenError(w, oauth2.NewError(oauth2.ErrorInvalidRequest), "")
+			return
+		}
+
+		state := r.PostForm.Get("state")
+
+		user, password, ok := phttp.BasicAuth(r)
+		if !ok {
+			log.Errorf("error parsing basic auth")
+			writeTokenError(w, oauth2.NewError(oauth2.ErrorInvalidClient), state)
+			return
+		}
+
+		creds := oidc.ClientCredentials{ID: user, Secret: password}
+
+		var jwt *jose.JWT
+		var refreshToken string
+		grantType := r.PostForm.Get("grant_type")
+
+		switch grantType {
+		case oauth2.GrantTypeAuthCode:
+			code := r.PostForm.Get("code")
+			if code == "" {
+				log.Errorf("missing code param")
+				writeTokenError(w, oauth2.NewError(oauth2.ErrorInvalidRequest), state)
+				return
+			}
+			jwt, refreshToken, err = srv.CodeToken(creds, code)
+			if err != nil {
+				log.Errorf("couldn't exchange code for token: %v", err)
+				writeTokenError(w, err, state)
+				return
+			}
+		case oauth2.GrantTypeClientCreds:
+			jwt, err = srv.ClientCredsToken(creds)
+			if err != nil {
+				log.Errorf("couldn't creds for token: %v", err)
+				writeTokenError(w, err, state)
+				return
+			}
+		case oauth2.GrantTypeRefreshToken:
+			token := r.PostForm.Get("refresh_token")
+			if token == "" {
+				writeTokenError(w, oauth2.NewError(oauth2.ErrorInvalidRequest), state)
+				return
+			}
+			jwt, err = srv.RefreshToken(creds, token)
+			if err != nil {
+				writeTokenError(w, err, state)
+				return
+			}
+		default:
+			log.Errorf("unsupported grant: %v", grantType)
+			writeTokenError(w, oauth2.NewError(oauth2.ErrorUnsupportedGrantType), state)
+			return
+		}
+
+		t := oAuth2Token{
+			AccessToken:  jwt.Encode(),
+			IDToken:      jwt.Encode(),
+			TokenType:    "bearer",
+			RefreshToken: refreshToken,
+		}
+
+		b, err := json.Marshal(t)
+		if err != nil {
+			log.Errorf("Failed marshaling %#v to JSON: %v", t, err)
+			writeTokenError(w, oauth2.NewError(oauth2.ErrorServerError), state)
+			return
+		}
+
+		w.Header().Set("Content-Type", "application/json")
+		w.WriteHeader(http.StatusOK)
+		w.Write(b)
+	}
+}
+
+func makeHealthHandler(checks []health.Checkable) http.Handler {
+	return health.Checker{
+		Checks: checks,
+	}
+}
+
+type oAuth2Token struct {
+	AccessToken  string `json:"access_token"`
+	IDToken      string `json:"id_token"`
+	TokenType    string `json:"token_type"`
+	RefreshToken string `json:"refresh_token,omitempty"`
+}
+
+func createLastSeenCookie() *http.Cookie {
+	now := time.Now()
+	return &http.Cookie{
+		HttpOnly: true,
+		Name:     cookieLastSeen,
+		MaxAge:   int(lastSeenMaxAge.Seconds()),
+		// For old IE, ignored by most browsers.
+		Expires: now.Add(lastSeenMaxAge),
+	}
+}
+
+// shouldReprompt determines if user should be re-prompted for login based on existence of a cookie.
+func shouldReprompt(r *http.Request) bool {
+	_, err := r.Cookie(cookieLastSeen)
+	if err == nil {
+		return true
+	}
+	return false
+}
+
+func consumeShowEmailVerifiedCookie(r *http.Request, w http.ResponseWriter) bool {
+	_, err := r.Cookie(cookieShowEmailVerifiedMessage)
+	if err == nil {
+		deleteCookie(w, cookieShowEmailVerifiedMessage)
+		return true
+	}
+	return false
+}
+
+func deleteCookie(w http.ResponseWriter, name string) {
+	now := time.Now()
+	http.SetCookie(w, &http.Cookie{
+		Name:    name,
+		MaxAge:  -100,
+		Expires: now.Add(time.Second * -100),
+	})
+}
+
+func makeConnectorMap(idpcs []connector.Connector) map[string]connector.Connector {
+	idx := make(map[string]connector.Connector, len(idpcs))
+	for _, idpc := range idpcs {
+		idx[idpc.ID()] = idpc
+	}
+	return idx
+}
diff --git a/server/http_test.go b/server/http_test.go
new file mode 100644
index 00000000..3018dcfb
--- /dev/null
+++ b/server/http_test.go
@@ -0,0 +1,515 @@
+package server
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"math/big"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"reflect"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/jonboulle/clockwork"
+
+	"github.com/coreos/dex/client"
+	"github.com/coreos/dex/connector"
+	"github.com/coreos/dex/session"
+	"github.com/coreos/go-oidc/jose"
+	"github.com/coreos/go-oidc/oauth2"
+	"github.com/coreos/go-oidc/oidc"
+)
+
+type fakeConnector struct {
+	loginURL string
+}
+
+func (f *fakeConnector) ID() string {
+	return "fake"
+}
+
+func (f *fakeConnector) Healthy() error {
+	return nil
+}
+
+func (f *fakeConnector) LoginURL(sessionKey, prompt string) (string, error) {
+	return f.loginURL, nil
+}
+
+func (f *fakeConnector) Register(mux *http.ServeMux, errorURL url.URL) {}
+
+func (f *fakeConnector) Sync() chan struct{} {
+	return nil
+}
+
+func (c *fakeConnector) TrustedEmailProvider() bool {
+	return false
+}
+
+func TestHandleAuthFuncMethodNotAllowed(t *testing.T) {
+	for _, m := range []string{"POST", "PUT", "DELETE"} {
+		hdlr := handleAuthFunc(nil, nil, nil)
+		req, err := http.NewRequest(m, "http://example.com", nil)
+		if err != nil {
+			t.Errorf("case %s: unable to create HTTP request: %v", m, err)
+			continue
+		}
+
+		w := httptest.NewRecorder()
+		hdlr.ServeHTTP(w, req)
+
+		want := http.StatusMethodNotAllowed
+		got := w.Code
+		if want != got {
+			t.Errorf("case %s: expected HTTP %d, got %d", m, want, got)
+		}
+	}
+}
+
+func TestHandleAuthFuncResponsesSingleRedirectURL(t *testing.T) {
+	idpcs := []connector.Connector{
+		&fakeConnector{loginURL: "http://fake.example.com"},
+	}
+	srv := &Server{
+		IssuerURL:      url.URL{Scheme: "http", Host: "server.example.com"},
+		SessionManager: session.NewSessionManager(session.NewSessionRepo(), session.NewSessionKeyRepo()),
+		ClientIdentityRepo: client.NewClientIdentityRepo([]oidc.ClientIdentity{
+			oidc.ClientIdentity{
+				Credentials: oidc.ClientCredentials{
+					ID:     "XXX",
+					Secret: "secrete",
+				},
+				Metadata: oidc.ClientMetadata{
+					RedirectURLs: []url.URL{
+						url.URL{Scheme: "http", Host: "client.example.com", Path: "/callback"},
+					},
+				},
+			},
+		}),
+	}
+
+	tests := []struct {
+		query        url.Values
+		wantCode     int
+		wantLocation string
+	}{
+		// no redirect_uri provided, but client only has one, so it's usable
+		{
+			query: url.Values{
+				"response_type": []string{"code"},
+				"client_id":     []string{"XXX"},
+				"connector_id":  []string{"fake"},
+			},
+			wantCode:     http.StatusTemporaryRedirect,
+			wantLocation: "http://fake.example.com",
+		},
+
+		// provided redirect_uri matches client
+		{
+			query: url.Values{
+				"response_type": []string{"code"},
+				"redirect_uri":  []string{"http://client.example.com/callback"},
+				"client_id":     []string{"XXX"},
+				"connector_id":  []string{"fake"},
+			},
+			wantCode:     http.StatusTemporaryRedirect,
+			wantLocation: "http://fake.example.com",
+		},
+
+		// provided redirect_uri does not match client
+		{
+			query: url.Values{
+				"response_type": []string{"code"},
+				"redirect_uri":  []string{"http://unrecognized.example.com/callback"},
+				"client_id":     []string{"XXX"},
+				"connector_id":  []string{"fake"},
+			},
+			wantCode: http.StatusBadRequest,
+		},
+
+		// nonexistant client_id
+		{
+			query: url.Values{
+				"response_type": []string{"code"},
+				"redirect_uri":  []string{"http://client.example.com/callback"},
+				"client_id":     []string{"YYY"},
+				"connector_id":  []string{"fake"},
+			},
+			wantCode: http.StatusBadRequest,
+		},
+
+		// unsupported response type, redirects back to client
+		{
+			query: url.Values{
+				"response_type": []string{"token"},
+				"client_id":     []string{"XXX"},
+				"connector_id":  []string{"fake"},
+			},
+			wantCode:     http.StatusTemporaryRedirect,
+			wantLocation: "http://client.example.com/callback?error=unsupported_response_type&state=",
+		},
+	}
+
+	for i, tt := range tests {
+		hdlr := handleAuthFunc(srv, idpcs, nil)
+		w := httptest.NewRecorder()
+		u := fmt.Sprintf("http://server.example.com?%s", tt.query.Encode())
+		req, err := http.NewRequest("GET", u, nil)
+		if err != nil {
+			t.Errorf("case %d: unable to form HTTP request: %v", i, err)
+			continue
+		}
+
+		hdlr.ServeHTTP(w, req)
+		if tt.wantCode != w.Code {
+			t.Errorf("case %d: HTTP code mismatch: want=%d got=%d", i, tt.wantCode, w.Code)
+			continue
+		}
+
+		gotLocation := w.Header().Get("Location")
+		if tt.wantLocation != gotLocation {
+			t.Errorf("case %d: HTTP Location header mismatch: want=%s got=%s", i, tt.wantLocation, gotLocation)
+		}
+	}
+}
+
+func TestHandleAuthFuncResponsesMultipleRedirectURLs(t *testing.T) {
+	idpcs := []connector.Connector{
+		&fakeConnector{loginURL: "http://fake.example.com"},
+	}
+	srv := &Server{
+		IssuerURL:      url.URL{Scheme: "http", Host: "server.example.com"},
+		SessionManager: session.NewSessionManager(session.NewSessionRepo(), session.NewSessionKeyRepo()),
+		ClientIdentityRepo: client.NewClientIdentityRepo([]oidc.ClientIdentity{
+			oidc.ClientIdentity{
+				Credentials: oidc.ClientCredentials{
+					ID:     "XXX",
+					Secret: "secrete",
+				},
+				Metadata: oidc.ClientMetadata{
+					RedirectURLs: []url.URL{
+						url.URL{Scheme: "http", Host: "foo.example.com", Path: "/callback"},
+						url.URL{Scheme: "http", Host: "bar.example.com", Path: "/callback"},
+					},
+				},
+			},
+		}),
+	}
+
+	tests := []struct {
+		query        url.Values
+		wantCode     int
+		wantLocation string
+	}{
+		// provided redirect_uri matches client's first
+		{
+			query: url.Values{
+				"response_type": []string{"code"},
+				"redirect_uri":  []string{"http://foo.example.com/callback"},
+				"client_id":     []string{"XXX"},
+				"connector_id":  []string{"fake"},
+			},
+			wantCode:     http.StatusTemporaryRedirect,
+			wantLocation: "http://fake.example.com",
+		},
+
+		// provided redirect_uri matches client's second
+		{
+			query: url.Values{
+				"response_type": []string{"code"},
+				"redirect_uri":  []string{"http://bar.example.com/callback"},
+				"client_id":     []string{"XXX"},
+				"connector_id":  []string{"fake"},
+			},
+			wantCode:     http.StatusTemporaryRedirect,
+			wantLocation: "http://fake.example.com",
+		},
+
+		// provided redirect_uri does not match either of client's
+		{
+			query: url.Values{
+				"response_type": []string{"code"},
+				"redirect_uri":  []string{"http://unrecognized.example.com/callback"},
+				"client_id":     []string{"XXX"},
+				"connector_id":  []string{"fake"},
+			},
+			wantCode: http.StatusBadRequest,
+		},
+
+		// no redirect_uri provided
+		{
+			query: url.Values{
+				"response_type": []string{"code"},
+				"client_id":     []string{"XXX"},
+				"connector_id":  []string{"fake"},
+			},
+			wantCode: http.StatusBadRequest,
+		},
+	}
+
+	for i, tt := range tests {
+		hdlr := handleAuthFunc(srv, idpcs, nil)
+		w := httptest.NewRecorder()
+		u := fmt.Sprintf("http://server.example.com?%s", tt.query.Encode())
+		req, err := http.NewRequest("GET", u, nil)
+		if err != nil {
+			t.Errorf("case %d: unable to form HTTP request: %v", i, err)
+			continue
+		}
+
+		hdlr.ServeHTTP(w, req)
+		if tt.wantCode != w.Code {
+			t.Errorf("case %d: HTTP code mismatch: want=%d got=%d", i, tt.wantCode, w.Code)
+			t.Errorf("case %d: BODY: %v", i, w.Body.String())
+			t.Errorf("case %d: LOCO: %v", i, w.HeaderMap.Get("Location"))
+			continue
+		}
+
+		gotLocation := w.Header().Get("Location")
+		if tt.wantLocation != gotLocation {
+			t.Errorf("case %d: HTTP Location header mismatch: want=%s got=%s", i, tt.wantLocation, gotLocation)
+		}
+	}
+}
+
+func TestHandleTokenFuncMethodNotAllowed(t *testing.T) {
+	for _, m := range []string{"GET", "PUT", "DELETE"} {
+		hdlr := handleTokenFunc(nil)
+		req, err := http.NewRequest(m, "http://example.com", nil)
+		if err != nil {
+			t.Errorf("case %s: unable to create HTTP request: %v", m, err)
+			continue
+		}
+
+		w := httptest.NewRecorder()
+		hdlr.ServeHTTP(w, req)
+
+		want := http.StatusMethodNotAllowed
+		got := w.Code
+		if want != got {
+			t.Errorf("case %s: expected HTTP %d, got %d", m, want, got)
+		}
+	}
+}
+
+func TestHandleTokenFuncState(t *testing.T) {
+	want := "test-state"
+	v := url.Values{
+		"state": {want},
+	}
+	hdlr := handleTokenFunc(nil)
+	req, err := http.NewRequest("POST", "http://example.com", strings.NewReader(v.Encode()))
+	if err != nil {
+		t.Errorf("unable to create HTTP request, error=%v", err)
+	}
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+
+	w := httptest.NewRecorder()
+	hdlr.ServeHTTP(w, req)
+
+	// should have errored and returned state in the response body
+	var resp map[string]string
+	if err = json.Unmarshal(w.Body.Bytes(), &resp); err != nil {
+		t.Errorf("error unmarshaling response, error=%v", err)
+	}
+
+	got := resp["state"]
+	if want != got {
+		t.Errorf("unexpected state, want=%v, got=%v", want, got)
+	}
+}
+
+func TestHandleDiscoveryFuncMethodNotAllowed(t *testing.T) {
+	for _, m := range []string{"POST", "PUT", "DELETE"} {
+		hdlr := handleDiscoveryFunc(oidc.ProviderConfig{})
+		req, err := http.NewRequest(m, "http://example.com", nil)
+		if err != nil {
+			t.Errorf("case %s: unable to create HTTP request: %v", m, err)
+			continue
+		}
+
+		w := httptest.NewRecorder()
+		hdlr.ServeHTTP(w, req)
+
+		want := http.StatusMethodNotAllowed
+		got := w.Code
+		if want != got {
+			t.Errorf("case %s: expected HTTP %d, got %d", m, want, got)
+		}
+	}
+}
+
+func TestHandleDiscoveryFunc(t *testing.T) {
+	u := "http://server.example.com"
+	cfg := oidc.ProviderConfig{
+		Issuer:        u,
+		AuthEndpoint:  u + httpPathAuth,
+		TokenEndpoint: u + httpPathToken,
+		KeysEndpoint:  u + httpPathKeys,
+
+		GrantTypesSupported:               []string{oauth2.GrantTypeAuthCode},
+		ResponseTypesSupported:            []string{"code"},
+		SubjectTypesSupported:             []string{"public"},
+		IDTokenAlgValuesSupported:         []string{"RS256"},
+		TokenEndpointAuthMethodsSupported: []string{"client_secret_basic"},
+	}
+
+	req, err := http.NewRequest("GET", "http://server.example.com", nil)
+	if err != nil {
+		t.Fatalf("Failed creating HTTP request: err=%v", err)
+	}
+
+	w := httptest.NewRecorder()
+	hdlr := handleDiscoveryFunc(cfg)
+	hdlr.ServeHTTP(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Fatalf("Incorrect status code: want=200 got=%d", w.Code)
+	}
+
+	h := w.Header()
+
+	if ct := h.Get("Content-Type"); ct != "application/json" {
+		t.Fatalf("Incorrect Content-Type: want=application/json, got %s", ct)
+	}
+
+	gotCC := h.Get("Cache-Control")
+	wantCC := "public, max-age=86400"
+	if wantCC != gotCC {
+		t.Fatalf("Incorrect Cache-Control header: want=%q, got=%q", wantCC, gotCC)
+	}
+
+	wantBody := `{"issuer":"http://server.example.com","authorization_endpoint":"http://server.example.com/auth","token_endpoint":"http://server.example.com/token","jwks_uri":"http://server.example.com/keys","response_types_supported":["code"],"grant_types_supported":["authorization_code"],"subject_types_supported":["public"],"id_token_alg_values_supported":["RS256"],"token_endpoint_auth_methods_supported":["client_secret_basic"]}`
+	gotBody := w.Body.String()
+	if wantBody != gotBody {
+		t.Fatalf("Incorrect body: want=%s got=%s", wantBody, gotBody)
+	}
+}
+
+func TestHandleKeysFuncMethodNotAllowed(t *testing.T) {
+	for _, m := range []string{"POST", "PUT", "DELETE"} {
+		hdlr := handleKeysFunc(nil, clockwork.NewRealClock())
+		req, err := http.NewRequest(m, "http://example.com", nil)
+		if err != nil {
+			t.Errorf("case %s: unable to create HTTP request: %v", m, err)
+			continue
+		}
+
+		w := httptest.NewRecorder()
+		hdlr.ServeHTTP(w, req)
+
+		want := http.StatusMethodNotAllowed
+		got := w.Code
+		if want != got {
+			t.Errorf("case %s: expected HTTP %d, got %d", m, want, got)
+		}
+	}
+}
+
+func TestHandleKeysFunc(t *testing.T) {
+	fc := clockwork.NewFakeClock()
+	exp := fc.Now().Add(13 * time.Second)
+	km := &StaticKeyManager{
+		expiresAt: exp,
+		keys: []jose.JWK{
+			jose.JWK{
+				ID:       "1234",
+				Type:     "RSA",
+				Alg:      "RS256",
+				Use:      "sig",
+				Exponent: 65537,
+				Modulus:  big.NewInt(int64(5716758339926702)),
+			},
+			jose.JWK{
+				ID:       "5678",
+				Type:     "RSA",
+				Alg:      "RS256",
+				Use:      "sig",
+				Exponent: 65537,
+				Modulus:  big.NewInt(int64(1234294715519622)),
+			},
+		},
+	}
+
+	req, err := http.NewRequest("GET", "http://server.example.com", nil)
+	if err != nil {
+		t.Fatalf("Failed creating HTTP request: err=%v", err)
+	}
+
+	w := httptest.NewRecorder()
+	hdlr := handleKeysFunc(km, fc)
+	hdlr.ServeHTTP(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Fatalf("Incorrect status code: want=200 got=%d", w.Code)
+	}
+
+	wantHeader := http.Header{
+		"Content-Type":  []string{"application/json"},
+		"Cache-Control": []string{"public, max-age=13"},
+		"Expires":       []string{exp.Format(time.RFC1123)},
+	}
+	gotHeader := w.Header()
+	if !reflect.DeepEqual(wantHeader, gotHeader) {
+		t.Fatalf("Incorrect headers: want=%#v got=%#v", wantHeader, gotHeader)
+	}
+
+	wantBody := `{"keys":[{"kid":"1234","kty":"RSA","alg":"RS256","use":"sig","e":"AQAB","n":"FE9chh46rg=="},{"kid":"5678","kty":"RSA","alg":"RS256","use":"sig","e":"AQAB","n":"BGKVohEShg=="}]}`
+	gotBody := w.Body.String()
+	if wantBody != gotBody {
+		t.Fatalf("Incorrect body: want=%s got=%s", wantBody, gotBody)
+	}
+}
+
+func TestShouldReprompt(t *testing.T) {
+	tests := []struct {
+		c *http.Cookie
+		v bool
+	}{
+		// No cookie
+		{
+			c: nil,
+			v: false,
+		},
+		// different cookie
+		{
+			c: &http.Cookie{
+				Name: "rando-cookie",
+			},
+			v: false,
+		},
+		// actual cookie we care about
+		{
+			c: &http.Cookie{
+				Name: "LastSeen",
+			},
+			v: true,
+		},
+	}
+
+	for i, tt := range tests {
+		r := &http.Request{Header: make(http.Header)}
+		if tt.c != nil {
+			r.AddCookie(tt.c)
+		}
+		want := tt.v
+		got := shouldReprompt(r)
+		if want != got {
+			t.Errorf("case %d: want=%t, got=%t", i, want, got)
+		}
+	}
+}
+
+type checkable struct {
+	healthy bool
+}
+
+func (c checkable) Healthy() (err error) {
+	if !c.healthy {
+		err = errors.New("im unhealthy")
+	}
+	return
+}
diff --git a/server/password.go b/server/password.go
new file mode 100644
index 00000000..1dfa3a8b
--- /dev/null
+++ b/server/password.go
@@ -0,0 +1,273 @@
+package server
+
+import (
+	"html/template"
+	"net/http"
+	"net/url"
+
+	"github.com/coreos/go-oidc/key"
+
+	"github.com/coreos/dex/client"
+	"github.com/coreos/dex/pkg/log"
+	"github.com/coreos/dex/session"
+	"github.com/coreos/dex/user"
+	useremail "github.com/coreos/dex/user/email"
+)
+
+type sendResetPasswordEmailData struct {
+	Error             bool
+	Message           string
+	EmailSent         bool
+	Email             string
+	ClientID          string
+	RedirectURL       string
+	RedirectURLParsed url.URL
+}
+
+type SendResetPasswordEmailHandler struct {
+	tpl     *template.Template
+	emailer *useremail.UserEmailer
+	sm      *session.SessionManager
+	cr      client.ClientIdentityRepo
+}
+
+func (h *SendResetPasswordEmailHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	switch r.Method {
+	case "GET":
+		h.handleGET(w, r)
+		return
+	case "POST":
+		h.handlePOST(w, r)
+		return
+	default:
+		writeAPIError(w, http.StatusMethodNotAllowed, newAPIError(errorInvalidRequest,
+			"method not allowed"))
+		return
+	}
+}
+
+func (h *SendResetPasswordEmailHandler) handleGET(w http.ResponseWriter, r *http.Request) {
+	sessionKey := r.URL.Query().Get("session_key")
+	if sessionKey != "" {
+		clientID, redirectURL, err := h.exchangeKeyForClientAndRedirect(sessionKey)
+		if err == nil {
+			handleURL := *r.URL
+			q := r.URL.Query()
+			q.Del("session_key")
+			q.Set("redirect_uri", redirectURL.String())
+			q.Set("client_id", clientID)
+			handleURL.RawQuery = q.Encode()
+			http.Redirect(w, r, handleURL.String(), http.StatusSeeOther)
+			return
+		}
+		// Even though we could not exchange the sessionKey to get a
+		// redirect URL, we can still continue as if they didn't pass
+		// one in, so we don't return here.
+		log.Errorf("could not exchange sessionKey: %v", err)
+	}
+	data := sendResetPasswordEmailData{}
+	h.fillData(r, &data)
+	execTemplate(w, h.tpl, data)
+}
+
+func (h *SendResetPasswordEmailHandler) fillData(r *http.Request, data *sendResetPasswordEmailData) {
+	data.Email = r.FormValue("email")
+	clientID := r.FormValue("client_id")
+	redirectURL := r.FormValue("redirect_uri")
+
+	if redirectURL != "" && clientID != "" {
+		if parsed, ok := h.validateRedirectURL(clientID, redirectURL); ok {
+			data.ClientID = clientID
+			data.RedirectURL = redirectURL
+			data.RedirectURLParsed = parsed
+		}
+	}
+
+}
+
+func (h *SendResetPasswordEmailHandler) handlePOST(w http.ResponseWriter, r *http.Request) {
+	data := sendResetPasswordEmailData{}
+	h.fillData(r, &data)
+
+	if !user.ValidEmail(data.Email) {
+		h.errPage(w, "Please supply a valid email addresss.", http.StatusBadRequest, &data)
+		return
+	}
+
+	data.EmailSent = true
+	execTemplate(w, h.tpl, data)
+
+	// We spawn this in new goroutine because we don't want anyone using timing
+	// attacks to guess if an email address exists or not.
+	go h.emailer.SendResetPasswordEmail(data.Email, data.RedirectURLParsed, data.ClientID)
+}
+
+func (h *SendResetPasswordEmailHandler) validateRedirectURL(clientID string, redirectURL string) (url.URL, bool) {
+	parsed, err := url.Parse(redirectURL)
+	if err != nil {
+		log.Errorf("Error parsing redirectURL: %v", err)
+		return url.URL{}, false
+	}
+
+	cm, err := h.cr.Metadata(clientID)
+	if err != nil || cm == nil {
+		log.Errorf("Error getting ClientMetadata: %v", err)
+		return url.URL{}, false
+	}
+
+	validURL, err := client.ValidRedirectURL(parsed, cm.RedirectURLs)
+	if err != nil {
+		log.Errorf("Invalid redirectURL for clientID: redirectURL:%q, clientID:%q", redirectURL, clientID)
+		return url.URL{}, false
+	}
+
+	return validURL, true
+}
+
+func (h *SendResetPasswordEmailHandler) errPage(w http.ResponseWriter, msg string, status int, data *sendResetPasswordEmailData) {
+	data.Error = true
+	data.Message = msg
+	execTemplateWithStatus(w, h.tpl, data, status)
+}
+
+func (h *SendResetPasswordEmailHandler) internalError(w http.ResponseWriter, err error) {
+	log.Errorf("Internal Error during sending password reset email: %v", err)
+	h.errPage(w, "There was a problem processing your request.", http.StatusInternalServerError,
+		&sendResetPasswordEmailData{})
+}
+
+func (h *SendResetPasswordEmailHandler) exchangeKeyForClientAndRedirect(key string) (string, url.URL, error) {
+	id, err := h.sm.ExchangeKey(key)
+	if err != nil {
+		log.Errorf("error exchanging key: %v ", err)
+		return "", url.URL{}, err
+	}
+
+	ses, err := h.sm.Kill(id)
+	if err != nil {
+		log.Errorf("error killing session: %v", err)
+		return "", url.URL{}, err
+	}
+
+	return ses.ClientID, ses.RedirectURL, nil
+}
+
+type resetPasswordTemplateData struct {
+	Error        string
+	Message      string
+	Token        string
+	DontShowForm bool
+	Success      bool
+}
+
+type ResetPasswordHandler struct {
+	tpl       *template.Template
+	issuerURL url.URL
+	um        *user.Manager
+	keysFunc  func() ([]key.PublicKey, error)
+}
+
+type resetPasswordRequest struct {
+	// A resetPasswordRequest starts with these objects.
+	h    *ResetPasswordHandler
+	r    *http.Request
+	w    http.ResponseWriter
+	data *resetPasswordTemplateData
+
+	// These get filled in by sub-handlers.
+	pwReset user.PasswordReset
+}
+
+func (h *ResetPasswordHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	req := &resetPasswordRequest{
+		h:    h,
+		r:    r,
+		w:    w,
+		data: &resetPasswordTemplateData{},
+	}
+	req.HandleRequest()
+}
+
+func (r *resetPasswordRequest) HandleRequest() {
+	switch r.r.Method {
+	case "GET":
+		r.handleGET()
+		return
+	case "POST":
+		r.handlePOST()
+		return
+	default:
+		writeAPIError(r.w, http.StatusMethodNotAllowed, newAPIError(errorInvalidRequest,
+			"method not allowed"))
+		return
+	}
+}
+
+func (r *resetPasswordRequest) handleGET() {
+	if !r.parseAndVerifyToken() {
+		return
+	}
+	execTemplate(r.w, r.h.tpl, r.data)
+}
+
+func (r *resetPasswordRequest) handlePOST() {
+	if !r.parseAndVerifyToken() {
+		return
+	}
+
+	plaintext := r.r.FormValue("password")
+	cbURL, err := r.h.um.ChangePassword(r.pwReset, plaintext)
+	if err != nil {
+		switch err {
+		case user.ErrorPasswordAlreadyChanged:
+			r.data.Error = "Link Expired"
+			r.data.Message = "The link in your email is no longer valid. If you need to change your password, generate a new email."
+			r.data.DontShowForm = true
+			execTemplateWithStatus(r.w, r.h.tpl, r.data, http.StatusBadRequest)
+			return
+		case user.ErrorInvalidPassword:
+			r.data.Error = "Invalid Password"
+			r.data.Message = "Please choose a password which is at least six characters."
+			execTemplateWithStatus(r.w, r.h.tpl, r.data, http.StatusBadRequest)
+			return
+		default:
+			r.data.Error = "Error Processing Request"
+			r.data.Message = "Plesae try again later."
+			execTemplateWithStatus(r.w, r.h.tpl, r.data, http.StatusInternalServerError)
+			return
+		}
+
+	}
+	if cbURL == nil {
+		r.data.Success = true
+		execTemplate(r.w, r.h.tpl, r.data)
+		return
+	}
+
+	http.Redirect(r.w, r.r, cbURL.String(), http.StatusSeeOther)
+}
+
+func (r *resetPasswordRequest) parseAndVerifyToken() bool {
+	keys, err := r.h.keysFunc()
+	if err != nil {
+		log.Errorf("problem getting keys: %v", err)
+		r.data.Error = "There's been an error processing your request."
+		r.data.Message = "Plesae try again later."
+		execTemplateWithStatus(r.w, r.h.tpl, r.data, http.StatusInternalServerError)
+		return false
+	}
+
+	token := r.r.FormValue("token")
+	pwReset, err := user.ParseAndVerifyPasswordResetToken(token, r.h.issuerURL, keys)
+	if err != nil {
+		log.Errorf("Reset Password unverifiable token: %v", err)
+		r.data.Error = "Bad Password Reset Token"
+		r.data.Message = "That was not a verifiable token."
+		r.data.DontShowForm = true
+		execTemplateWithStatus(r.w, r.h.tpl, r.data, http.StatusBadRequest)
+		return false
+	}
+	r.pwReset = pwReset
+	r.data.Token = token
+	return true
+}
diff --git a/server/password_test.go b/server/password_test.go
new file mode 100644
index 00000000..4455ba22
--- /dev/null
+++ b/server/password_test.go
@@ -0,0 +1,572 @@
+package server
+
+import (
+	"bytes"
+	htmltemplate "html/template"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"strings"
+	"testing"
+	"text/template"
+	"time"
+
+	"github.com/coreos/go-oidc/jose"
+	"github.com/coreos/go-oidc/key"
+	"github.com/kylelemons/godebug/pretty"
+
+	"github.com/coreos/dex/email"
+	"github.com/coreos/dex/pkg/html"
+	"github.com/coreos/dex/user"
+)
+
+func TestSendResetPasswordEmailHandler(t *testing.T) {
+	str := func(s string) []string {
+		return []string{s}
+	}
+
+	textTemplateString := `{{define "password-reset.txt"}}{{.link}}{{end}}`
+	textTemplates := template.New("text")
+	_, err := textTemplates.Parse(textTemplateString)
+	if err != nil {
+		t.Fatalf("error parsing text templates: %v", err)
+	}
+
+	htmlTemplates := htmltemplate.New("html")
+
+	tests := []struct {
+		query url.Values
+
+		method string
+
+		wantFormValues  *url.Values
+		wantCode        int
+		wantRedirectURL *url.URL
+		wantEmailer     *testEmailer
+		wantPRRedirect  *url.URL
+		wantPRUserID    string
+		wantPRPassword  string
+	}{
+		// First we'll test all the requests for happy path #1:
+		{
+
+			// STEP 1.1 - User clicks on link from local-login page and has a
+			// session_key, which will prompt a redirect to page which has
+			// instead a client_id and redirect_uri.
+			query: url.Values{
+				"session_key": str("code-2"),
+			},
+			method: "GET",
+
+			wantCode: http.StatusSeeOther,
+			wantRedirectURL: &url.URL{
+				Scheme: testIssuerURL.Scheme,
+				Host:   testIssuerURL.Host,
+				Path:   httpPathSendResetPassword,
+				RawQuery: url.Values{
+					"client_id":    str(testClientID),
+					"redirect_uri": str(testRedirectURL.String()),
+				}.Encode(),
+			},
+		},
+		{
+
+			// STEP 1.2 - This is the request that happens as a result of the
+			// redirect. The client_id and redirect_uri should be in the form on
+			// the page.
+			query: url.Values{
+				"client_id":    str(testClientID),
+				"redirect_uri": str(testRedirectURL.String()),
+			},
+			method: "GET",
+
+			wantCode: http.StatusOK,
+			wantFormValues: &url.Values{
+				"client_id":    str(testClientID),
+				"redirect_uri": str(testRedirectURL.String()),
+				"email":        str(""),
+			},
+		},
+		{
+			// STEP 1.3 - User enters a valid email, gets success page.  The
+			// values from the GET redirect are resent in the form POST along
+			// with the email.
+			query: url.Values{
+				"client_id":    str(testClientID),
+				"redirect_uri": str(testRedirectURL.String()),
+				"email":        str("Email-1@example.com"),
+			},
+			method: "POST",
+
+			wantCode: http.StatusOK,
+			wantEmailer: &testEmailer{
+				to:      str("Email-1@example.com"),
+				from:    "noreply@example.com",
+				subject: "Reset your password.",
+			},
+			wantPRUserID:   "ID-1",
+			wantPRRedirect: &testRedirectURL,
+			wantPRPassword: "password",
+		},
+
+		// Happy Path #2 - same as above but without session_key
+		{
+
+			// STEP 2.1 - user somehow ends up on reset page without a session_key
+			query:  url.Values{},
+			method: "GET",
+
+			wantCode: http.StatusOK,
+			wantFormValues: &url.Values{
+				"client_id":    str(""),
+				"redirect_uri": str(""),
+				"email":        str(""),
+			},
+		},
+		{
+
+			// STEP 2.3 - There is no STEP 2 because we don't have the redirect.
+			query: url.Values{
+				"email": str("Email-1@example.com"),
+			},
+			method: "POST",
+
+			wantCode: http.StatusOK,
+			wantEmailer: &testEmailer{
+				to:      str("Email-1@example.com"),
+				from:    "noreply@example.com",
+				subject: "Reset your password.",
+			},
+			wantPRPassword: "password",
+			wantPRUserID:   "ID-1",
+		},
+
+		// Some error conditions:
+		{
+			// STEP 1.3.1 - User enters an invalid email, gets form again.
+			query: url.Values{
+				"client_id":    str(testClientID),
+				"redirect_uri": str(testRedirectURL.String()),
+				"email":        str("NOT EMAIL"),
+			},
+			method: "POST",
+
+			wantCode: http.StatusBadRequest,
+			wantFormValues: &url.Values{
+				"client_id":    str(testClientID),
+				"redirect_uri": str(testRedirectURL.String()),
+				"email":        str(""),
+			},
+		},
+		{
+			// STEP 1.3.2 - User enters a valid email but for a user not in the
+			// system. They still get the success page, but no email is sent.
+			query: url.Values{
+				"client_id":    str(testClientID),
+				"redirect_uri": str(testRedirectURL.String()),
+				"email":        str("NOSUCHUSER@example.com"),
+			},
+			method: "POST",
+
+			wantCode: http.StatusOK,
+		},
+		{
+			// STEP 1.3.3 - User enters a valid email but for a user not in the
+			// system. They still get the success page, but no email is sent.
+			query: url.Values{
+				"client_id":    str(testClientID),
+				"redirect_uri": str(testRedirectURL.String()),
+				"email":        str("NOSUCHUSER@example.com"),
+			},
+			method: "POST",
+
+			wantCode: http.StatusOK,
+		}, {
+
+			// STEP 1.1.1 - User clicks on link from local-login page and has a
+			// session_key, but it is not-recognized. There is no redirect, the
+			// user goes right to the form which has no client_id or
+			// redirect_uri
+			query: url.Values{
+				"session_key": str("code-UNKNOWN"),
+			},
+			method: "GET",
+
+			wantCode: http.StatusOK,
+			wantFormValues: &url.Values{
+				"client_id":    str(""),
+				"redirect_uri": str(""),
+				"email":        str(""),
+			},
+		}, {
+
+			// STEP 1.2.1 - Someone trying to replace a valid redirect_url with
+			// an invalid one; in this case we just give them the form but
+			// ignore client_id and redirect_uri.
+			query: url.Values{
+				"client_id":    str(testClientID),
+				"redirect_uri": str("http://evilhackers.example.com"),
+			},
+			method: "GET",
+
+			wantCode: http.StatusOK,
+			wantFormValues: &url.Values{
+				"client_id":    str(""),
+				"redirect_uri": str(""),
+				"email":        str(""),
+			},
+		}, {
+			// STEP 1.3.4 - User enters a valid email for a user in the system,
+			// but with an invalid redirect_uri. They still get an email, but
+			// with no redirect url.
+			query: url.Values{
+				"client_id":    str(testClientID),
+				"redirect_uri": str("http://evilhackers.example.com"),
+				"email":        str("Email-1@example.com"),
+			},
+			method: "POST",
+
+			wantCode: http.StatusOK,
+			wantEmailer: &testEmailer{
+				to:      str("Email-1@example.com"),
+				from:    "noreply@example.com",
+				subject: "Reset your password.",
+			},
+			wantPRPassword: "password",
+			wantPRUserID:   "ID-1",
+			wantPRRedirect: nil,
+		},
+	}
+
+	for i, tt := range tests {
+		t.Logf("CASE: %d", i)
+		f, err := makeTestFixtures()
+		if err != nil {
+			t.Fatalf("case %d: could not make test fixtures: %v", i, err)
+		}
+
+		_, err = f.srv.NewSession("local", "XXX", "", f.redirectURL, "", true)
+		if err != nil {
+			t.Fatalf("case %d: could not create new session: %v", i, err)
+		}
+
+		emailer := &testEmailer{
+			sent: make(chan struct{}),
+		}
+		templatizer := email.NewTemplatizedEmailerFromTemplates(textTemplates, htmlTemplates, emailer)
+		f.srv.UserEmailer.SetEmailer(templatizer)
+		hdlr := SendResetPasswordEmailHandler{
+			tpl:     f.srv.SendResetPasswordEmailTemplate,
+			emailer: f.srv.UserEmailer,
+			sm:      f.sessionManager,
+			cr:      f.clientIdentityRepo,
+		}
+
+		w := httptest.NewRecorder()
+
+		var req *http.Request
+		u := testIssuerURL
+		u.Path = httpPathSendResetPassword
+		if tt.method == "POST" {
+			req, err = http.NewRequest(tt.method, u.String(), strings.NewReader(tt.query.Encode()))
+			req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+		} else {
+			u.RawQuery = tt.query.Encode()
+			req, err = http.NewRequest(tt.method, u.String(), nil)
+		}
+		if err != nil {
+			t.Errorf("case %d: unable to form HTTP request: %v", i, err)
+		}
+
+		hdlr.ServeHTTP(w, req)
+		if tt.wantCode != w.Code {
+			t.Errorf("case %d: wantCode=%v, got=%v", i, tt.wantCode, w.Code)
+			t.Logf("case %d: Body: %v ", i, w.Body)
+			continue
+		}
+
+		values, err := html.FormValues("#sendResetPasswordForm", w.Body)
+		if err != nil {
+			t.Errorf("case %d: could not parse form: %v", i, err)
+		}
+
+		if tt.wantFormValues != nil {
+			if diff := pretty.Compare(*tt.wantFormValues, values); diff != "" {
+				t.Errorf("case %d: Compare(wantFormValues, got) = %v", i, diff)
+			}
+		}
+
+		if tt.wantRedirectURL != nil {
+			location, err := url.Parse(w.Header().Get("location"))
+			if err != nil {
+				t.Errorf("case %d: could not parse Location header: %v", i, err)
+			}
+			if diff := pretty.Compare(*tt.wantRedirectURL, *location); diff != "" {
+				t.Errorf("case %d: Compare(wantRedirectURL, got) = %v", i, diff)
+			}
+		}
+		if tt.wantEmailer != nil {
+			<-emailer.sent
+			txt := emailer.text
+			emailer.text = ""
+			if diff := pretty.Compare(*tt.wantEmailer, *emailer); diff != "" {
+				t.Errorf("case %d: Compare(wantEmailer, got) = %v", i, diff)
+			}
+
+			u, err := url.Parse(txt)
+			if err != nil {
+				t.Errorf("case %d: could not parse generated link: %v", i, err)
+			}
+			token := u.Query().Get("token")
+			pubKeys, err := f.srv.KeyManager.PublicKeys()
+			if err != nil {
+				t.Errorf("case %d: could not parse generated link: %v", i, err)
+			}
+
+			pr, err := user.ParseAndVerifyPasswordResetToken(token, testIssuerURL, pubKeys)
+			if err != nil {
+				t.Errorf("case %d: could not parse reset token: %v", i, err)
+			}
+
+			if tt.wantPRPassword != string(pr.Password()) {
+				t.Errorf("case %d: wantPRPassword=%v, got=%v", i, tt.wantPRPassword, string(pr.Password()))
+			}
+
+			if tt.wantPRRedirect == nil {
+				if pr.Callback() != nil {
+					t.Errorf("case %d: wantPRCallback=nil, got=%v", i, pr.Callback())
+
+				}
+			} else {
+				if *tt.wantPRRedirect != *pr.Callback() {
+					t.Errorf("case %d: wantPRCallback=%v, got=%v", i, tt.wantPRRedirect, pr.Callback())
+				}
+			}
+
+		}
+	}
+}
+
+func TestResetPasswordHandler(t *testing.T) {
+	makeToken := func(userID, password string, callback url.URL, expires time.Duration, signer jose.Signer) string {
+		var clientID string
+		if callback.String() == "" {
+			clientID = ""
+		} else {
+			clientID = testClientID
+		}
+		pr := user.NewPasswordReset(user.User{ID: "ID-1"},
+			user.Password(password),
+			testIssuerURL,
+			clientID,
+			callback,
+			expires)
+		token, err := pr.Token(signer)
+		if err != nil {
+			t.Fatalf("couldn't make token: %q", err)
+		}
+		return token
+	}
+	goodSigner := key.NewPrivateKeySet([]*key.PrivateKey{testPrivKey},
+		time.Now().Add(time.Minute)).Active().Signer()
+
+	badKey, err := key.GeneratePrivateKey()
+	if err != nil {
+		t.Fatalf("couldn't make new key: %q", err)
+	}
+	badSigner := key.NewPrivateKeySet([]*key.PrivateKey{badKey},
+		time.Now().Add(time.Minute)).Active().Signer()
+
+	str := func(s string) []string {
+		return []string{s}
+	}
+
+	user.PasswordHasher = func(s string) ([]byte, error) {
+		return []byte(strings.ToUpper(s)), nil
+	}
+	defer func() {
+		user.PasswordHasher = user.DefaultPasswordHasher
+	}()
+
+	tests := []struct {
+		query url.Values
+
+		method string
+
+		wantFormValues *url.Values
+		wantCode       int
+		wantPassword   string
+	}{
+		// Scenario 1: Happy Path
+		{
+			// Step 1.1 - User clicks link in email, has valid token.
+			query: url.Values{
+				"token": str(makeToken("ID-1", "password", testRedirectURL, time.Hour*1, goodSigner)),
+			},
+			method: "GET",
+
+			wantCode: http.StatusOK,
+			wantFormValues: &url.Values{
+				"password": str(""),
+				"token":    str(makeToken("ID-1", "password", testRedirectURL, time.Hour*1, goodSigner)),
+			},
+			wantPassword: "password",
+		},
+		{
+			// Step 1.2 - User enters in new valid password, password is changed, user is redirected.
+			query: url.Values{
+				"token":    str(makeToken("ID-1", "password", testRedirectURL, time.Hour*1, goodSigner)),
+				"password": str("new_password"),
+			},
+			method: "POST",
+
+			wantCode:       http.StatusSeeOther,
+			wantFormValues: &url.Values{},
+			wantPassword:   "NEW_PASSWORD",
+		},
+
+		// Scenario 2: Happy Path, but without redirect.
+		{
+			// Step 2.1 - User clicks link in email, has valid token.
+			query: url.Values{
+				"token": str(makeToken("ID-1", "password", url.URL{}, time.Hour*1, goodSigner)),
+			},
+			method: "GET",
+
+			wantCode: http.StatusOK,
+			wantFormValues: &url.Values{
+				"password": str(""),
+				"token":    str(makeToken("ID-1", "password", url.URL{}, time.Hour*1, goodSigner)),
+			},
+			wantPassword: "password",
+		},
+		{
+			// Step 2.2 - User enters in new valid password, password is changed, user is redirected.
+			query: url.Values{
+				"token":    str(makeToken("ID-1", "password", url.URL{}, time.Hour*1, goodSigner)),
+				"password": str("new_password"),
+			},
+			method: "POST",
+
+			// no redirect
+			wantCode:       http.StatusOK,
+			wantFormValues: &url.Values{},
+			wantPassword:   "NEW_PASSWORD",
+		},
+		// Errors
+		{
+			// Step 1.1.1 - User clicks link in email, has invalid token.
+			query: url.Values{
+				"token": str(makeToken("ID-1", "password", testRedirectURL, time.Hour*1, badSigner)),
+			},
+			method: "GET",
+
+			wantCode:       http.StatusBadRequest,
+			wantFormValues: &url.Values{},
+			wantPassword:   "password",
+		},
+
+		{
+			// Step 2.2.1 - User enters in new valid password, password is changed, user is redirected.
+			query: url.Values{
+				"token":    str(makeToken("ID-1", "password", url.URL{}, time.Hour*1, goodSigner)),
+				"password": str("shrt"),
+			},
+			method: "POST",
+
+			// no redirect
+			wantCode: http.StatusBadRequest,
+			wantFormValues: &url.Values{
+				"password": str(""),
+				"token":    str(makeToken("ID-1", "password", url.URL{}, time.Hour*1, goodSigner)),
+			},
+			wantPassword: "password",
+		},
+		{
+			// Step 2.2.2 - User enters in new valid password, with suspicious token.
+			query: url.Values{
+				"token":    str(makeToken("ID-1", "password", url.URL{}, time.Hour*1, badSigner)),
+				"password": str("shrt"),
+			},
+			method: "POST",
+
+			// no redirect
+			wantCode:       http.StatusBadRequest,
+			wantFormValues: &url.Values{},
+			wantPassword:   "password",
+		},
+	}
+	for i, tt := range tests {
+		f, err := makeTestFixtures()
+		if err != nil {
+			t.Fatalf("case %d: could not make test fixtures: %v", i, err)
+		}
+
+		hdlr := ResetPasswordHandler{
+			tpl:       f.srv.ResetPasswordTemplate,
+			issuerURL: testIssuerURL,
+			um:        f.srv.UserManager,
+			keysFunc:  f.srv.KeyManager.PublicKeys,
+		}
+
+		w := httptest.NewRecorder()
+		var req *http.Request
+		u := testIssuerURL
+		u.Path = httpPathResetPassword
+		if tt.method == "POST" {
+			req, err = http.NewRequest(tt.method, u.String(), strings.NewReader(tt.query.Encode()))
+			req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+		} else {
+			u.RawQuery = tt.query.Encode()
+			req, err = http.NewRequest(tt.method, u.String(), nil)
+		}
+		if err != nil {
+			t.Errorf("case %d: unable to form HTTP request: %v", i, err)
+		}
+
+		hdlr.ServeHTTP(w, req)
+
+		if tt.wantCode != w.Code {
+			t.Errorf("case %d: wantCode=%v, got=%v", i, tt.wantCode, w.Code)
+			t.Logf("case %d: Body: %v ", i, w.Body)
+			continue
+		}
+
+		values, err := html.FormValues("#resetPasswordForm", bytes.NewReader(w.Body.Bytes()))
+		if err != nil {
+			t.Errorf("case %d: could not parse form: %v", i, err)
+		}
+
+		if tt.wantFormValues != nil {
+			if diff := pretty.Compare(*tt.wantFormValues, values); diff != "" {
+				t.Errorf("case %d: Compare(wantFormValues, got) = %v", i, diff)
+				t.Logf("case %d: Body: %v ", i, w.Body)
+			}
+		}
+		pwi, err := f.srv.PasswordInfoRepo.Get(nil, "ID-1")
+		if err != nil {
+			t.Errorf("case %d: Error getting Password info: %v", i, err)
+		}
+		if tt.wantPassword != string(pwi.Password) {
+			t.Errorf("case %d: wantPassword=%v, got=%v", i, tt.wantPassword, string(pwi.Password))
+		}
+
+	}
+}
+
+type testEmailer struct {
+	from, subject, text, html string
+	to                        []string
+	sent                      chan struct{}
+}
+
+func (t *testEmailer) SendMail(from, subject, text, html string, to ...string) error {
+	t.from = from
+	t.subject = subject
+	t.text = text
+	t.html = html
+	t.to = to
+	t.sent <- struct{}{}
+
+	return nil
+}
diff --git a/server/register.go b/server/register.go
new file mode 100644
index 00000000..42b415a8
--- /dev/null
+++ b/server/register.go
@@ -0,0 +1,303 @@
+package server
+
+import (
+	"errors"
+	"fmt"
+	"net/http"
+	"net/url"
+	"strings"
+
+	"github.com/coreos/dex/connector"
+	"github.com/coreos/dex/pkg/log"
+	"github.com/coreos/dex/session"
+	"github.com/coreos/dex/user"
+	"github.com/coreos/go-oidc/oidc"
+)
+
+type formError struct {
+	Field string
+	Error string
+}
+
+type registerTemplateData struct {
+	Error      bool
+	FormErrors []formError
+	Message    string
+	Email      string
+	Code       string
+	Password   string
+	Local      bool
+}
+
+var (
+	errToFormErrorMap = map[error]formError{
+		user.ErrorInvalidEmail: formError{
+			Field: "email",
+			Error: "Please enter a valid email",
+		},
+		user.ErrorInvalidPassword: formError{
+			Field: "password",
+			Error: "Please enter a valid password",
+		},
+		user.ErrorDuplicateEmail: formError{
+			Field: "email",
+			Error: "That email is already in use; please choose another.",
+		},
+	}
+)
+
+func handleRegisterFunc(s *Server) http.HandlerFunc {
+	tpl := s.RegisterTemplate
+
+	errPage := func(w http.ResponseWriter, msg string, code string, status int) {
+		data := registerTemplateData{
+			Error:   true,
+			Message: msg,
+			Code:    code,
+		}
+		execTemplateWithStatus(w, tpl, data, status)
+	}
+
+	internalError := func(w http.ResponseWriter, err error) {
+		log.Errorf("Internal Error during registration: %v", err)
+		errPage(w, "There was a problem processing your request.", "", http.StatusInternalServerError)
+	}
+
+	idx := makeConnectorMap(s.Connectors)
+
+	return func(w http.ResponseWriter, r *http.Request) {
+		err := r.ParseForm()
+		if err != nil {
+			internalError(w, err)
+			return
+		}
+
+		// verify the user has a valid code.
+		key := r.Form.Get("code")
+		sessionID, err := s.SessionManager.ExchangeKey(key)
+		if err != nil {
+			errPage(w, "Please authenticate before registering.", "", http.StatusUnauthorized)
+			return
+		}
+
+		// create a new code for them to use next time they hit the server.
+		code, err := s.SessionManager.NewSessionKey(sessionID)
+		if err != nil {
+			internalError(w, err)
+			return
+		}
+		ses, err := s.SessionManager.Get(sessionID)
+		if err != nil || ses == nil {
+			return
+		}
+
+		// determine whether or not this is a local or remote ID that is going
+		// to be registered.
+		idpc, ok := idx[ses.ConnectorID]
+		if !ok {
+			internalError(w, fmt.Errorf("no such IDPC: %v", ses.ConnectorID))
+			return
+		}
+		_, local := idpc.(*connector.LocalConnector)
+
+		// Does the email comes from a trusted provider?
+		trustedEmail := ses.Identity.Email != "" && idpc.TrustedEmailProvider()
+		validate := r.Form.Get("validate") == "1"
+		formErrors := []formError{}
+		email := r.Form.Get("email")
+
+		// only auto-populate the first time the page is GETted, not on
+		// subsequent POSTs
+		if email == "" && r.Method == "GET" {
+			email = ses.Identity.Email
+		}
+
+		password := r.Form.Get("password")
+		if validate {
+			if email == "" {
+				formErrors = append(formErrors, formError{"email", "Please supply a valid email"})
+			}
+			if local && password == "" {
+				formErrors = append(formErrors, formError{"password", "Please supply a valid password"})
+			}
+		}
+
+		data := registerTemplateData{
+			Code:     code,
+			Email:    email,
+			Password: password,
+			Local:    local,
+		}
+
+		// If there are form errors or this is the initial request
+		// (i.e. validate==false), and we are not going to auto-submit a
+		// trusted email, then show the form.
+		if (len(formErrors) > 0 || !validate) && !trustedEmail {
+			data.FormErrors = formErrors
+			if !validate {
+				execTemplate(w, tpl, data)
+			} else {
+				execTemplateWithStatus(w, tpl, data, http.StatusBadRequest)
+			}
+			return
+		}
+
+		var userID string
+		if local {
+			userID, err = registerFromLocalConnector(
+				s.UserManager,
+				s.SessionManager,
+				ses,
+				email, password)
+		} else {
+			if trustedEmail {
+				// in the case of a trusted email provider, make sure we are
+				// getting the email address from the session, not from the
+				// query string, to prevent forgeries.
+				email = ses.Identity.Email
+			}
+			userID, err = registerFromRemoteConnector(
+				s.UserManager,
+				ses,
+				email,
+				trustedEmail)
+		}
+		if err == user.ErrorDuplicateEmail {
+			// In this case, the user probably just forgot that they registered.
+			connID, err := getConnectorForUserByEmail(s.UserRepo, email)
+			if err != nil {
+				internalError(w, err)
+			}
+			loginURL := newLoginURLFromSession(
+				s.IssuerURL, ses, false, []string{connID}, "login-maybe")
+			if err = s.KillSession(code); err != nil {
+				log.Errorf("Error killing session: %v", err)
+			}
+			http.Redirect(w, r, loginURL.String(), http.StatusSeeOther)
+
+		}
+
+		if err != nil {
+			formErrors := errToFormErrors(err)
+			if len(formErrors) > 0 {
+				data.FormErrors = formErrors
+				execTemplate(w, tpl, data)
+				return
+			} else {
+				if err == user.ErrorDuplicateRemoteIdentity {
+					errPage(w, "You already registered an account with this identity", "", http.StatusConflict)
+					return
+				}
+				internalError(w, err)
+				return
+			}
+		}
+		ses, err = s.SessionManager.AttachUser(sessionID, userID)
+		if err != nil {
+			internalError(w, err)
+			return
+		}
+
+		usr, err := s.UserRepo.Get(nil, userID)
+		if err != nil {
+			internalError(w, err)
+			return
+		}
+
+		if !trustedEmail {
+			_, err = s.UserEmailer.SendEmailVerification(usr.ID, ses.ClientID, ses.RedirectURL)
+
+			if err != nil {
+				log.Errorf("Error sending email verification: %v", err)
+			}
+		}
+
+		ru := ses.RedirectURL
+		q := ru.Query()
+		q.Set("code", code)
+		q.Set("state", ses.ClientState)
+		ru.RawQuery = q.Encode()
+		w.Header().Set("Location", ru.String())
+		w.WriteHeader(http.StatusSeeOther)
+		return
+	}
+}
+
+func registerFromLocalConnector(userManager *user.Manager, sessionManager *session.SessionManager, ses *session.Session, email, password string) (string, error) {
+	userID, err := userManager.RegisterWithPassword(email, password, ses.ConnectorID)
+	if err != nil {
+		return "", err
+	}
+
+	ses, err = sessionManager.AttachRemoteIdentity(ses.ID, oidc.Identity{
+		ID: userID,
+	})
+	if err != nil {
+		return "", err
+	}
+	return userID, nil
+}
+
+func registerFromRemoteConnector(userManager *user.Manager, ses *session.Session, email string, emailVerified bool) (string, error) {
+	if ses.Identity.ID == "" {
+		return "", errors.New("No Identity found in session.")
+	}
+	rid := user.RemoteIdentity{
+		ConnectorID: ses.ConnectorID,
+		ID:          ses.Identity.ID,
+	}
+	userID, err := userManager.RegisterWithRemoteIdentity(email, emailVerified, rid)
+	if err != nil {
+		return "", err
+	}
+
+	return userID, nil
+}
+
+func errToFormErrors(err error) []formError {
+	fes := []formError{}
+	fe, ok := errToFormErrorMap[err]
+	if ok {
+		fes = append(fes, fe)
+	}
+	return fes
+}
+
+func getConnectorForUserByEmail(ur user.UserRepo, email string) (string, error) {
+	usr, err := ur.GetByEmail(nil, email)
+	if err != nil {
+		return "", err
+	}
+
+	rids, err := ur.GetRemoteIdentities(nil, usr.ID)
+	if err != nil {
+		return "", err
+	}
+
+	if len(rids) == 0 {
+		return "", fmt.Errorf("No remote Identities for user %v", usr.ID)
+	}
+
+	return rids[0].ConnectorID, nil
+}
+
+func newLoginURLFromSession(issuer url.URL, ses *session.Session, register bool, connectorFilter []string, msgCode string) *url.URL {
+	loginURL := issuer
+	v := loginURL.Query()
+	loginURL.Path = httpPathAuth
+	v.Set("redirect_uri", ses.RedirectURL.String())
+	v.Set("state", ses.ClientState)
+	v.Set("client_id", ses.ClientID)
+	if register {
+		v.Set("register", "1")
+	}
+	if len(connectorFilter) > 0 {
+		v.Set("show_connectors", strings.Join(connectorFilter, ","))
+	}
+	if msgCode != "" {
+		v.Set("msg_code", msgCode)
+	}
+
+	loginURL.RawQuery = v.Encode()
+	return &loginURL
+}
diff --git a/server/register_test.go b/server/register_test.go
new file mode 100644
index 00000000..3a1323dd
--- /dev/null
+++ b/server/register_test.go
@@ -0,0 +1,261 @@
+package server
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"strings"
+	"testing"
+
+	"github.com/kylelemons/godebug/pretty"
+
+	"github.com/coreos/dex/pkg/html"
+	"github.com/coreos/dex/user"
+	"github.com/coreos/go-oidc/oidc"
+)
+
+func TestHandleRegister(t *testing.T) {
+
+	str := func(s string) []string {
+		return []string{s}
+	}
+	tests := []struct {
+		// inputs
+		query               url.Values
+		connID              string
+		attachRemote        bool
+		remoteIdentityEmail string
+
+		// want
+		wantStatus      int
+		wantFormValues  url.Values
+		wantUserCreated bool
+	}{
+		{
+			// User comes in with a valid code, redirected from the connector,
+			// and is shown the form.
+			query: url.Values{
+				"code": []string{"code-2"},
+			},
+			connID: "local",
+
+			wantStatus: http.StatusOK,
+			wantFormValues: url.Values{
+				"code":     str("code-3"),
+				"email":    str(""),
+				"password": str(""),
+				"validate": str("1"),
+			},
+		},
+		{
+			// User comes in with a valid code, redirected from the connector,
+			// user is created with a verified email, because it's a trusted
+			// email provider.
+			query: url.Values{
+				"code": []string{"code-3"},
+			},
+			connID:              "oidc-trusted",
+			remoteIdentityEmail: "test@example.com",
+			attachRemote:        true,
+
+			wantStatus:      http.StatusSeeOther,
+			wantUserCreated: true,
+		},
+		{
+			// User comes in with a valid code, redirected from the connector,
+			// user is created with a verified email, because it's a trusted
+			// email provider. In addition, the email provided on the URL is
+			// ignored, and instead comes from the remote identity.
+			query: url.Values{
+				"code":  []string{"code-3"},
+				"email": []string{"sneaky@example.com"},
+			},
+			connID:              "oidc-trusted",
+			remoteIdentityEmail: "test@example.com",
+			attachRemote:        true,
+
+			wantStatus:      http.StatusSeeOther,
+			wantUserCreated: true,
+		},
+		{
+			// User comes in with a valid code, redirected from the connector,
+			// it's a trusted provider, but no email so no user created, and the
+			// form comes back with the code.
+			query: url.Values{
+				"code": []string{"code-3"},
+			},
+			connID:              "oidc-trusted",
+			remoteIdentityEmail: "",
+			attachRemote:        true,
+
+			wantStatus:      http.StatusOK,
+			wantUserCreated: false,
+			wantFormValues: url.Values{
+				"code":     str("code-4"),
+				"email":    str(""),
+				"validate": str("1"),
+			},
+		},
+		{
+			// User comes in with a valid code, redirected from the connector,
+			// it's a trusted provider, but the email is invalid, so no user
+			// created, and the form comes back with the code.
+			query: url.Values{
+				"code": []string{"code-3"},
+			},
+			connID:              "oidc-trusted",
+			remoteIdentityEmail: "notanemail",
+			attachRemote:        true,
+
+			wantStatus:      http.StatusOK,
+			wantUserCreated: false,
+			wantFormValues: url.Values{
+				"code":     str("code-4"),
+				"email":    str(""),
+				"validate": str("1"),
+			},
+		},
+		{
+			// User comes in with a valid code, having submitted the form, but
+			// has a invalid email.
+			query: url.Values{
+				"code":     []string{"code-2"},
+				"validate": []string{"1"},
+				"email":    str(""),
+				"password": str("password"),
+			},
+			connID:     "local",
+			wantStatus: http.StatusBadRequest,
+			wantFormValues: url.Values{
+				"code":     str("code-3"),
+				"email":    str(""),
+				"password": str("password"),
+				"validate": str("1"),
+			},
+		},
+		{
+			// User comes in with a valid code, having submitted the form. A new
+			// user is created.
+			query: url.Values{
+				"code":     []string{"code-2"},
+				"validate": []string{"1"},
+				"email":    str("test@example.com"),
+				"password": str("password"),
+			},
+			connID:          "local",
+			wantStatus:      http.StatusSeeOther,
+			wantUserCreated: true,
+		},
+		{
+			// User comes in with a valid code, having submitted the form, but
+			// there's no password.
+			query: url.Values{
+				"code":     []string{"code-2"},
+				"validate": []string{"1"},
+				"email":    str("test@example.com"),
+			},
+			connID:          "local",
+			wantStatus:      http.StatusBadRequest,
+			wantUserCreated: false,
+			wantFormValues: url.Values{
+				"code":     str("code-3"),
+				"email":    str("test@example.com"),
+				"password": str(""),
+				"validate": str("1"),
+			},
+		},
+		{
+			// User comes in with a valid code, having submitted the form, but
+			// there's no password, but they don't need one because connector ID
+			// is oidc.
+			query: url.Values{
+				"code":     []string{"code-3"},
+				"validate": []string{"1"},
+				"email":    str("test@example.com"),
+			},
+			connID:          "oidc",
+			attachRemote:    true,
+			wantStatus:      http.StatusSeeOther,
+			wantUserCreated: true,
+		},
+		{
+			// Same as before, but missing a code.
+			query: url.Values{
+				"validate": []string{"1"},
+				"email":    str("test@example.com"),
+			},
+			connID:          "oidc",
+			attachRemote:    true,
+			wantStatus:      http.StatusUnauthorized,
+			wantUserCreated: false,
+		},
+	}
+
+	for i, tt := range tests {
+		f, err := makeTestFixtures()
+		if err != nil {
+			t.Fatalf("case %d: could not make test fixtures: %v", i, err)
+		}
+
+		key, err := f.srv.NewSession(tt.connID, "XXX", "", f.redirectURL, "", true)
+		t.Logf("case %d: key for NewSession: %v", i, key)
+
+		if tt.attachRemote {
+			sesID, err := f.sessionManager.ExchangeKey(key)
+			if err != nil {
+				t.Fatalf("case %d: expected non-nil error: %v", i, err)
+			}
+			ses, err := f.sessionManager.Get(sesID)
+			if err != nil {
+				t.Fatalf("case %d: expected non-nil error: %v", i, err)
+			}
+
+			_, err = f.sessionManager.AttachRemoteIdentity(ses.ID, oidc.Identity{
+				ID:    "remoteID",
+				Email: tt.remoteIdentityEmail,
+			})
+
+			key, err := f.sessionManager.NewSessionKey(sesID)
+			if err != nil {
+				t.Fatalf("case %d: expected non-nil error: %v", i, err)
+			}
+			t.Logf("case %d: key for NewSession: %v", i, key)
+
+		}
+
+		hdlr := handleRegisterFunc(f.srv)
+
+		w := httptest.NewRecorder()
+		u := "http://server.example.com"
+		req, err := http.NewRequest("POST", u, strings.NewReader(tt.query.Encode()))
+		req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+
+		if err != nil {
+			t.Errorf("case %d: unable to form HTTP request: %v", i, err)
+		}
+
+		hdlr.ServeHTTP(w, req)
+		if tt.wantStatus != w.Code {
+			t.Errorf("case %d: wantStatus=%v, got=%v", i, tt.wantStatus, w.Code)
+		}
+
+		_, err = f.userRepo.GetByEmail(nil, "test@example.com")
+		if tt.wantUserCreated {
+			if err != nil {
+				t.Errorf("case %d: user not created: %v", i, err)
+			}
+		} else if err != user.ErrorNotFound {
+			t.Errorf("case %d: unexpected error looking up user: want=%v, got=%v ", i, user.ErrorNotFound, err)
+		}
+
+		values, err := html.FormValues("#registerForm", w.Body)
+		if err != nil {
+			t.Errorf("case %d: could not parse form: %v", i, err)
+		}
+
+		if diff := pretty.Compare(tt.wantFormValues, values); diff != "" {
+			t.Errorf("case %d: Compare(want, got) = %v", i, diff)
+		}
+
+	}
+}
diff --git a/server/serialization.go b/server/serialization.go
new file mode 100644
index 00000000..3eab41db
--- /dev/null
+++ b/server/serialization.go
@@ -0,0 +1,24 @@
+package server
+
+import (
+	"encoding/json"
+	"net/http"
+
+	"github.com/coreos/dex/pkg/log"
+)
+
+// writeResponseWithBody attempts to marshal an arbitrary thing to JSON then write
+// it to the http.ResponseWriter
+func writeResponseWithBody(w http.ResponseWriter, code int, resp interface{}) {
+	enc, err := json.Marshal(resp)
+	if err != nil {
+		log.Errorf("Failed JSON-encoding HTTP response: %v", err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+	w.Header().Set("Content-Type", "application/json")
+	w.WriteHeader(code)
+	if _, err = w.Write(enc); err != nil {
+		log.Errorf("Failed writing HTTP response: %v", err)
+	}
+}
diff --git a/server/serialization_test.go b/server/serialization_test.go
new file mode 100644
index 00000000..b1d5cd32
--- /dev/null
+++ b/server/serialization_test.go
@@ -0,0 +1,48 @@
+package server
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"testing"
+)
+
+func TestWriteResponseWithBody(t *testing.T) {
+	type Foo struct {
+		Bar string `json:"bar"`
+	}
+
+	tests := []struct {
+		code     int
+		obj      interface{}
+		wantCode int
+		wantBody string
+	}{
+		// unserializable
+		{
+			code:     http.StatusTeapot,
+			obj:      make(chan bool),
+			wantCode: http.StatusInternalServerError,
+		},
+		// serializable
+		{
+			code:     http.StatusTeapot,
+			obj:      Foo{"asdf"},
+			wantCode: http.StatusTeapot,
+			wantBody: `{"bar":"asdf"}`,
+		},
+	}
+
+	for i, tt := range tests {
+		w := httptest.NewRecorder()
+		writeResponseWithBody(w, tt.code, tt.obj)
+
+		if tt.wantCode != w.Code {
+			t.Fatalf("case %d: incorrect status code: want=%d got=%d", i, tt.wantCode, w.Code)
+		}
+
+		body := w.Body.String()
+		if tt.wantBody != body {
+			t.Fatalf("case %d: incorrect body: want=%s got=%s", i, tt.wantBody, body)
+		}
+	}
+}
diff --git a/server/server.go b/server/server.go
new file mode 100644
index 00000000..790b9ef7
--- /dev/null
+++ b/server/server.go
@@ -0,0 +1,526 @@
+package server
+
+import (
+	"errors"
+	"fmt"
+	"html/template"
+	"net/http"
+	"net/url"
+	"path"
+	"sort"
+	"time"
+
+	"github.com/coreos/go-oidc/jose"
+	"github.com/coreos/go-oidc/key"
+	"github.com/coreos/go-oidc/oauth2"
+	"github.com/coreos/go-oidc/oidc"
+	"github.com/coreos/pkg/health"
+	"github.com/jonboulle/clockwork"
+
+	"github.com/coreos/dex/client"
+	"github.com/coreos/dex/connector"
+	"github.com/coreos/dex/pkg/log"
+	"github.com/coreos/dex/refresh"
+	"github.com/coreos/dex/session"
+	"github.com/coreos/dex/user"
+	usersapi "github.com/coreos/dex/user/api"
+	useremail "github.com/coreos/dex/user/email"
+)
+
+const (
+	LoginPageTemplateName              = "login.html"
+	RegisterTemplateName               = "register.html"
+	VerifyEmailTemplateName            = "verify-email.html"
+	SendResetPasswordEmailTemplateName = "send-reset-password.html"
+	ResetPasswordTemplateName          = "reset-password.html"
+
+	APIVersion = "v1"
+)
+
+type OIDCServer interface {
+	ClientMetadata(string) (*oidc.ClientMetadata, error)
+	NewSession(connectorID, clientID, clientState string, redirectURL url.URL, nonce string, register bool) (string, error)
+	Login(oidc.Identity, string) (string, error)
+	// CodeToken exchanges a code for an ID token and a refresh token string on success.
+	CodeToken(creds oidc.ClientCredentials, sessionKey string) (*jose.JWT, string, error)
+	ClientCredsToken(creds oidc.ClientCredentials) (*jose.JWT, error)
+	// RefreshToken takes a previously generated refresh token and returns a new ID token
+	// if the token is valid.
+	RefreshToken(creds oidc.ClientCredentials, token string) (*jose.JWT, error)
+	KillSession(string) error
+}
+
+type JWTVerifierFactory func(clientID string) oidc.JWTVerifier
+
+type Server struct {
+	IssuerURL                      url.URL
+	KeyManager                     key.PrivateKeyManager
+	KeySetRepo                     key.PrivateKeySetRepo
+	SessionManager                 *session.SessionManager
+	ClientIdentityRepo             client.ClientIdentityRepo
+	ConnectorConfigRepo            connector.ConnectorConfigRepo
+	Templates                      *template.Template
+	LoginTemplate                  *template.Template
+	RegisterTemplate               *template.Template
+	VerifyEmailTemplate            *template.Template
+	SendResetPasswordEmailTemplate *template.Template
+	ResetPasswordTemplate          *template.Template
+	HealthChecks                   []health.Checkable
+	Connectors                     []connector.Connector
+	UserRepo                       user.UserRepo
+	UserManager                    *user.Manager
+	PasswordInfoRepo               user.PasswordInfoRepo
+	RefreshTokenRepo               refresh.RefreshTokenRepo
+	UserEmailer                    *useremail.UserEmailer
+
+	localConnectorID string
+}
+
+func (s *Server) Run() chan struct{} {
+	stop := make(chan struct{})
+
+	chans := []chan struct{}{
+		key.NewKeySetSyncer(s.KeySetRepo, s.KeyManager).Run(),
+	}
+
+	for _, idpc := range s.Connectors {
+		chans = append(chans, idpc.Sync())
+	}
+
+	go func() {
+		<-stop
+		for _, ch := range chans {
+			close(ch)
+		}
+	}()
+
+	return stop
+}
+
+func (s *Server) KillSession(sessionKey string) error {
+	sessionID, err := s.SessionManager.ExchangeKey(sessionKey)
+
+	if err != nil {
+		return err
+	}
+
+	_, err = s.SessionManager.Kill(sessionID)
+	return err
+}
+
+func (s *Server) ProviderConfig() oidc.ProviderConfig {
+	iss := s.IssuerURL.String()
+	cfg := oidc.ProviderConfig{
+		Issuer: iss,
+
+		AuthEndpoint:  iss + httpPathAuth,
+		TokenEndpoint: iss + httpPathToken,
+		KeysEndpoint:  iss + httpPathKeys,
+
+		GrantTypesSupported:               []string{oauth2.GrantTypeAuthCode, oauth2.GrantTypeClientCreds},
+		ResponseTypesSupported:            []string{"code"},
+		SubjectTypesSupported:             []string{"public"},
+		IDTokenAlgValuesSupported:         []string{"RS256"},
+		TokenEndpointAuthMethodsSupported: []string{"client_secret_basic"},
+	}
+
+	return cfg
+}
+
+func (s *Server) absURL(paths ...string) url.URL {
+	url := s.IssuerURL
+	paths = append([]string{url.Path}, paths...)
+	url.Path = path.Join(paths...)
+	return url
+}
+
+func (s *Server) AddConnector(cfg connector.ConnectorConfig) error {
+	connectorID := cfg.ConnectorID()
+	ns := s.IssuerURL
+	ns.Path = path.Join(ns.Path, httpPathAuth, connectorID)
+
+	idpc, err := cfg.Connector(ns, s.Login, s.Templates)
+	if err != nil {
+		return err
+	}
+
+	s.Connectors = append(s.Connectors, idpc)
+
+	sortable := sortableIDPCs(s.Connectors)
+	sort.Sort(sortable)
+
+	// We handle the LocalConnector specially because it needs access to the
+	// UserRepo and the PasswordInfoRepo; if it turns out that other connectors
+	// need access to these resources we'll figure out how to provide it in a
+	// cleaner manner.
+	localConn, ok := idpc.(*connector.LocalConnector)
+	if ok {
+		s.localConnectorID = connectorID
+		if s.UserRepo == nil {
+			return errors.New("UserRepo cannot be nil")
+		}
+
+		if s.PasswordInfoRepo == nil {
+			return errors.New("PasswordInfoRepo cannot be nil")
+		}
+
+		localConn.SetLocalIdentityProvider(&connector.LocalIdentityProvider{
+			UserRepo:         s.UserRepo,
+			PasswordInfoRepo: s.PasswordInfoRepo,
+		})
+
+		localCfg, ok := cfg.(*connector.LocalConnectorConfig)
+		if !ok {
+			return errors.New("config for LocalConnector not a LocalConnectorConfig?")
+		}
+
+		if len(localCfg.PasswordInfos) > 0 {
+			err := user.LoadPasswordInfos(s.PasswordInfoRepo,
+				localCfg.PasswordInfos)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	log.Infof("Loaded IdP connector: id=%s type=%s", connectorID, cfg.ConnectorType())
+	return nil
+}
+
+func (s *Server) HTTPHandler() http.Handler {
+	checks := make([]health.Checkable, len(s.HealthChecks))
+	copy(checks, s.HealthChecks)
+	for _, idpc := range s.Connectors {
+		idpc := idpc
+		checks = append(checks, idpc)
+	}
+
+	clock := clockwork.NewRealClock()
+	mux := http.NewServeMux()
+	mux.HandleFunc(httpPathDiscovery, handleDiscoveryFunc(s.ProviderConfig()))
+	mux.HandleFunc(httpPathAuth, handleAuthFunc(s, s.Connectors, s.LoginTemplate))
+	mux.HandleFunc(httpPathToken, handleTokenFunc(s))
+	mux.HandleFunc(httpPathKeys, handleKeysFunc(s.KeyManager, clock))
+	mux.Handle(httpPathHealth, makeHealthHandler(checks))
+	mux.HandleFunc(httpPathRegister, handleRegisterFunc(s))
+	mux.HandleFunc(httpPathEmailVerify, handleEmailVerifyFunc(s.VerifyEmailTemplate,
+		s.IssuerURL, s.KeyManager.PublicKeys, s.UserManager))
+
+	mux.Handle(httpPathVerifyEmailResend, s.NewClientTokenAuthHandler(handleVerifyEmailResendFunc(s.IssuerURL,
+		s.KeyManager.PublicKeys,
+		s.UserEmailer,
+		s.UserRepo,
+		s.ClientIdentityRepo)))
+
+	mux.Handle(httpPathSendResetPassword, &SendResetPasswordEmailHandler{
+		tpl:     s.SendResetPasswordEmailTemplate,
+		emailer: s.UserEmailer,
+		sm:      s.SessionManager,
+		cr:      s.ClientIdentityRepo,
+	})
+
+	mux.Handle(httpPathResetPassword, &ResetPasswordHandler{
+		tpl:       s.ResetPasswordTemplate,
+		issuerURL: s.IssuerURL,
+		um:        s.UserManager,
+		keysFunc:  s.KeyManager.PublicKeys,
+	})
+
+	mux.HandleFunc(httpPathDebugVars, health.ExpvarHandler)
+
+	pcfg := s.ProviderConfig()
+	for _, idpc := range s.Connectors {
+		errorURL, err := url.Parse(fmt.Sprintf("%s?connector_id=%s", pcfg.AuthEndpoint, idpc.ID()))
+		if err != nil {
+			log.Fatal(err)
+		}
+		idpc.Register(mux, *errorURL)
+	}
+
+	apiBasePath := path.Join(httpPathAPI, APIVersion)
+	registerDiscoveryResource(apiBasePath, mux)
+
+	clientPath, clientHandler := registerClientResource(apiBasePath, s.ClientIdentityRepo)
+	mux.Handle(path.Join(apiBasePath, clientPath), s.NewClientTokenAuthHandler(clientHandler))
+
+	usersAPI := usersapi.NewUsersAPI(s.UserManager, s.ClientIdentityRepo, s.UserEmailer, s.localConnectorID)
+	mux.Handle(path.Join(apiBasePath, UsersSubTree)+"/", NewUserMgmtServer(usersAPI, s.JWTVerifierFactory(), s.UserManager, s.ClientIdentityRepo).HTTPHandler())
+
+	return http.Handler(mux)
+}
+
+// NewClientTokenAuthHandler returns the given handler wrapped in middleware which requires a Client Bearer token.
+func (s *Server) NewClientTokenAuthHandler(handler http.Handler) http.Handler {
+	return &clientTokenMiddleware{
+		issuerURL: s.IssuerURL.String(),
+		ciRepo:    s.ClientIdentityRepo,
+		keysFunc:  s.KeyManager.PublicKeys,
+		next:      handler,
+	}
+}
+
+func (s *Server) ClientMetadata(clientID string) (*oidc.ClientMetadata, error) {
+	return s.ClientIdentityRepo.Metadata(clientID)
+}
+
+func (s *Server) NewSession(ipdcID, clientID, clientState string, redirectURL url.URL, nonce string, register bool) (string, error) {
+	sessionID, err := s.SessionManager.NewSession(ipdcID, clientID, clientState, redirectURL, nonce, register)
+	if err != nil {
+		return "", err
+	}
+
+	log.Infof("Session %s created: clientID=%s clientState=%s", sessionID, clientID, clientState)
+	return s.SessionManager.NewSessionKey(sessionID)
+}
+
+func (s *Server) Login(ident oidc.Identity, key string) (string, error) {
+	sessionID, err := s.SessionManager.ExchangeKey(key)
+	if err != nil {
+		return "", err
+	}
+
+	ses, err := s.SessionManager.AttachRemoteIdentity(sessionID, ident)
+	if err != nil {
+		return "", err
+	}
+	log.Infof("Session %s remote identity attached: clientID=%s identity=%#v", sessionID, ses.ClientID, ident)
+
+	if ses.Register {
+		code, err := s.SessionManager.NewSessionKey(sessionID)
+		if err != nil {
+			return "", err
+		}
+
+		ru := s.absURL(httpPathRegister)
+		q := ru.Query()
+		q.Set("code", code)
+		q.Set("state", ses.ClientState)
+		ru.RawQuery = q.Encode()
+		return ru.String(), nil
+	}
+
+	usr, err := s.UserRepo.GetByRemoteIdentity(nil, user.RemoteIdentity{
+		ConnectorID: ses.ConnectorID,
+		ID:          ses.Identity.ID,
+	})
+	if err != nil {
+		if err == user.ErrorNotFound {
+			// If has authenticated via a connector, but no local identity there
+			// are a couple of possibilities:
+
+			// * Maybe they are using the wrong connector:
+			if ses.Identity.Email != "" {
+				if connID, err := getConnectorForUserByEmail(s.UserRepo,
+					ses.Identity.Email); err == nil {
+
+					return newLoginURLFromSession(s.IssuerURL,
+						ses, true, []string{connID},
+						"wrong-connector").String(), nil
+				}
+			}
+
+			// * User needs to register
+			return newLoginURLFromSession(s.IssuerURL,
+				ses, true, []string{ses.ConnectorID}, "register-maybe").String(), nil
+		}
+		return "", err
+	}
+
+	ses, err = s.SessionManager.AttachUser(sessionID, usr.ID)
+	if err != nil {
+		return "", err
+	}
+	log.Infof("Session %s user identified: clientID=%s user=%#v", sessionID, ses.ClientID, usr)
+
+	code, err := s.SessionManager.NewSessionKey(sessionID)
+	if err != nil {
+		return "", err
+	}
+
+	ru := ses.RedirectURL
+	q := ru.Query()
+	q.Set("code", code)
+	q.Set("state", ses.ClientState)
+	ru.RawQuery = q.Encode()
+
+	return ru.String(), nil
+}
+
+func (s *Server) ClientCredsToken(creds oidc.ClientCredentials) (*jose.JWT, error) {
+	ok, err := s.ClientIdentityRepo.Authenticate(creds)
+	if err != nil {
+		log.Errorf("Failed fetching client %s from repo: %v", creds.ID, err)
+		return nil, oauth2.NewError(oauth2.ErrorServerError)
+	} else if !ok {
+		return nil, oauth2.NewError(oauth2.ErrorInvalidClient)
+	}
+
+	signer, err := s.KeyManager.Signer()
+	if err != nil {
+		log.Errorf("Failed to generate ID token: %v", err)
+		return nil, oauth2.NewError(oauth2.ErrorServerError)
+	}
+
+	now := time.Now()
+	exp := now.Add(s.SessionManager.ValidityWindow)
+	claims := oidc.NewClaims(s.IssuerURL.String(), creds.ID, creds.ID, now, exp)
+	claims.Add("name", creds.ID)
+
+	jwt, err := jose.NewSignedJWT(claims, signer)
+	if err != nil {
+		log.Errorf("Failed to generate ID token: %v", err)
+		return nil, oauth2.NewError(oauth2.ErrorServerError)
+	}
+
+	log.Infof("Client token sent: clientID=%s", creds.ID)
+
+	return jwt, nil
+}
+
+func (s *Server) CodeToken(creds oidc.ClientCredentials, sessionKey string) (*jose.JWT, string, error) {
+	ok, err := s.ClientIdentityRepo.Authenticate(creds)
+	if err != nil {
+		log.Errorf("Failed fetching client %s from repo: %v", creds.ID, err)
+		return nil, "", oauth2.NewError(oauth2.ErrorServerError)
+	} else if !ok {
+		log.Errorf("Failed to Authenticate client %s", creds.ID)
+		return nil, "", oauth2.NewError(oauth2.ErrorInvalidClient)
+	}
+
+	sessionID, err := s.SessionManager.ExchangeKey(sessionKey)
+	if err != nil {
+		return nil, "", oauth2.NewError(oauth2.ErrorInvalidGrant)
+	}
+
+	ses, err := s.SessionManager.Kill(sessionID)
+	if err != nil {
+		return nil, "", oauth2.NewError(oauth2.ErrorInvalidRequest)
+	}
+
+	if ses.ClientID != creds.ID {
+		return nil, "", oauth2.NewError(oauth2.ErrorInvalidGrant)
+	}
+
+	signer, err := s.KeyManager.Signer()
+	if err != nil {
+		log.Errorf("Failed to generate ID token: %v", err)
+		return nil, "", oauth2.NewError(oauth2.ErrorServerError)
+	}
+
+	user, err := s.UserRepo.Get(nil, ses.UserID)
+	if err != nil {
+		log.Errorf("Failed to fetch user %q from repo: %v: ", ses.UserID, err)
+		return nil, "", oauth2.NewError(oauth2.ErrorServerError)
+	}
+
+	claims := ses.Claims(s.IssuerURL.String())
+	user.AddToClaims(claims)
+
+	jwt, err := jose.NewSignedJWT(claims, signer)
+	if err != nil {
+		log.Errorf("Failed to generate ID token: %v", err)
+		return nil, "", oauth2.NewError(oauth2.ErrorServerError)
+	}
+
+	log.Infof("Session %s token sent: clientID=%s", sessionID, creds.ID)
+
+	// Generate refresh token.
+	//
+	// TODO(yifan): Return refresh token only when 'access_type == offline',
+	// or 'scope' == 'offline_access'.
+	refreshToken, err := s.RefreshTokenRepo.Create(ses.UserID, creds.ID)
+	switch err {
+	case nil:
+		break
+	default:
+		log.Errorf("Failed to generate refresh token: %v", err)
+		return nil, "", oauth2.NewError(oauth2.ErrorServerError)
+	}
+	return jwt, refreshToken, nil
+}
+
+func (s *Server) RefreshToken(creds oidc.ClientCredentials, token string) (*jose.JWT, error) {
+	ok, err := s.ClientIdentityRepo.Authenticate(creds)
+	if err != nil {
+		log.Errorf("Failed fetching client %s from repo: %v", creds.ID, err)
+		return nil, oauth2.NewError(oauth2.ErrorServerError)
+	} else if !ok {
+		log.Errorf("Failed to Authenticate client %s", creds.ID)
+		return nil, oauth2.NewError(oauth2.ErrorInvalidClient)
+	}
+
+	userID, err := s.RefreshTokenRepo.Verify(creds.ID, token)
+	switch err {
+	case nil:
+		break
+	case refresh.ErrorInvalidToken:
+		return nil, oauth2.NewError(oauth2.ErrorInvalidRequest)
+	case refresh.ErrorInvalidClientID:
+		return nil, oauth2.NewError(oauth2.ErrorInvalidClient)
+	default:
+		return nil, oauth2.NewError(oauth2.ErrorServerError)
+	}
+
+	user, err := s.UserRepo.Get(nil, userID)
+	if err != nil {
+		// The error can be user.ErrorNotFound, but we are not deleting
+		// user at this moment, so this shouldn't happen.
+		log.Errorf("Failed to fetch user %q from repo: %v: ", userID, err)
+		return nil, oauth2.NewError(oauth2.ErrorServerError)
+	}
+
+	signer, err := s.KeyManager.Signer()
+	if err != nil {
+		log.Errorf("Failed to refresh ID token: %v", err)
+		return nil, oauth2.NewError(oauth2.ErrorServerError)
+	}
+
+	now := time.Now()
+	expireAt := now.Add(session.DefaultSessionValidityWindow)
+
+	claims := oidc.NewClaims(s.IssuerURL.String(), user.ID, creds.ID, now, expireAt)
+	user.AddToClaims(claims)
+
+	jwt, err := jose.NewSignedJWT(claims, signer)
+	if err != nil {
+		log.Errorf("Failed to generate ID token: %v", err)
+		return nil, oauth2.NewError(oauth2.ErrorServerError)
+	}
+
+	log.Infof("Token refreshed sent: clientID=%s", creds.ID)
+
+	return jwt, nil
+}
+
+func (s *Server) JWTVerifierFactory() JWTVerifierFactory {
+	noop := func() error { return nil }
+
+	keyFunc := func() []key.PublicKey {
+		keys, err := s.KeyManager.PublicKeys()
+		if err != nil {
+			log.Errorf("error getting public keys from manager: %v", err)
+			return []key.PublicKey{}
+		}
+		return keys
+	}
+	return func(clientID string) oidc.JWTVerifier {
+
+		return oidc.NewJWTVerifier(s.IssuerURL.String(), clientID, noop, keyFunc)
+	}
+}
+
+type sortableIDPCs []connector.Connector
+
+func (s sortableIDPCs) Len() int {
+	return len([]connector.Connector(s))
+}
+
+func (s sortableIDPCs) Less(i, j int) bool {
+	idpcs := []connector.Connector(s)
+	return idpcs[i].ID() < idpcs[j].ID()
+}
+
+func (s sortableIDPCs) Swap(i, j int) {
+	idpcs := []connector.Connector(s)
+	idpcs[i], idpcs[j] = idpcs[j], idpcs[i]
+}
diff --git a/server/server_test.go b/server/server_test.go
new file mode 100644
index 00000000..603d66d1
--- /dev/null
+++ b/server/server_test.go
@@ -0,0 +1,687 @@
+package server
+
+import (
+	"errors"
+	"net/url"
+	"reflect"
+	"testing"
+	"time"
+
+	"github.com/coreos/dex/client"
+	"github.com/coreos/dex/refresh/refreshtest"
+	"github.com/coreos/dex/session"
+	"github.com/coreos/dex/user"
+	"github.com/coreos/go-oidc/jose"
+	"github.com/coreos/go-oidc/key"
+	"github.com/coreos/go-oidc/oauth2"
+	"github.com/coreos/go-oidc/oidc"
+)
+
+type StaticKeyManager struct {
+	key.PrivateKeyManager
+	expiresAt time.Time
+	signer    jose.Signer
+	keys      []jose.JWK
+}
+
+func (m *StaticKeyManager) ExpiresAt() time.Time {
+	return m.expiresAt
+}
+
+func (m *StaticKeyManager) Signer() (jose.Signer, error) {
+	return m.signer, nil
+}
+
+func (m *StaticKeyManager) JWKs() ([]jose.JWK, error) {
+	return m.keys, nil
+}
+
+type StaticSigner struct {
+	sig []byte
+	err error
+}
+
+func (ss *StaticSigner) ID() string {
+	return "static"
+}
+
+func (ss *StaticSigner) Alg() string {
+	return "static"
+}
+
+func (ss *StaticSigner) Verify(sig, data []byte) error {
+	if !reflect.DeepEqual(ss.sig, sig) {
+		return errors.New("signature mismatch")
+	}
+
+	return nil
+}
+
+func (ss *StaticSigner) Sign(data []byte) ([]byte, error) {
+	return ss.sig, ss.err
+}
+
+func (ss *StaticSigner) JWK() jose.JWK {
+	return jose.JWK{}
+}
+
+func staticGenerateCodeFunc(code string) session.GenerateCodeFunc {
+	return func() (string, error) {
+		return code, nil
+	}
+}
+
+func makeNewUserRepo() (user.UserRepo, error) {
+	userRepo := user.NewUserRepo()
+
+	id := "testid-1"
+	err := userRepo.Create(nil, user.User{
+		ID:    id,
+		Email: "testname@example.com",
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	err = userRepo.AddRemoteIdentity(nil, id, user.RemoteIdentity{
+		ConnectorID: "test_connector_id",
+		ID:          "YYY",
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	return userRepo, nil
+}
+
+func TestServerProviderConfig(t *testing.T) {
+	srv := &Server{IssuerURL: url.URL{Scheme: "http", Host: "server.example.com"}}
+
+	want := oidc.ProviderConfig{
+		Issuer:                            "http://server.example.com",
+		AuthEndpoint:                      "http://server.example.com/auth",
+		TokenEndpoint:                     "http://server.example.com/token",
+		KeysEndpoint:                      "http://server.example.com/keys",
+		GrantTypesSupported:               []string{oauth2.GrantTypeAuthCode, oauth2.GrantTypeClientCreds},
+		ResponseTypesSupported:            []string{"code"},
+		SubjectTypesSupported:             []string{"public"},
+		IDTokenAlgValuesSupported:         []string{"RS256"},
+		TokenEndpointAuthMethodsSupported: []string{"client_secret_basic"},
+	}
+	got := srv.ProviderConfig()
+
+	if !reflect.DeepEqual(want, got) {
+		t.Fatalf("want=%#v, got=%#v", want, got)
+	}
+}
+
+func TestServerNewSession(t *testing.T) {
+	sm := session.NewSessionManager(session.NewSessionRepo(), session.NewSessionKeyRepo())
+	srv := &Server{
+		SessionManager: sm,
+	}
+
+	state := "pants"
+	nonce := "oncenay"
+	ci := oidc.ClientIdentity{
+		Credentials: oidc.ClientCredentials{
+			ID:     "XXX",
+			Secret: "secrete",
+		},
+		Metadata: oidc.ClientMetadata{
+			RedirectURLs: []url.URL{
+				url.URL{
+					Scheme: "http",
+					Host:   "client.example.com",
+					Path:   "/callback",
+				},
+			},
+		},
+	}
+
+	key, err := srv.NewSession("bogus_idpc", ci.Credentials.ID, state, ci.Metadata.RedirectURLs[0], nonce, false)
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	sessionID, err := sm.ExchangeKey(key)
+	if err != nil {
+		t.Fatalf("Session not retreivable: %v", err)
+	}
+
+	ses, err := sm.AttachRemoteIdentity(sessionID, oidc.Identity{})
+	if err != nil {
+		t.Fatalf("Unable to add Identity to Session: %v", err)
+	}
+
+	if !reflect.DeepEqual(ci.Metadata.RedirectURLs[0], ses.RedirectURL) {
+		t.Fatalf("Session created with incorrect RedirectURL: want=%#v got=%#v", ci.Metadata.RedirectURLs[0], ses.RedirectURL)
+	}
+
+	if ci.Credentials.ID != ses.ClientID {
+		t.Fatalf("Session created with incorrect ClientID: want=%q got=%q", ci.Credentials.ID, ses.ClientID)
+	}
+
+	if state != ses.ClientState {
+		t.Fatalf("Session created with incorrect State: want=%q got=%q", state, ses.ClientState)
+	}
+
+	if nonce != ses.Nonce {
+		t.Fatalf("Session created with incorrect Nonce: want=%q got=%q", nonce, ses.Nonce)
+	}
+}
+
+func TestServerLogin(t *testing.T) {
+	ci := oidc.ClientIdentity{
+		Credentials: oidc.ClientCredentials{
+			ID:     "XXX",
+			Secret: "secrete",
+		},
+		Metadata: oidc.ClientMetadata{
+			RedirectURLs: []url.URL{
+				url.URL{
+					Scheme: "http",
+					Host:   "client.example.com",
+					Path:   "/callback",
+				},
+			},
+		},
+	}
+	ciRepo := client.NewClientIdentityRepo([]oidc.ClientIdentity{ci})
+
+	km := &StaticKeyManager{
+		signer: &StaticSigner{sig: []byte("beer"), err: nil},
+	}
+
+	sm := session.NewSessionManager(session.NewSessionRepo(), session.NewSessionKeyRepo())
+	sm.GenerateCode = staticGenerateCodeFunc("fakecode")
+	sessionID, err := sm.NewSession("test_connector_id", ci.Credentials.ID, "bogus", ci.Metadata.RedirectURLs[0], "", false)
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	userRepo, err := makeNewUserRepo()
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	srv := &Server{
+		IssuerURL:          url.URL{Scheme: "http", Host: "server.example.com"},
+		KeyManager:         km,
+		SessionManager:     sm,
+		ClientIdentityRepo: ciRepo,
+		UserRepo:           userRepo,
+	}
+
+	ident := oidc.Identity{ID: "YYY", Name: "elroy", Email: "elroy@example.com"}
+	key, err := sm.NewSessionKey(sessionID)
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	redirectURL, err := srv.Login(ident, key)
+	if err != nil {
+		t.Fatalf("Unexpected err from Server.Login: %v", err)
+	}
+
+	wantRedirectURL := "http://client.example.com/callback?code=fakecode&state=bogus"
+	if wantRedirectURL != redirectURL {
+		t.Fatalf("Unexpected redirectURL: want=%q, got=%q", wantRedirectURL, redirectURL)
+	}
+}
+
+func TestServerLoginUnrecognizedSessionKey(t *testing.T) {
+	ciRepo := client.NewClientIdentityRepo([]oidc.ClientIdentity{
+		oidc.ClientIdentity{
+			Credentials: oidc.ClientCredentials{
+				ID: "XXX", Secret: "secrete",
+			},
+		},
+	})
+	km := &StaticKeyManager{
+		signer: &StaticSigner{sig: nil, err: errors.New("fail")},
+	}
+	sm := session.NewSessionManager(session.NewSessionRepo(), session.NewSessionKeyRepo())
+	srv := &Server{
+		IssuerURL:          url.URL{Scheme: "http", Host: "server.example.com"},
+		KeyManager:         km,
+		SessionManager:     sm,
+		ClientIdentityRepo: ciRepo,
+	}
+
+	ident := oidc.Identity{ID: "YYY", Name: "elroy", Email: "elroy@example.com"}
+	code, err := srv.Login(ident, "XXX")
+	if err == nil {
+		t.Fatalf("Expected non-nil error")
+	}
+
+	if code != "" {
+		t.Fatalf("Expected empty code, got=%s", code)
+	}
+}
+
+func TestServerCodeToken(t *testing.T) {
+	ci := oidc.ClientIdentity{
+		Credentials: oidc.ClientCredentials{
+			ID:     "XXX",
+			Secret: "secrete",
+		},
+	}
+	ciRepo := client.NewClientIdentityRepo([]oidc.ClientIdentity{ci})
+	km := &StaticKeyManager{
+		signer: &StaticSigner{sig: []byte("beer"), err: nil},
+	}
+	sm := session.NewSessionManager(session.NewSessionRepo(), session.NewSessionKeyRepo())
+
+	userRepo, err := makeNewUserRepo()
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	refreshTokenRepo, err := refreshtest.NewTestRefreshTokenRepo()
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	srv := &Server{
+		IssuerURL:          url.URL{Scheme: "http", Host: "server.example.com"},
+		KeyManager:         km,
+		SessionManager:     sm,
+		ClientIdentityRepo: ciRepo,
+		UserRepo:           userRepo,
+		RefreshTokenRepo:   refreshTokenRepo,
+	}
+
+	sessionID, err := sm.NewSession("bogus_idpc", ci.Credentials.ID, "bogus", url.URL{}, "", false)
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+	_, err = sm.AttachRemoteIdentity(sessionID, oidc.Identity{})
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	_, err = sm.AttachUser(sessionID, "testid-1")
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	key, err := sm.NewSessionKey(sessionID)
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	jwt, token, err := srv.CodeToken(ci.Credentials, key)
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+	if jwt == nil {
+		t.Fatalf("Expected non-nil jwt")
+	}
+	if token == "" {
+		t.Fatalf("Expected non-empty refresh token")
+	}
+}
+
+func TestServerTokenUnrecognizedKey(t *testing.T) {
+	ci := oidc.ClientIdentity{
+		Credentials: oidc.ClientCredentials{
+			ID:     "XXX",
+			Secret: "secrete",
+		},
+	}
+	ciRepo := client.NewClientIdentityRepo([]oidc.ClientIdentity{ci})
+	km := &StaticKeyManager{
+		signer: &StaticSigner{sig: []byte("beer"), err: nil},
+	}
+	sm := session.NewSessionManager(session.NewSessionRepo(), session.NewSessionKeyRepo())
+
+	srv := &Server{
+		IssuerURL:          url.URL{Scheme: "http", Host: "server.example.com"},
+		KeyManager:         km,
+		SessionManager:     sm,
+		ClientIdentityRepo: ciRepo,
+	}
+
+	sessionID, err := sm.NewSession("connector_id", ci.Credentials.ID, "bogus", url.URL{}, "", false)
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	_, err = sm.AttachRemoteIdentity(sessionID, oidc.Identity{})
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	jwt, token, err := srv.CodeToken(ci.Credentials, "foo")
+	if err == nil {
+		t.Fatalf("Expected non-nil error")
+	}
+	if jwt != nil {
+		t.Fatalf("Expected nil jwt")
+	}
+	if token != "" {
+		t.Fatalf("Expected empty refresh token")
+	}
+}
+
+func TestServerTokenFail(t *testing.T) {
+	issuerURL := url.URL{Scheme: "http", Host: "server.example.com"}
+	keyFixture := "goodkey"
+	ccFixture := oidc.ClientCredentials{
+		ID:     "XXX",
+		Secret: "secrete",
+	}
+	signerFixture := &StaticSigner{sig: []byte("beer"), err: nil}
+
+	tests := []struct {
+		signer jose.Signer
+		argCC  oidc.ClientCredentials
+		argKey string
+		err    string
+	}{
+		// control test case to make sure fixtures check out
+		{
+			signer: signerFixture,
+			argCC:  ccFixture,
+			argKey: keyFixture,
+		},
+
+		// unrecognized key
+		{
+			signer: signerFixture,
+			argCC:  ccFixture,
+			argKey: "foo",
+			err:    oauth2.ErrorInvalidGrant,
+		},
+
+		// unrecognized client
+		{
+			signer: signerFixture,
+			argCC:  oidc.ClientCredentials{ID: "YYY"},
+			argKey: keyFixture,
+			err:    oauth2.ErrorInvalidClient,
+		},
+
+		// signing operation fails
+		{
+			signer: &StaticSigner{sig: nil, err: errors.New("fail")},
+			argCC:  ccFixture,
+			argKey: keyFixture,
+			err:    oauth2.ErrorServerError,
+		},
+	}
+
+	for i, tt := range tests {
+		sm := session.NewSessionManager(session.NewSessionRepo(), session.NewSessionKeyRepo())
+		sm.GenerateCode = func() (string, error) { return keyFixture, nil }
+
+		sessionID, err := sm.NewSession("connector_id", ccFixture.ID, "bogus", url.URL{}, "", false)
+		if err != nil {
+			t.Fatalf("Unexpected error: %v", err)
+		}
+
+		_, err = sm.AttachRemoteIdentity(sessionID, oidc.Identity{})
+		if err != nil {
+			t.Errorf("case %d: unexpected error: %v", i, err)
+			continue
+		}
+		km := &StaticKeyManager{
+			signer: tt.signer,
+		}
+		ciRepo := client.NewClientIdentityRepo([]oidc.ClientIdentity{
+			oidc.ClientIdentity{Credentials: ccFixture},
+		})
+
+		_, err = sm.AttachUser(sessionID, "testid-1")
+		if err != nil {
+			t.Fatalf("case %d: Unexpected error: %v", i, err)
+		}
+
+		userRepo, err := makeNewUserRepo()
+		if err != nil {
+			t.Fatalf("Unexpected error: %v", err)
+		}
+
+		refreshTokenRepo, err := refreshtest.NewTestRefreshTokenRepo()
+		if err != nil {
+			t.Fatalf("Unexpected error: %v", err)
+		}
+
+		srv := &Server{
+			IssuerURL:          issuerURL,
+			KeyManager:         km,
+			SessionManager:     sm,
+			ClientIdentityRepo: ciRepo,
+			UserRepo:           userRepo,
+			RefreshTokenRepo:   refreshTokenRepo,
+		}
+
+		_, err = sm.NewSessionKey(sessionID)
+		if err != nil {
+			t.Fatalf("Unexpected error: %v", err)
+		}
+
+		jwt, token, err := srv.CodeToken(tt.argCC, tt.argKey)
+		if tt.err == "" {
+			if err != nil {
+				t.Errorf("case %d: got non-nil error: %v", i, err)
+			} else if jwt == nil {
+				t.Errorf("case %d: got nil JWT", i)
+			} else if token == "" {
+				t.Errorf("case %d: got empty refresh token", i)
+			}
+
+		} else {
+			if err.Error() != tt.err {
+				t.Errorf("case %d: want err %q, got %q", i, tt.err, err.Error())
+			} else if jwt != nil {
+				t.Errorf("case %d: got non-nil JWT", i)
+			} else if token != "" {
+				t.Errorf("case %d: got non-empty refresh token", i)
+			}
+		}
+	}
+}
+
+func TestServerRefreshToken(t *testing.T) {
+	issuerURL := url.URL{Scheme: "http", Host: "server.example.com"}
+
+	credXXX := oidc.ClientCredentials{
+		ID:     "XXX",
+		Secret: "secret",
+	}
+	credYYY := oidc.ClientCredentials{
+		ID:     "YYY",
+		Secret: "secret",
+	}
+
+	signerFixture := &StaticSigner{sig: []byte("beer"), err: nil}
+
+	tests := []struct {
+		token    string
+		clientID string // The client that associates with the token.
+		creds    oidc.ClientCredentials
+		signer   jose.Signer
+		err      string
+	}{
+		// Everything is good.
+		{
+			"0/refresh-1",
+			"XXX",
+			credXXX,
+			signerFixture,
+			"",
+		},
+		// Invalid refresh token(malformatted).
+		{
+			"invalid-token",
+			"XXX",
+			credXXX,
+			signerFixture,
+			oauth2.ErrorInvalidRequest,
+		},
+		// Invalid refresh token.
+		{
+			"0/refresh-1",
+			"XXX",
+			credXXX,
+			signerFixture,
+			oauth2.ErrorInvalidRequest,
+		},
+		// Invalid client(client is not associated with the token).
+		{
+			"0/refresh-1",
+			"XXX",
+			credYYY,
+			signerFixture,
+			oauth2.ErrorInvalidClient,
+		},
+		// Invalid client(no client ID).
+		{
+			"0/refresh-1",
+			"XXX",
+			oidc.ClientCredentials{ID: "", Secret: "aaa"},
+			signerFixture,
+			oauth2.ErrorInvalidClient,
+		},
+		// Invalid client(no such client).
+		{
+			"0/refresh-1",
+			"XXX",
+			oidc.ClientCredentials{ID: "AAA", Secret: "aaa"},
+			signerFixture,
+			oauth2.ErrorInvalidClient,
+		},
+		// Invalid client(no secrets).
+		{
+			"0/refresh-1",
+			"XXX",
+			oidc.ClientCredentials{ID: "XXX"},
+			signerFixture,
+			oauth2.ErrorInvalidClient,
+		},
+		// Invalid client(invalid secret).
+		{
+			"0/refresh-1",
+			"XXX",
+			oidc.ClientCredentials{ID: "XXX", Secret: "bad-secret"},
+			signerFixture,
+			oauth2.ErrorInvalidClient,
+		},
+		// Signing operation fails.
+		{
+			"0/refresh-1",
+			"XXX",
+			credXXX,
+			&StaticSigner{sig: nil, err: errors.New("fail")},
+			oauth2.ErrorServerError,
+		},
+	}
+
+	for i, tt := range tests {
+		km := &StaticKeyManager{
+			signer: tt.signer,
+		}
+
+		ciRepo := client.NewClientIdentityRepo([]oidc.ClientIdentity{
+			oidc.ClientIdentity{Credentials: credXXX},
+			oidc.ClientIdentity{Credentials: credYYY},
+		})
+
+		userRepo, err := makeNewUserRepo()
+		if err != nil {
+			t.Fatalf("Unexpected error: %v", err)
+		}
+
+		refreshTokenRepo, err := refreshtest.NewTestRefreshTokenRepo()
+		if err != nil {
+			t.Fatalf("Unexpected error: %v", err)
+		}
+
+		srv := &Server{
+			IssuerURL:          issuerURL,
+			KeyManager:         km,
+			ClientIdentityRepo: ciRepo,
+			UserRepo:           userRepo,
+			RefreshTokenRepo:   refreshTokenRepo,
+		}
+
+		if _, err := refreshTokenRepo.Create("testid-1", tt.clientID); err != nil {
+			t.Fatalf("Unexpected error: %v", err)
+		}
+
+		jwt, err := srv.RefreshToken(tt.creds, tt.token)
+		if err != nil {
+			if err.Error() != tt.err {
+				t.Errorf("Case %d: expect: %v, got: %v", i, tt.err, err)
+			}
+		}
+
+		if jwt != nil {
+			if string(jwt.Signature) != "beer" {
+				t.Errorf("Case %d: expect signature: beer, got signature: %v", i, jwt.Signature)
+			}
+			claims, err := jwt.Claims()
+			if err != nil {
+				t.Errorf("Case %d: unexpected error: %v", i, err)
+			}
+			if claims["iss"] != issuerURL.String() || claims["sub"] != "testid-1" || claims["aud"] != "XXX" {
+				t.Errorf("Case %d: invalid claims: %v", i, claims)
+			}
+		}
+	}
+
+	// Test that we should return error when user cannot be found after
+	// verifying the token.
+	km := &StaticKeyManager{
+		signer: signerFixture,
+	}
+
+	ciRepo := client.NewClientIdentityRepo([]oidc.ClientIdentity{
+		oidc.ClientIdentity{Credentials: credXXX},
+		oidc.ClientIdentity{Credentials: credYYY},
+	})
+
+	userRepo, err := makeNewUserRepo()
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	// Create a user that will be removed later.
+	if err := userRepo.Create(nil, user.User{
+		ID:    "testid-2",
+		Email: "test-2@example.com",
+	}); err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	refreshTokenRepo, err := refreshtest.NewTestRefreshTokenRepo()
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	srv := &Server{
+		IssuerURL:          issuerURL,
+		KeyManager:         km,
+		ClientIdentityRepo: ciRepo,
+		UserRepo:           userRepo,
+		RefreshTokenRepo:   refreshTokenRepo,
+	}
+
+	if _, err := refreshTokenRepo.Create("testid-2", credXXX.ID); err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	// Recreate the user repo to remove the user we created.
+	userRepo, err = makeNewUserRepo()
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+	srv.UserRepo = userRepo
+
+	_, err = srv.RefreshToken(credXXX, "0/refresh-1")
+	if err == nil || err.Error() != oauth2.ErrorServerError {
+		t.Errorf("Expect: %v, got: %v", oauth2.ErrorServerError, err)
+	}
+}
diff --git a/server/testutil.go b/server/testutil.go
new file mode 100644
index 00000000..20c3080c
--- /dev/null
+++ b/server/testutil.go
@@ -0,0 +1,174 @@
+package server
+
+import (
+	"fmt"
+	"net/url"
+	"time"
+
+	"github.com/coreos/go-oidc/key"
+	"github.com/coreos/go-oidc/oidc"
+
+	"github.com/coreos/dex/client"
+	"github.com/coreos/dex/connector"
+	"github.com/coreos/dex/email"
+	"github.com/coreos/dex/repo"
+	"github.com/coreos/dex/session"
+	"github.com/coreos/dex/user"
+	useremail "github.com/coreos/dex/user/email"
+)
+
+const (
+	templatesLocation      = "../static/html"
+	emailTemplatesLocation = "../static/email"
+)
+
+var (
+	testIssuerURL    = url.URL{Scheme: "http", Host: "server.example.com"}
+	testClientID     = "XXX"
+	testClientSecret = "secrete"
+
+	testRedirectURL = url.URL{Scheme: "http", Host: "client.example.com", Path: "/callback"}
+
+	testUsers = []user.UserWithRemoteIdentities{
+		{
+			User: user.User{
+				ID:    "ID-1",
+				Email: "Email-1@example.com",
+			},
+			RemoteIdentities: []user.RemoteIdentity{
+				{
+					ConnectorID: "IDPC-1",
+					ID:          "RID-1",
+				},
+			},
+		},
+	}
+
+	testPasswordInfos = []user.PasswordInfo{
+		{
+			UserID:   "ID-1",
+			Password: []byte("password"),
+		},
+	}
+
+	testPrivKey, _ = key.GeneratePrivateKey()
+)
+
+type testFixtures struct {
+	srv                *Server
+	userRepo           user.UserRepo
+	sessionManager     *session.SessionManager
+	emailer            *email.TemplatizedEmailer
+	redirectURL        url.URL
+	clientIdentityRepo client.ClientIdentityRepo
+}
+
+func sequentialGenerateCodeFunc() session.GenerateCodeFunc {
+	x := 0
+	return func() (string, error) {
+		x += 1
+		return fmt.Sprintf("code-%d", x), nil
+	}
+}
+
+func makeTestFixtures() (*testFixtures, error) {
+	userRepo := user.NewUserRepoFromUsers(testUsers)
+	pwRepo := user.NewPasswordInfoRepoFromPasswordInfos(testPasswordInfos)
+	manager := user.NewManager(userRepo, pwRepo, repo.InMemTransactionFactory, user.ManagerOptions{})
+
+	connConfigs := []connector.ConnectorConfig{
+		&connector.OIDCConnectorConfig{
+			ID:           "oidc",
+			IssuerURL:    testIssuerURL.String(),
+			ClientID:     "12345",
+			ClientSecret: "567789",
+		},
+		&connector.OIDCConnectorConfig{
+			ID:                   "oidc-trusted",
+			IssuerURL:            testIssuerURL.String(),
+			ClientID:             "12345-trusted",
+			ClientSecret:         "567789-trusted",
+			TrustedEmailProvider: true,
+		},
+		&connector.LocalConnectorConfig{
+			ID: "local",
+		},
+	}
+
+	sessionManager := session.NewSessionManager(session.NewSessionRepo(), session.NewSessionKeyRepo())
+	sessionManager.GenerateCode = sequentialGenerateCodeFunc()
+
+	emailer, err := email.NewTemplatizedEmailerFromGlobs(
+		emailTemplatesLocation+"/*.txt",
+		emailTemplatesLocation+"/*.html",
+		&email.FakeEmailer{})
+	if err != nil {
+		return nil, err
+	}
+
+	clientIdentityRepo := client.NewClientIdentityRepo([]oidc.ClientIdentity{
+		oidc.ClientIdentity{
+			Credentials: oidc.ClientCredentials{
+				ID:     "XXX",
+				Secret: testClientSecret,
+			},
+			Metadata: oidc.ClientMetadata{
+				RedirectURLs: []url.URL{
+					testRedirectURL,
+				},
+			},
+		},
+	})
+
+	km := key.NewPrivateKeyManager()
+	err = km.Set(key.NewPrivateKeySet([]*key.PrivateKey{testPrivKey}, time.Now().Add(time.Minute)))
+	if err != nil {
+		return nil, err
+	}
+
+	tpl, err := getTemplates(templatesLocation)
+	if err != nil {
+		return nil, err
+	}
+
+	srv := &Server{
+		IssuerURL:          testIssuerURL,
+		SessionManager:     sessionManager,
+		ClientIdentityRepo: clientIdentityRepo,
+		Templates:          tpl,
+		UserRepo:           userRepo,
+		PasswordInfoRepo:   pwRepo,
+		UserManager:        manager,
+		KeyManager:         km,
+	}
+
+	err = setTemplates(srv, tpl)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, config := range connConfigs {
+		if err := srv.AddConnector(config); err != nil {
+			return nil, err
+		}
+	}
+
+	srv.UserEmailer = useremail.NewUserEmailer(srv.UserRepo,
+		srv.PasswordInfoRepo,
+		srv.KeyManager.Signer,
+		srv.SessionManager.ValidityWindow,
+		srv.IssuerURL,
+		emailer,
+		"noreply@example.com",
+		srv.absURL(httpPathResetPassword),
+		srv.absURL(httpPathEmailVerify))
+
+	return &testFixtures{
+		srv:                srv,
+		redirectURL:        testRedirectURL,
+		userRepo:           userRepo,
+		sessionManager:     sessionManager,
+		emailer:            emailer,
+		clientIdentityRepo: clientIdentityRepo,
+	}, nil
+}
diff --git a/server/user.go b/server/user.go
new file mode 100644
index 00000000..64ce05d0
--- /dev/null
+++ b/server/user.go
@@ -0,0 +1,224 @@
+package server
+
+import (
+	"encoding/json"
+	"errors"
+	"net/http"
+	"net/url"
+	"strconv"
+
+	"github.com/coreos/go-oidc/jose"
+	"github.com/coreos/go-oidc/oidc"
+	"github.com/julienschmidt/httprouter"
+
+	"github.com/coreos/dex/client"
+	"github.com/coreos/dex/pkg/log"
+	schema "github.com/coreos/dex/schema/workerschema"
+	"github.com/coreos/dex/user"
+	"github.com/coreos/dex/user/api"
+)
+
+const (
+	defaultMaxResults = 20
+)
+
+var (
+	UsersSubTree        = "/users"
+	UsersListEndpoint   = addBasePath(UsersSubTree) + "/"
+	UsersCreateEndooint = addBasePath(UsersSubTree)
+	UsersGetEndpoint    = addBasePath(UsersSubTree + "/:id")
+)
+
+type UserMgmtServer struct {
+	api         *api.UsersAPI
+	jwtvFactory JWTVerifierFactory
+	um          *user.Manager
+	cir         client.ClientIdentityRepo
+}
+
+func NewUserMgmtServer(userMgmtAPI *api.UsersAPI, jwtvFactory JWTVerifierFactory, um *user.Manager, cir client.ClientIdentityRepo) *UserMgmtServer {
+	return &UserMgmtServer{
+		api:         userMgmtAPI,
+		jwtvFactory: jwtvFactory,
+		um:          um,
+		cir:         cir,
+	}
+}
+
+func (s *UserMgmtServer) HTTPHandler() http.Handler {
+	r := httprouter.New()
+	r.GET(UsersListEndpoint, s.listUsers)
+	r.POST(UsersCreateEndooint, s.createUser)
+	r.GET(UsersGetEndpoint, s.getUser)
+	return r
+}
+
+func (s *UserMgmtServer) listUsers(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+	creds, err := s.getCreds(r)
+	if err != nil {
+		s.writeError(w, err)
+		return
+	}
+
+	nextPageToken := r.URL.Query().Get("nextPageToken")
+
+	maxResults, err := intFromQuery(r.URL.Query(), "maxResults", defaultMaxResults)
+
+	if err != nil {
+		writeAPIError(w, http.StatusBadRequest,
+			newAPIError(errorInvalidRequest, "maxResults must be an integer"))
+		return
+	}
+
+	users, nextPageToken, err := s.api.ListUsers(creds, maxResults, nextPageToken)
+	if err != nil {
+		s.writeError(w, err)
+		return
+	}
+
+	usersResponse := schema.UsersResponse{
+		Users:         users,
+		NextPageToken: nextPageToken,
+	}
+	writeResponseWithBody(w, http.StatusOK, usersResponse)
+}
+
+func (s *UserMgmtServer) getUser(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+	creds, err := s.getCreds(r)
+	if err != nil {
+		s.writeError(w, err)
+		return
+	}
+
+	id := ps.ByName("id")
+	if id == "" {
+		writeAPIError(w, http.StatusBadRequest,
+			newAPIError(errorInvalidRequest, "id is required"))
+		return
+	}
+
+	usr, err := s.api.GetUser(creds, id)
+	if err != nil {
+		s.writeError(w, err)
+		return
+	}
+	userResponse := schema.UserResponse{
+		User: &usr,
+	}
+	writeResponseWithBody(w, http.StatusOK, userResponse)
+}
+
+func (s *UserMgmtServer) createUser(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+	creds, err := s.getCreds(r)
+	if err != nil {
+		s.writeError(w, err)
+		return
+	}
+
+	createReq := schema.UserCreateRequest{}
+	err = json.NewDecoder(r.Body).Decode(&createReq)
+	if err != nil {
+		writeInvalidRequest(w, "cannot parse JSON body")
+		return
+	}
+
+	redirURL, err := url.Parse(createReq.RedirectURL)
+	if err != nil {
+		writeAPIError(w, http.StatusBadRequest,
+			newAPIError(errorInvalidRequest, "redirectURL must be a valid URL"))
+		return
+	}
+
+	createdResponse, err := s.api.CreateUser(creds, *createReq.User, *redirURL)
+	if err != nil {
+		s.writeError(w, err)
+		return
+	}
+
+	writeResponseWithBody(w, http.StatusOK, createdResponse)
+}
+
+func (s *UserMgmtServer) writeError(w http.ResponseWriter, err error) {
+	log.Errorf("Error calling user management API: %v: ", err)
+	if apiErr, ok := err.(api.Error); ok {
+		writeAPIError(w, apiErr.Code, newAPIError(apiErr.Type, apiErr.Desc))
+		return
+	}
+
+	writeAPIError(w, http.StatusInternalServerError, newAPIError(errorServerError, err.Error()))
+}
+
+func (s *UserMgmtServer) getCreds(r *http.Request) (api.Creds, error) {
+	token, err := oidc.ExtractBearerToken(r)
+	if err != nil {
+		log.Errorf("userMgmtServer: GetCreds err: %q", err)
+		return api.Creds{}, api.ErrorUnauthorized
+	}
+
+	jwt, err := jose.ParseJWT(token)
+	if err != nil {
+		log.Errorf("userMgmtServer: GetCreds err: %q", err)
+		return api.Creds{}, api.ErrorUnauthorized
+	}
+
+	claims, err := jwt.Claims()
+	if err != nil {
+		log.Errorf("userMgmtServer: GetCreds err: %q", err)
+		return api.Creds{}, api.ErrorUnauthorized
+	}
+
+	clientID, ok, err := claims.StringClaim("aud")
+	if err != nil {
+		log.Errorf("userMgmtServer: GetCreds err: %q", err)
+		return api.Creds{}, err
+	}
+	if !ok || clientID == "" {
+		return api.Creds{}, errors.New("no aud(client ID) claim")
+	}
+
+	verifier := s.jwtvFactory(clientID)
+	if err := verifier.Verify(jwt); err != nil {
+		log.Errorf("userMgmtServer: GetCreds err: %q", err)
+		return api.Creds{}, api.ErrorUnauthorized
+	}
+
+	sub, ok, err := claims.StringClaim("sub")
+	if err != nil {
+		log.Errorf("userMgmtServer: GetCreds err: %q", err)
+		return api.Creds{}, err
+	}
+	if !ok || sub == "" {
+		return api.Creds{}, api.ErrorUnauthorized
+	}
+
+	usr, err := s.um.Get(sub)
+	if err != nil {
+		if err == user.ErrorNotFound {
+			return api.Creds{}, api.ErrorUnauthorized
+		}
+		log.Errorf("userMgmtServer: GetCreds err: %q", err)
+		return api.Creds{}, err
+	}
+
+	isAdmin, err := s.cir.IsDexAdmin(clientID)
+	if err != nil {
+		log.Errorf("userMgmtServer: GetCreds err: %q", err)
+		return api.Creds{}, err
+	}
+	if !isAdmin {
+		return api.Creds{}, api.ErrorUnauthorized
+	}
+
+	return api.Creds{
+		ClientID: clientID,
+		User:     usr,
+	}, nil
+}
+
+func intFromQuery(ps url.Values, name string, defaultVal int) (int, error) {
+	s := ps.Get(name)
+	if s == "" {
+		return defaultVal, nil
+	}
+	return strconv.Atoi(s)
+}
diff --git a/session/manager.go b/session/manager.go
new file mode 100644
index 00000000..acafeeb0
--- /dev/null
+++ b/session/manager.go
@@ -0,0 +1,160 @@
+package session
+
+import (
+	"crypto/rand"
+	"encoding/base64"
+	"errors"
+	"fmt"
+	"net/url"
+	"time"
+
+	"github.com/jonboulle/clockwork"
+
+	"github.com/coreos/go-oidc/oidc"
+)
+
+type GenerateCodeFunc func() (string, error)
+
+func DefaultGenerateCode() (string, error) {
+	b := make([]byte, 8)
+	n, err := rand.Read(b)
+	if err != nil {
+		return "", err
+	} else if n != 8 {
+		return "", errors.New("unable to read enough random bytes")
+	}
+	return base64.URLEncoding.EncodeToString(b), nil
+}
+
+func NewSessionManager(sRepo SessionRepo, skRepo SessionKeyRepo) *SessionManager {
+	return &SessionManager{
+		GenerateCode:   DefaultGenerateCode,
+		Clock:          clockwork.NewRealClock(),
+		ValidityWindow: DefaultSessionValidityWindow,
+		sessions:       sRepo,
+		keys:           skRepo,
+	}
+}
+
+type SessionManager struct {
+	GenerateCode   GenerateCodeFunc
+	Clock          clockwork.Clock
+	ValidityWindow time.Duration
+	sessions       SessionRepo
+	keys           SessionKeyRepo
+}
+
+func (m *SessionManager) NewSession(connectorID, clientID, clientState string, redirectURL url.URL, nonce string, register bool) (string, error) {
+	sID, err := m.GenerateCode()
+	if err != nil {
+		return "", err
+	}
+
+	now := m.Clock.Now()
+	s := Session{
+		ConnectorID: connectorID,
+		ID:          sID,
+		State:       SessionStateNew,
+		CreatedAt:   now,
+		ExpiresAt:   now.Add(m.ValidityWindow),
+		ClientID:    clientID,
+		ClientState: clientState,
+		RedirectURL: redirectURL,
+		Register:    register,
+		Nonce:       nonce,
+	}
+
+	err = m.sessions.Create(s)
+	if err != nil {
+		return "", err
+	}
+
+	return sID, nil
+}
+
+func (m *SessionManager) NewSessionKey(sessionID string) (string, error) {
+	key, err := m.GenerateCode()
+	if err != nil {
+		return "", err
+	}
+
+	k := SessionKey{
+		Key:       key,
+		SessionID: sessionID,
+	}
+
+	err = m.keys.Push(k, sessionKeyValidityWindow)
+	if err != nil {
+		return "", err
+	}
+
+	return k.Key, nil
+}
+
+func (m *SessionManager) ExchangeKey(key string) (string, error) {
+	return m.keys.Pop(key)
+}
+
+func (m *SessionManager) getSessionInState(sessionID string, state SessionState) (*Session, error) {
+	s, err := m.sessions.Get(sessionID)
+	if err != nil {
+		return nil, err
+	}
+
+	if s.State != state {
+		return nil, fmt.Errorf("session state %s, expect %s", s.State, state)
+	}
+
+	return s, nil
+}
+
+func (m *SessionManager) AttachRemoteIdentity(sessionID string, ident oidc.Identity) (*Session, error) {
+	s, err := m.getSessionInState(sessionID, SessionStateNew)
+	if err != nil {
+		return nil, err
+	}
+
+	s.Identity = ident
+	s.State = SessionStateRemoteAttached
+
+	if err = m.sessions.Update(*s); err != nil {
+		return nil, err
+	}
+
+	return s, nil
+}
+
+func (m *SessionManager) AttachUser(sessionID string, userID string) (*Session, error) {
+	s, err := m.getSessionInState(sessionID, SessionStateRemoteAttached)
+	if err != nil {
+		return nil, err
+	}
+
+	s.UserID = userID
+	s.State = SessionStateIdentified
+
+	if err = m.sessions.Update(*s); err != nil {
+		return nil, err
+	}
+
+	return s, nil
+}
+
+func (m *SessionManager) Kill(sessionID string) (*Session, error) {
+	s, err := m.sessions.Get(sessionID)
+	if err != nil {
+		return nil, err
+	}
+
+	s.State = SessionStateDead
+
+	if err = m.sessions.Update(*s); err != nil {
+		return nil, err
+	}
+
+	return s, nil
+}
+
+func (m *SessionManager) Get(sessionID string) (*Session, error) {
+	return m.sessions.Get(sessionID)
+}
diff --git a/session/manager_test.go b/session/manager_test.go
new file mode 100644
index 00000000..49e1e9d5
--- /dev/null
+++ b/session/manager_test.go
@@ -0,0 +1,119 @@
+package session
+
+import (
+	"net/url"
+	"testing"
+
+	"github.com/coreos/go-oidc/oidc"
+)
+
+func staticGenerateCodeFunc(code string) GenerateCodeFunc {
+	return func() (string, error) {
+		return code, nil
+	}
+}
+
+func TestSessionManagerNewSession(t *testing.T) {
+	sm := NewSessionManager(NewSessionRepo(), NewSessionKeyRepo())
+	sm.GenerateCode = staticGenerateCodeFunc("boo")
+	got, err := sm.NewSession("bogus_idpc", "XXX", "bogus", url.URL{}, "", false)
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+	if got != "boo" {
+		t.Fatalf("Incorrect Session ID: want=%s got=%s", "boo", got)
+	}
+}
+
+func TestSessionAttachRemoteIdentityTwice(t *testing.T) {
+	sm := NewSessionManager(NewSessionRepo(), NewSessionKeyRepo())
+	sessionID, err := sm.NewSession("bogus_idpc", "XXX", "bogus", url.URL{}, "", false)
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	ident := oidc.Identity{ID: "YYY", Name: "elroy", Email: "elroy@example.com"}
+	if _, err := sm.AttachRemoteIdentity(sessionID, ident); err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	if _, err := sm.AttachRemoteIdentity(sessionID, ident); err == nil {
+		t.Fatalf("Expected non-nil error")
+	}
+}
+
+func TestSessionManagerExchangeKey(t *testing.T) {
+	sm := NewSessionManager(NewSessionRepo(), NewSessionKeyRepo())
+	sessionID, err := sm.NewSession("connector_id", "XXX", "bogus", url.URL{}, "", false)
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	key, err := sm.NewSessionKey(sessionID)
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	got, err := sm.ExchangeKey(key)
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+	if got != sessionID {
+		t.Fatalf("Incorrect Session ID: want=%s got=%s", sessionID, got)
+	}
+
+	if _, err := sm.ExchangeKey(key); err == nil {
+		t.Fatalf("Received nil response from attempt with spent Session key")
+	}
+}
+
+func TestSessionManagerGetSessionInStateNoExist(t *testing.T) {
+	sm := NewSessionManager(NewSessionRepo(), NewSessionKeyRepo())
+	ses, err := sm.getSessionInState("123", SessionStateNew)
+	if err == nil {
+		t.Errorf("Expected non-nil error")
+	}
+	if ses != nil {
+		t.Errorf("Expected nil Session")
+	}
+}
+
+func TestSessionManagerGetSessionInStateWrongState(t *testing.T) {
+	sm := NewSessionManager(NewSessionRepo(), NewSessionKeyRepo())
+	sessionID, err := sm.NewSession("connector_id", "XXX", "bogus", url.URL{}, "", false)
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+	ses, err := sm.getSessionInState(sessionID, SessionStateDead)
+	if err == nil {
+		t.Errorf("Expected non-nil error")
+	}
+	if ses != nil {
+		t.Errorf("Expected nil Session")
+	}
+}
+
+func TestSessionManagerKill(t *testing.T) {
+	sm := NewSessionManager(NewSessionRepo(), NewSessionKeyRepo())
+	sessionID, err := sm.NewSession("connector_id", "XXX", "bogus", url.URL{}, "", false)
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	ident := oidc.Identity{ID: "YYY", Name: "elroy", Email: "elroy@example.com"}
+	if _, err := sm.AttachRemoteIdentity(sessionID, ident); err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+
+	ses, err := sm.Kill(sessionID)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+	}
+	if ses == nil {
+		t.Fatalf("Expected non-nil Session")
+	}
+
+	if ses.ClientState != "bogus" {
+		t.Errorf("Unexpected Session: %#v", ses)
+	}
+}
diff --git a/session/repo.go b/session/repo.go
new file mode 100644
index 00000000..88ec9b23
--- /dev/null
+++ b/session/repo.go
@@ -0,0 +1,103 @@
+package session
+
+import (
+	"errors"
+	"time"
+
+	"github.com/jonboulle/clockwork"
+)
+
+type SessionRepo interface {
+	Get(string) (*Session, error)
+	Create(Session) error
+	Update(Session) error
+}
+
+type SessionKeyRepo interface {
+	Push(SessionKey, time.Duration) error
+	Pop(string) (string, error)
+}
+
+func NewSessionRepo() SessionRepo {
+	return NewSessionRepoWithClock(clockwork.NewRealClock())
+}
+
+func NewSessionRepoWithClock(clock clockwork.Clock) SessionRepo {
+	return &memSessionRepo{
+		store: make(map[string]Session),
+		clock: clock,
+	}
+}
+
+type memSessionRepo struct {
+	store map[string]Session
+	clock clockwork.Clock
+}
+
+func (m *memSessionRepo) Get(sessionID string) (*Session, error) {
+	s, ok := m.store[sessionID]
+	if !ok || s.ExpiresAt.Before(m.clock.Now()) {
+		return nil, errors.New("unrecognized ID")
+	}
+	return &s, nil
+}
+
+func (m *memSessionRepo) Create(s Session) error {
+	if _, ok := m.store[s.ID]; ok {
+		return errors.New("ID exists")
+	}
+
+	m.store[s.ID] = s
+	return nil
+}
+
+func (m *memSessionRepo) Update(s Session) error {
+	if _, ok := m.store[s.ID]; !ok {
+		return errors.New("unrecognized ID")
+	}
+	m.store[s.ID] = s
+	return nil
+}
+
+type expiringSessionKey struct {
+	SessionKey
+	expiresAt time.Time
+}
+
+func NewSessionKeyRepo() SessionKeyRepo {
+	return NewSessionKeyRepoWithClock(clockwork.NewRealClock())
+}
+
+func NewSessionKeyRepoWithClock(clock clockwork.Clock) SessionKeyRepo {
+	return &memSessionKeyRepo{
+		store: make(map[string]expiringSessionKey),
+		clock: clock,
+	}
+}
+
+type memSessionKeyRepo struct {
+	store map[string]expiringSessionKey
+	clock clockwork.Clock
+}
+
+func (m *memSessionKeyRepo) Pop(key string) (string, error) {
+	esk, ok := m.store[key]
+	if !ok {
+		return "", errors.New("unrecognized key")
+	}
+	defer delete(m.store, key)
+
+	if esk.expiresAt.Before(m.clock.Now()) {
+		return "", errors.New("expired key")
+	}
+
+	return esk.SessionKey.SessionID, nil
+}
+
+func (m *memSessionKeyRepo) Push(sk SessionKey, ttl time.Duration) error {
+	m.store[sk.Key] = expiringSessionKey{
+		SessionKey: sk,
+		expiresAt:  m.clock.Now().Add(ttl),
+	}
+	return nil
+}
diff --git a/session/session.go b/session/session.go
new file mode 100644
index 00000000..fed7a998
--- /dev/null
+++ b/session/session.go
@@ -0,0 +1,62 @@
+package session
+
+import (
+	"net/url"
+	"time"
+
+	"github.com/coreos/go-oidc/jose"
+	"github.com/coreos/go-oidc/oidc"
+)
+
+const (
+	sessionKeyValidityWindow = 10 * time.Minute //RFC6749
+
+	// The default token expiration time.
+	// This is exported, so it can be used to set the expiration
+	// time in refresh token flow.
+	DefaultSessionValidityWindow = 12 * time.Hour
+)
+
+type SessionState string
+
+const (
+	SessionStateNew            = SessionState("NEW")
+	SessionStateRemoteAttached = SessionState("REMOTE_ATTACHED")
+	SessionStateIdentified     = SessionState("IDENTIFIED")
+	SessionStateDead           = SessionState("EXCHANGED")
+)
+
+type SessionKey struct {
+	Key       string
+	SessionID string
+}
+
+type Session struct {
+	ConnectorID string
+	ID          string
+	State       SessionState
+	CreatedAt   time.Time
+	ExpiresAt   time.Time
+	ClientID    string
+	ClientState string
+	RedirectURL url.URL
+	Identity    oidc.Identity
+	UserID      string
+
+	// Regsiter indicates that this session is a registration flow.
+	Register bool
+
+	// Nonce is optionally provided in the initial authorization request, and propogated in such cases to the generated claims.
+	Nonce string
+}
+
+// Claims returns a new set of Claims for the current session.
+// The "sub" of the returned Claims is that of the dex User, not whatever
+// remote Identity was used to authenticate.
+func (s *Session) Claims(issuerURL string) jose.Claims {
+	claims := oidc.NewClaims(issuerURL, s.UserID, s.ClientID, s.CreatedAt, s.ExpiresAt)
+	if s.Nonce != "" {
+		claims["nonce"] = s.Nonce
+	}
+	return claims
+}
diff --git a/session/session_test.go b/session/session_test.go
new file mode 100644
index 00000000..744cb90f
--- /dev/null
+++ b/session/session_test.go
@@ -0,0 +1,96 @@
+package session
+
+import (
+	"testing"
+	"time"
+
+	"github.com/coreos/go-oidc/jose"
+	"github.com/coreos/go-oidc/oidc"
+
+	"github.com/kylelemons/godebug/pretty"
+)
+
+func TestSessionClaims(t *testing.T) {
+	issuerURL := "http://server.example.com"
+	now := time.Now()
+
+	tests := []struct {
+		ses  Session
+		want jose.Claims
+	}{
+		{
+			ses: Session{
+				CreatedAt: now,
+				ExpiresAt: now.Add(time.Hour),
+				ClientID:  "XXX",
+				Identity: oidc.Identity{
+					ID:    "YYY",
+					Name:  "elroy",
+					Email: "elroy@example.com",
+				},
+				UserID: "elroy-id",
+			},
+			want: jose.Claims{
+				"iss": issuerURL,
+				"sub": "elroy-id",
+				"aud": "XXX",
+				"iat": float64(now.Unix()),
+				"exp": float64(now.Add(time.Hour).Unix()),
+			},
+		},
+
+		// Ignore Identity custom ExpiresAt, use from session
+		{
+			ses: Session{
+				CreatedAt: now,
+				ExpiresAt: now.Add(time.Hour),
+				ClientID:  "XXX",
+				Identity: oidc.Identity{
+					ID:        "YYY",
+					Name:      "elroy",
+					Email:     "elroy@example.com",
+					ExpiresAt: now.Add(time.Minute),
+				},
+				UserID: "elroy-id",
+			},
+			want: jose.Claims{
+				"iss": issuerURL,
+				"sub": "elroy-id",
+				"aud": "XXX",
+				"iat": float64(now.Unix()),
+				"exp": float64(now.Add(time.Hour).Unix()),
+			},
+		},
+		// Nonce gets propagated.
+		{
+			ses: Session{
+				CreatedAt: now,
+				ExpiresAt: now.Add(time.Hour),
+				ClientID:  "XXX",
+				Identity: oidc.Identity{
+					ID:    "YYY",
+					Name:  "elroy",
+					Email: "elroy@example.com",
+				},
+				UserID: "elroy-id",
+				Nonce:  "oncenay",
+			},
+			want: jose.Claims{
+				"iss":   issuerURL,
+				"sub":   "elroy-id",
+				"aud":   "XXX",
+				"iat":   float64(now.Unix()),
+				"exp":   float64(now.Add(time.Hour).Unix()),
+				"nonce": "oncenay",
+			},
+		},
+	}
+
+	for i, tt := range tests {
+		got := tt.ses.Claims(issuerURL)
+		if diff := pretty.Compare(tt.want, got); diff != "" {
+			t.Errorf("case %d: Compare(want, got) = %v", i, diff)
+		}
+	}
+
+}
diff --git a/static/authd-overlord.service.tmpl b/static/authd-overlord.service.tmpl
new file mode 100644
index 00000000..2e5fbc96
--- /dev/null
+++ b/static/authd-overlord.service.tmpl
@@ -0,0 +1,9 @@
+[Service]
+ExecStartPre=-/usr/bin/docker rm %n
+ExecStart=/usr/bin/docker run \
+--name %n \
+--env DEX_OVERLORD_DB_URL=${DEX_OVERLORD_DB_URL} \
+--env DEX_OVERLORD_KEY_SECRET=${DEX_OVERLORD_KEY_SECRET} \
+quay.io/coreos/dex /opt/dex/bin/dex-overlord
+
+ExecStop=/usr/bin/docker kill %n
diff --git a/static/authd-worker.service.tmpl b/static/authd-worker.service.tmpl
new file mode 100644
index 00000000..aee10c80
--- /dev/null
+++ b/static/authd-worker.service.tmpl
@@ -0,0 +1,15 @@
+[Service]
+ExecStartPre=-/usr/bin/docker rm %n
+ExecStart=/usr/bin/docker run \
+--name %n \
+--volume /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt \
+--publish 5556:5556 \
+--env DEX_WORKER_ISSUER=https://auth.update.core-os.net \
+--env DEX_WORKER_DB_URL=${DEX_WORKER_DB_URL} \
+--env DEX_WORKER_KEY_SECRET=${DEX_WORKER_KEY_SECRET} \
+quay.io/coreos/dex /opt/dex/bin/dex-worker
+
+ExecStop=/usr/bin/docker kill %n
+
+[X-Fleet]
+Global=true
diff --git a/static/email/password-reset.html b/static/email/password-reset.html
new file mode 100644
index 00000000..77a62743
--- /dev/null
+++ b/static/email/password-reset.html
@@ -0,0 +1,7 @@
+<html>
+  <body>
+    Reset your password:
+
+    <a href="{{ .link }}">Reset Password</a>
+  </body>
+</html>
diff --git a/static/email/password-reset.txt b/static/email/password-reset.txt
new file mode 100644
index 00000000..046c4c47
--- /dev/null
+++ b/static/email/password-reset.txt
@@ -0,0 +1,4 @@
+Reset your password:
+
+Link:
+{{ .link }}
diff --git a/static/email/verify-email.html b/static/email/verify-email.html
new file mode 100644
index 00000000..1d5589a6
--- /dev/null
+++ b/static/email/verify-email.html
@@ -0,0 +1,13 @@
+<html>
+  <body>
+    Hello!
+
+Welcome to Tectonic! Please verify that your email is {{ .email }} by clicking here:
+
+<a href="{{ .link }}"> Click here to verify!</a>
+
+Love,
+
+Your Pals at CoreOS
+  </body>
+</html>
diff --git a/static/email/verify-email.txt b/static/email/verify-email.txt
new file mode 100644
index 00000000..6808a2b3
--- /dev/null
+++ b/static/email/verify-email.txt
@@ -0,0 +1,9 @@
+Hello!
+
+Welcome to Tectonic! Please verify that your email is {{ .email }} by clicking here:
+
+{{ .link }}
+
+Love,
+
+Your Pals at CoreOS
diff --git a/static/fixtures/clients.json b/static/fixtures/clients.json
new file mode 100644
index 00000000..070ae739
--- /dev/null
+++ b/static/fixtures/clients.json
@@ -0,0 +1,12 @@
+[
+  {
+    "id": "XXX",
+    "secret": "secrete",
+    "redirectURLs": ["http://127.0.0.1:5555/callback"]
+  },
+  {
+    "id": "core-update",
+    "secret": "secrete",
+    "redirectURLs": ["http://127.0.0.1:8000/admin/v1/oauth/login"]
+  }
+]
diff --git a/static/fixtures/connectors.json.sample b/static/fixtures/connectors.json.sample
new file mode 100644
index 00000000..77ac1b75
--- /dev/null
+++ b/static/fixtures/connectors.json.sample
@@ -0,0 +1,25 @@
+[
+	{
+		"type": "local",
+		"id": "local",
+		"passwordInfos": [
+			{
+				"userId":"elroy-id",
+				"passwordPlaintext": "bones"
+			},
+			{
+				"userId":"penny",
+				"name":"Penny",
+				"email":"penny@example.com",
+				"passwordPlaintext": "kibble"
+			}
+		]
+	},
+	{
+		"type": "oidc",
+		"id": "google",
+		"issuerURL": "https://accounts.google.com",
+		"clientID": "${CLIENT_ID}",
+		"clientSecret": "${CLIENT_SECRET}"
+	}
+]
diff --git a/static/fixtures/emailer.json.sample b/static/fixtures/emailer.json.sample
new file mode 100644
index 00000000..8ffc8dfc
--- /dev/null
+++ b/static/fixtures/emailer.json.sample
@@ -0,0 +1,4 @@
+{
+    "type": "fake",
+    "id": "fake"            
+}
\ No newline at end of file
diff --git a/static/fixtures/sample.env.txt b/static/fixtures/sample.env.txt
new file mode 100644
index 00000000..a9639403
--- /dev/null
+++ b/static/fixtures/sample.env.txt
@@ -0,0 +1,11 @@
+# example env file for local development to source when using build-units
+
+# dex worker
+export DEX_WORKER_KEY_SECRET=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+export DEX_WORKER_OAUTH_CLIENT_ID=CHANGEME
+export DEX_WORKER_OAUTH_CLIENT_SECRET=CHANGEME
+export DEX_WORKER_DB_URL="postgres://coreos:coreos@localhost:5432/dex?sslmode=disable"
+
+# dex overlord
+export DEX_OVERLORD_KEY_SECRET=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+export DEX_OVERLORD_DB_URL="postgres://coreos:coreos@localhost:5432/dex?sslmode=disable"
diff --git a/static/fixtures/users.json.sample b/static/fixtures/users.json.sample
new file mode 100644
index 00000000..31ba2d1f
--- /dev/null
+++ b/static/fixtures/users.json.sample
@@ -0,0 +1,15 @@
+[
+    {
+        "user":{
+            "id": "elroy-id",
+            "name": "elroy77",
+            "displayName": "Elroy Jonez"
+        },
+        "remoteIdentities": [
+            {
+                "connectorID": "local",
+                "id": "elroy-id"
+            }
+        ]
+    }
+]
diff --git a/static/html/local-login.html b/static/html/local-login.html
new file mode 100644
index 00000000..35649688
--- /dev/null
+++ b/static/html/local-login.html
@@ -0,0 +1,180 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <title>Login · CoreOS</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="apple-touch-icon-precomposed" sizes="144x144" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJAAAACQCAYAAADnRuK4AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDoxOTlBODc3OEVCNTAxMUUyQkIzQUMyRkYwM0VCQkJBRSIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDoxOTlBODc3OUVCNTAxMUUyQkIzQUMyRkYwM0VCQkJBRSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjE5OUE4Nzc2RUI1MDExRTJCQjNBQzJGRjAzRUJCQkFFIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjE5OUE4Nzc3RUI1MDExRTJCQjNBQzJGRjAzRUJCQkFFIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+k0boOwAAC9hJREFUeNrsnV1sHNUVx68XJyF2VTaCOJFC4qEP2a0AsYaHgAB53TZNX9qs+9CqCMWxEHlq6/iFSqiSnadKeXGD8pRK+ENVUfuA12pfUKp6oxKVVAK7qipsP8DaKRKEoJiHmI8U3DmTM/FkPTufd+6cO3P+0jAJcta7M7/9n/+5985Mx+bmpmCxoqoT/tPR0ZGbDzw4s1I1dwZuvbgHVUO+VAP3TXNbxX1z9sThRl6OJZhPh/WfjAKEsFTMrR/3hqJfDTAtmtsl2GcVqswBZAIDgNQQmBqxt1dHoOomUE0GiA404CxDCIyhydtuIlDTJkyLDJB6aIrm7iSCU9H8iwwATZvblAnTOgOUvNuMIDxZ1JS5ndPFlbQBCMPwWIROKbS6bn0uStdWxaH1D9v+zMaOe8XV4n7rz0s9vUm8DQjdZ6iHb/IAqQSnbEJzdOUt0ffBcqR/v9xjiOvd94k1EyyASxJYpEEiC5Bqx3nhylxkcPygApCW9xpxgSIJEjmAsA2fUNWCQ5l66W8zFkRJC8rewoMl8c6Bslg4UIozFDBKZRiAFEAmPOMYkIsqft/T7/9L/GzhDSXwtIPpslGJ4kzrGLTHGaCtzmpSZTsO5eoXb/6RhOte7y6KuYf7LaAArJDt/3CaHVvqAKHrjKn8nSrLVlhXulg6Ii4ePhIWpDNpuVFqAGHWmRWKBwEBmrN/foUcPBJAAhcaVJ2NUgHIhKeGJauo+uT8an5GlK41hQ6yQYLyFiIbQUmrZxagNEqWraMrV6zQrJsgI73WdyxM56aspCkDCOeuJkVKM+QP3FwX429cIF26/AQAAUgAVMB2fzjpuTUlACE88yLFSU+dSpdfWQOILj/0WNBcNJAkRMBOQUGLvpAmPDBFkQV47CbghX/OWUMQAdzUOvZ4DhJTYg6Eb3w+jbDs1Nm/vGKVsKwJStn5Z35izb0FCNcDSYwXJeZAVOCB0eYswuPMdfAZfWRFiKScqJBVeEDH/3NJZF1Q0mBLC6JCVuGB6Yqsuo+b0wbIRYlAVJAID7zBWQrwgL6/ckXkSfCFCTBFY50jPFd0AHK06gaVfJCVziuMAs7zGehERTIACcWz6Zx9YkNkr4BIHyCcniB1DVbff5dFnhUQohqeu/QAwonRMUoHDwKlzlMWiiEaw3OoHiBckjFJ7cA9/sGSYG1BBOu9/eIHnkvlDkSm47IF37YkFsfr3p35jBPZ3bM6gLB2krsiNO/Zx6us+4xYV6LmoUIEeCrUcg+XL3+BC3ldLIl5qJI4QBRzj9OuWe318zf/5BeqJxMFiGrpYniCCQZYfUJ16FJWCAEPJPURqgennMOR56hfNJ88NBKmKwvjQBPUui52oGiCteEeE81FPNfyAMJr1WtUDwgcjLzMvMsQ5CCfCwxqeM6lOdAY5QMCt2NhhXdsH9cekwIQklilfDDKH8vPPx3dXaLz0W9v27JWyjxUDeJCnbq7D+jgjY+kvt7O7z0rdr/4vAWRmzZvboiv3lsV//v3krm9a226dmWwcsHj4kU49w3PL5rXonokcJ56PT//+lmp8HSdPhXq3wBQt956W9z6x9vWXifBpUIv/fCXXpdRD7S7L1GQRfXk3eeQRPeBEhUWHrvc7fzus6L716fFN1+dEPc+9+O27kXxC3jUe/XmWKQMhMPaVeoHoCQx/3SNnor9GoWeB0yABu+ApIOOLl/xGqGuek1xeDnQiA4f/tCND6WVLjj5MkO4DRL18B3AhUZCAeS4DzN53X/zUymvk5RbAJTf+M3LnqFcAxc62W4NdTsH0gIey4HW4zsQOIRM93HTruPHLJDu+VYvyeNoraXyXg5zMgxAQ3mBxy5fKgTwAERUS5rPxQhDgQDCwKTF4wNkla8dTz6h7D1DGQOIVEEbRjAuVG4/ql9xC9MFXd1HlgMBPGlkExguoAjR083FUC7kBlBNG4BuyMk/qeUOEyJq5cwnB9U8AcJ1IIYuAHXd+kICQOVUPwMMPlIK1j4XJhita4UKuroP6GBMB4LSlfbJg/fQdfpFUi2+z9rymhdA/ToBFPcCQirlAyDefep5XcpYfyYcSEaAplQ6YC6NCtDwxfToxtwdKOgKNDLu8+UXEgA6ROszjZ4iU8q85hidrDgdSKtHR+6WcP07tVFhGA3fdfwHJN5L2XuVZ8UNIK3yj4wSlvT0RRTBlAcFF/K5v1K/9g6UNfdxdmUauJCrAxk6ARD3KgzKM+NURqgPtnd54y6AdAvQtwGKNw9GeY0OlFaV83NRYoLNTEFH98mDdjz1BPUvqZFrgKi18NsAIuBAPkH6LoB6dQNAxjQGZdnXpRFWr9YOlIf7IFIAyKMTM1q7sFypsG+vBgCV6R9H3FdzBxDBQcTtOS39ZOHRyldz7UA6iEJO84sKDBDnICkljMVigFgMEIsBYjFALBKyb2SVpjzuG8QAUddnv/u9BVGaWjhQYoB01MZvL4gv//r31OGBx4t7qZNPFS19fe262Ji4kPp9F6F0vdZ3zPfnGCBC4Hz+h9dTdx1bZ79zwtd9nAA1RM7mw+CEpT0fZt+cE6ChcqdXcJ7zz/xUrBX3+/1oI9cO9PVHH6cCkPP2wNTu6ArQvHrkR0Hg2eZATe1CpvlNob4mCFwOQAVgboPzbupdVTtdPHxEzD3S79u2O9R0AqTdswKu7tkf69nwX723ttWK7tsb2o1sOOxSZL+eXYp0ufn4co9h3Wh8qSf00pFVrR0ormCMJc+CgAzgXH7osagv0cw1QHlVDMdxBejOow4GZ1Y2dToQ8AxQnwensRx5EZwGck6Q1jyIZk8cttjpbCHK0MmCWd7QLDxYEu8cKPtOR0R1n9Y2flHwBYba5xqAZcGERkKJ8tKiG0Bwk2BtbjAVZqwiy8Asm6As7TWsvUJXvtTOgfTpooKPV2QqAK8V95nuYoir5j7FMr7dgeCZUGaQ1qfG79yVWVDAXT/pvk+s7dm/9WdCjut8fljrVEZdlzIGBxRGTu0rJ+FSZ12uVoWACwOhIMgq1t/NzwNfCg1Kc935l06X2qZNDoLxjLmH7/5/AJH9ELr74WnOG1v3EXK7TLcU83nzUFZa5Qyw17uKpoPcLjVre/aFmSqgqkteAAFdEzp/OjhBWyewtwU47tRkO1ChpbY1BY9Ks9qriYy4A+RGGIvlxYYbQNN8nFhtNO0LkGlRi0KzMSGWEi0iG74OxC7ECsxEO4Cm+HixgjDhCpBpVesMEcsJDzIR2IFA5/i4sfxYaAsQBqYGH7vcq+EWnoM4EOgMH7/cy5MBT4Bw1pVdKN/u04gMELsQu4/fD/gCxC7E7hPXgdiF2H3iAYQk8iRrflQP4j5hHAg0am7rfGwzr3U810IqQLgOhAcXs69zrWt+vHTnytSgGpxZWRA5e75qjgQz7n1BfxjYiXKPxGE+zplV6HMbGiAc1uauLINdl9eUhbQSxqWMS1fcEnaHIe7KMtN1DUb9x5EBwqTOeSgDuSdM1yUNIISoznlI+9wTa4A4cgZqyUOzQqMrWlmWYLR5MM4LxM1Are0fX8mhUWiWFT+kOBC6EFwADp2ZweeHtCDv9LVb45yWA9kL8bkz06DjkgGPlBDtAhFY4wBDRBaegSiDhcoAYojyBU8iADFE+YEnMYBaIGryOUw1MCcGj9QuzKc7mxc8b5ZGqz4gMzAn2oX5dGfgRLwkVp3qScOjzIFa3Gjc3I3x+U1UMD0xruIXWeyoBAghgimPSXPjZxXID8vDcee2yAOEEBlQ3TgXSc07g3Fm1bUCiEuaniWLHEAIUQVLGrtReNcZTrJF1wKgFjca4WwUKOucS8t1yALkyEZwo3NeW9S+PR9VnXW0AcgBUhWzUZWZsdTArNOg9KbIAsQg0QZHG4ByDBJpcLQDqKVjg6B9MqPgTGFA1mJ5sHYAOUAqIkRDGWj/ARa4ifeUirkrBsjdlYawczM0edtN7KimdXGbzALkMgwAIPUTHAoAYOBhbXUqbTgDFCx8VxCoikKHamJpAmAWqYdhBig8VAZuvQ6ownZ4DQcsq7hvZhUWT4BYrKj6vwADAPdLkcDegrLvAAAAAElFTkSuQmCC">
+    <link rel="apple-touch-icon-precomposed" sizes="114x114" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHIAAAByCAYAAACP3YV9AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDoxOTlBODc3NEVCNTAxMUUyQkIzQUMyRkYwM0VCQkJBRSIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDoxOTlBODc3NUVCNTAxMUUyQkIzQUMyRkYwM0VCQkJBRSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjE5OUE4NzcyRUI1MDExRTJCQjNBQzJGRjAzRUJCQkFFIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjE5OUE4NzczRUI1MDExRTJCQjNBQzJGRjAzRUJCQkFFIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+3CoQeQAACXlJREFUeNrsnUtsVFUYx88M76mPIZRCgnYGFlCDhhYWaIy2FQ07h7pCY+oQIisNZePCTcvCmHQzhbjCKA0x8bGQjrohikwF4iPBliiRsoABJRGsYVxQXgKe/+25OL3c99x7HrfnS27vTDvTuXN+9/89zj3n3NTdu3eJNvVtLn6kUinlDrznwJl2usvTDfsce2xufqzKthrdTtJtHM8P9q4eV60tIMaU8UMBkBRcF91h62T7OK1Ct1HsKdiKBtkYuCzdbaFbgYHLCjqUGgNbptsIBVvTIP0BNOEVJRXAMKBSoCMapL36AG5ngBgn2hBf9wCsaJUKB8kA9jGAkbnOjosTZP3F02TN5fOk+erMNp5sypK/m6Y/6kJ2GZmav5BMLM3T3z9s/C2k6wXQIVFAhYGMC2AbBbd17BBprf0Z6v1T8yjUlhy5sHg5GVuxhoJergRQISApRLjQUtTJywtnfiQvU4hRGsCOPbKG/LyizQAbAOguCnM4kSBZ3VeKo3TY/lOZPH3uZKzHD6jHV64jX6/e6NcFVxjQ8cSApBAH6K4/jv/NA6LVJlrypLy2k5xuyfl5+W4Kc0BpkBQgMtCDrPclcgNAgBRliKGfdGz2AxSq7KFAq8qBZPXg/rgKeSQ0b317gGRuXRdeh/hUKGLntjjqz9hAxulKTRs4tC90dhqXIYZ+TBWKeMrT1UYOkpUVpbh7ZQqnRknh11EpewkA8YONBa8sd5glQjXpQDKIR+KKh6bBlQ5+uVcKl+pmAAmgLupE3OyOAiYYpiNUYuwQYagVZYdo9i55uH+01RHWdg1bWiWI6G7jXWo0erxIyFyOOTKYaVUgmrFRNYP3QInkcuyRwEyrAhEN0vHHBFHVkJy51LwNw2xEkSVeEM3iX4XY2EAHhtmFyQ8kqxOLPBsBneJJMA+YRda28YNkPTb9PL88Mj/rdcUEw+xnbRwfSNZ3up/3F0+KGq0wXRKg/aytY1MkOsC5D4JSOcnxSoAcSpMsa+voQTLf3c77y+Kqv+pJjlcHh0OnQXuQeJn2CbGdd1z8v4fkNEmy4SR949hnTidrP2v7yBRZEvVF0dWVdEMit/3HckNtn/ahRpQZXaK+YJKyVa8T1uGk7WIMwoOsuywlxDCccTYZVOngYktevT5eiuwj4obqk7a/qrMKJCA6jAQ0h486muP1SHYGnBMJcvCrvQ251vSyZjJ/07Mzfnf77Hly5/KksZfVBrtfsxs2goZYaXf9EgznyqrGRuPj/OefIZm+Ha6v+feX38itH04Y251Lk/LUl6dGKcheJ1UO+FakDGpE4H/z2Keh3jv3icfIA+++Heg9gHrz8FFy85ujyqnSbYRAUSREWCMDqzK7doSCDwU/9GHJULNo2+ocK4tBkp2dor9IW8iMFRDSLc3h4yp9L4BC0YixIk9khzbY6Qsk63nPiwb56JVwilzw4uZIPh8KfXDvO0LV6dCpnre7OmKnyIIMaXiY/tU5q3LGFpWlmjKGOsO46mjq6KpTwldwBVk34VSotV65FM6tbopHPfi/omA6XMIrWjsIrIrcQiSwJSHLjnlPbYjtmETBdBmBt8UNZEEGkM1TwUEiMWkkyZEVpjHozL4PtuAGsksGkK0hEh0kJzwMMHknQOvtL+V12YJk69hkZQCZuXUjeKKzMsft+Ba9/irX0sRhhESWMbtPkVKoMWzpMWdVK7fjM7NZnu7VoYPEFmSnLCDDlB68XGv95/F0sQ5xslNaRYaBKKoHZuErL4nOG2Yq0u+4EFlryHTLUiHHiiyZlyqdLrKb7ExF5onCxjM+8uqEsPNUDr08+XqQ7SqDTDU1CftsxEperr356j92v56hyHWyQFkTYniHSEXC5j25QWTb5OpBZtVWZGZWgMzcvO7pWpWOkaKNV+nTWruUbJCiFTnt3nOiPjpvrSMVzlpzwo8h7g57mNtVoUSAnC0nU7MGmXzTIDVIbRpkAu3m4e9i/wy3pbk1yAhsamgflykHWL3ZsZbVGMIbJgNNlfYZ0w14qBHLiCYaJGZW8awl8Xk3vjjEbZ4IIA4+1+v6GhNklSjcu3P36hQX9d36/oQx0YfnlDwTostyodXEgIzD4C4BD3vjsYBpd4iJ5cc7vVZkngFS6Yn6t89euPcY/a5ebhaKMlWMvfl+AJt+LnYSbMC7GMwAieHMUowyx+2Npu/459+uvf9RIrwA3ChU6JbU2Nj5epDjRJswA7jj+Xa/CrTauDVGauOsPgMg3TxioC/Xem/qec+BM1LcbBmDjN77fDB5nQbsBmq4zxb2Ie+Md58d7F2dsi4GUSESjG1t8OyUDhzufIe4H9JtelnFrkNglEgySBmNoNJCgjje3ykwwJrMZCNVnIeN2oEE3X4ZGgZxA+NTlki0hJl5A9GpeQsMlQEYnsektMCKnLE8C42TV4iEI+qMSSxsBPoimwktbQ0udWaFgUTkGnPxFxYvk9Xd12h8XGzUwjYLJlVkqSetrqu+sa23KyqvnZWJb6X+ifUyVploU8XKbiBHdPsoYyOOINnSWMO6jaS3YesyZmkvyWqT363el7WaRrNXLCiY1+0lpVWpGlfW/8JtUcE9ur2kNVs2TiARJ2u6zeSrHZ1yGFuQLJBqVUqoRqc7wLoNhxzSqpROjUNOf3QEqVWpjhq9FKlVqYgaPUGyM2CXbkfh5nmre1+3r6d1JW7B26XbU4hVKMRutxcEuX29VqVANfp5kS+Q9IzASK3duk25227W9p7my7XWudgxovjiSgrZOIXY4eeFQVzrPZY6i+WWpfYEeUMgkPQMqdLdNt3Osds21tbxgGQwR3S8jD0uBr7AHyhGWuIl7n5e1O0eqeGCcWCPFyZGWtNiPWckwuSmkTIvNEjW09CtYUYGsdur9yYWkBqmPBAbBqlhygExEpAapniIkYG0wBzWjLyz0yghNlR+eJQmA0SSCUGS1okDUf5Dg2EcIBlMzCFBrZnV7AyD+raFKfaFgmQw8/C6RHe0Ix72BO12kwakdrXxuFJhIBlMqLJEZs9IgwqZHqIReybPFWQd0CIDmtTYWWMAuWXvQkAymIDYR6ZvxZ5NEEAMHx2KsqyQGmTCgAoDKA1IC9AiA5pXBGCVARwWBVA6kDb1Z4HIe60Tsa8cRz2YKJAWlZpQuwS63hrLQDG5dES0+pQDaQO2iwHt5FDCABwWI8Lg4IrsbaMUSIe6FPEU+xx7nA8QY6t123nW+1LlUffFBlKb+vafAAMAbnyDAztTLO8AAAAASUVORK5CYII=">
+    <link rel="apple-touch-icon-precomposed" sizes="72x72" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAABICAYAAABV7bNHAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpEMUQzNTREQkVCNEYxMUUyQkIzQUMyRkYwM0VCQkJBRSIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpEMUQzNTREQ0VCNEYxMUUyQkIzQUMyRkYwM0VCQkJBRSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkQxRDM1NEQ5RUI0RjExRTJCQjNBQzJGRjAzRUJCQkFFIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkQxRDM1NERBRUI0RjExRTJCQjNBQzJGRjAzRUJCQkFFIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+mWYVywAABg5JREFUeNrsnE9oHFUcx99ut2n+KE5pmhQ0deIhG6mluwpG0LIJKr3Z5CIopUkI9ia7vfQggvQggpcm6k1K/iCKp3TFSykaiwqmIFnpwWwONm0t2DSl00PT2NbG93t5E2Ynb/6+38zszu4XXnaT3cnOfPb3+73f+733JrGxsUEaslYKfiQSiVA+bGhmSaUPGd5ytCn8uZ1KtGm0XeTPS7PHe5bDOF8wngT7ESAgCgUADNM2SJuK9G8B0DnapimsUs0BolDAMkZoyyNCsYM1QdsUhaVVNSAO5gy3FsXtca9e+YO8eGORpFeuktaH62RtZzO5vnsfe2217SnaFFLeq5JruzvZaxYCOFO0ncYChQaIgylwi3ENBmCc+nGG7Nf+cf1Z15R9ZOGZNFl4Os2eW4ACixqXBYUCiMLppw+TXl0JoAAcgORXAOhCTx8DJrAscL1RCumnyABROGe45XiSH8uxE8C5kO5jsASgwJJOhgqIu9Sciy5aqPd/+ZZkb5TRozXA+SZ7hPzafUiUKgx4dTlfgHi3Pecl1hjVSwPxqbnpQLu1codKzr78Fgvuptg04CUt8AxIFg7o0+8/I+33NBK0wJrO9h1lwdwvJGCTDMty9O48DDh6nANXfmfhvPHPLDTwa3GlZFhwQG8uzYc+loLPHLtU9A0p6QKOggEHeiysXsuP5VpAUjAsSBpOVNbjBpIUIJ7nZDBOMPt3mUQtgGSKSRl+jd4B8Qy5gAKH5jwyGTN2TDLlYAV+re4Bcd+cxDqp3pVlUk0amy+ae9NJq3hkZUEFzDJFEFmzbAowduk7459UK29JWlhPHutk4JsKK/fxojS1aohJBuVFVpQSHPsRRq+lq0u76ep9TW8cJi3vHSOJtlb2+39/XSWPV1bJw99+J48u/0ke31xFhwQB21AJUPi1VwxsK4YanOAVTEBwEk5dfOrg8+SJTz6wfQ+A+rd4nsHCVPGFHCkeyBmHIt36oFY01BjBhLOZIDpbUPO7Q47v2fnKSwxi68kTW1aG0quV5409rF4qtoxBeWwz7rpjnz3veO5ZZkFu1fT6YfLk5x+z47ACtilHywsB8bGJigkHPtwp/4EL9qpkRzuzJixIphCgGsdpRgsaxrae/Xec3St1sNfX/wY3w4IkGCcOiwANYgPa49C9w0XKXCAc3/ZhASUmmXK1wQpAfMZTxQbUvqY5xh9Zgbu1nDiGPVZUOZMtC8qQCOQlODvFMdn/BS5mipeZwAFB/dn22+9sR/usXUePYMfMCkC5KCwI3ANLkCfJAk/fqhhU54yAFBIDybqZacyoBO5iLQ/WQ4lBRiuSA3TX0sUCUdg1aEyXdaoH1aRk0wbRsChWgDCGRrEGtHFvTep401R1/ADd//IrqePLHdtdNBUHMFBEW/96VqqYBtYDK0NCBQQLnILqyaAk++jyInnww8/suex5fvHa28LlfTqgUhC50P2mZtvXoYTqNETQrQLq01CXht8BiGy80QWLrqDsKoBTMgLSoooZsnHDr2CRFdSiRYHZyEQHBIu0++PejTusaTTrotnF0LVIe4V0hLOqbPkwPYfFvSp7tLEWkUqBAwobxm3a4EsBS7mudHoFIgS0NS82NLME82Eq5klvzqreJV2GYpS5RrTHZuZVv2izVYLYYnMKYq1pl9V6aRktzx7v6QY2xm4e9j4UsL/VVf6t6ioeqAmDPCfKpKdJQ9tYmKee0d2sBsXci43tBFPPEw3jqWRgBjQVVdJYJdJ3DIkB8VUNU3UMaNueM1G543SdWpHGr53YAuIE6zEWTYg2u1gVzMbJ5n6ruum5+DUTV4A4ydE6AjRqtVXKsuTKd+qN1wGccbtdiY7boWjyuEAiWtwQgmAPftbqRbfboQZi2qtp/Nps5QiI+2bcIOkb6zRpQBxSKUaQPO06dD0vFhNInvetepo4rHFInuF4BmSABOWAWirTsnP2cyOUSG4sEEGeE+6NBUyQ+omPW1OENHyQvjWF9OIFfgLZKqoC6KPyrAwcFBcTWJO+pWiEhL/usXpvj2MBCiA1brDkAlbjFl0eYKmkFm/y1pC1/hdgAAMA2vh8S7PiAAAAAElFTkSuQmCC">
+    <link rel="apple-touch-icon-precomposed" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADkAAAA5CAYAAACMGIOFAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpEMUQzNTREN0VCNEYxMUUyQkIzQUMyRkYwM0VCQkJBRSIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpEMUQzNTREOEVCNEYxMUUyQkIzQUMyRkYwM0VCQkJBRSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkQxRDM1NEQ1RUI0RjExRTJCQjNBQzJGRjAzRUJCQkFFIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkQxRDM1NEQ2RUI0RjExRTJCQjNBQzJGRjAzRUJCQkFFIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+z2OEzwAABLdJREFUeNrsm01ME0EUgF8L+ANRa4JookDxQDFqAE38CRJq1Oit6MFEY0grkTNe9GJSOHg20RsJgXDxCPUk0QhEjWJCgKiRcpD6QwJIQj1AVASct5nW2e3udmd2tpTqS4alpZ19376fefODa21tDXJd8vGHy+WS2unFnkk/uWCrJs1LWo3Jx8dIi5E2Ttpgb1PloExd0Igu5YcESALWSC4B0vDqsdFVnLQ+0iIEuC8rIAlckFzC1GKGUrwYh7rYeMr70V1emC/aQZruc0ELtxPY7nWBtAqHcmW0H85NDpt+ZqlgC4zu88EEgX5ZUS0NVgiSwCFUF425tNL8JgJ1U+NciiWAIwcbtBbGeA0R2JhjkDTuuqzGXOD9EATeDdmKKbTqw9rzCjgTsyGr8coFSQDbqHtakrL4DLT1d0jJkAgYOdQATyqPs2+j+7ZJgySAaL0gj2K3B3rANxcDmTK61wedxwOsVbsJaCgdpNuCBbkBq+Y+SQdEqZ2Owq1nPYqXUAlS/UzFbcFFg7zK1MXGHKteEFAHtE0IkiaZMK8Shcs/uLOpyD00oGGqr3VIZpjgd6mv0YzUowh6ffiRcqXSRfW2bEnLw4RWjkxPZKzwRks2D0cSLz1GhnEbVDJ+O8khk4L3Y6opP9U/rSXDojfErLoeggUH47Zh3amWxope0Zv5vhkPG66iQii60wr5hw8k3/v99gMsvx5R2ursvK34xPq48xhOgsCLHGyd65ZlRSVGFmYM/7Y5cEEFqDxh8nrrjWuwvfMeFN5sAffuYuF7Y0bHmY4eh1szZHjtQJbGZ00gz5t+d9OZeth2/y4UnDgq7rbvk3Wylx1SWEsG7MYG8yRVgoqju6aThEtvOlsvloTUw1dAD7LRDqBZ0ik4yWedwtYWIYtqChG1JemajMep7JdXUcavsGCMVv1Nfh7KlbSk3y5Iadw46eTtL+fuD113y9VLdl1WBVkto8ySBcgmI15roh5MbqhmIb1OuaqVhGMmIrFZvPgdWK4EZI1TmdXO2CcKyRQlNWnnk4JPTw1ZsstWv9oCQkTc8A/If8hskJWP/DMbZqErdRaSTbK2uAQ/I/2kPeb63mfPnpQVeGmQuJ/h03l/de4bl9VWpj7D8qsRZRqGoDwSLfHCg1OXDS05ZncYMdiwURRegg7dLIsPAOeRCCPiluy9cUtBZw9ljIWMO+l2v54+d6RvXGx+UVGjXA0kxkIO2a1ftS7ihGC8RUvKYYK4pQkYK+Ms5KDdVQG8OcaEjJVz7AdlgvSJD+8LgcPfBWRQKS0TeyFkWrIgc7qFZZ5RFWSUuIziWlDivU2VO5GPza64FRaUl209spXmlT69YiCSY4VOkke1dUdcdsrJaVcGJUZctULJ7jpbd+05YkUVR8ombA5YM2lFI0vmgjVT9NfdTifWHAAJi1vrIHii67Sq4jLZTg85Weo5JHGqt7X5JD0nE9pgkIbnewwnzfSczEaJz3azcz1pj7iInP7IsJgec7F0xIV20L0RAbnWeGhH7VnoopbyhqNn65zMojxn67hW62jHtYl52nqMg3h/3sO+GTnvKqNUg0yed80wrDCcVEhNvObmGXQDYD9k238T5Lr8EWAAKzkwStOSY78AAAAASUVORK5CYII=">
+    <link rel="shortcut icon" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDoxOTlBODc3Q0VCNTAxMUUyQkIzQUMyRkYwM0VCQkJBRSIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDozQTdBQzgzMEVCNTAxMUUyQkIzQUMyRkYwM0VCQkJBRSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjE5OUE4NzdBRUI1MDExRTJCQjNBQzJGRjAzRUJCQkFFIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjE5OUE4NzdCRUI1MDExRTJCQjNBQzJGRjAzRUJCQkFFIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+Mt83BAAAAsFJREFUeNpi/P//P8NAAhYQwcjISFBh4KJbCkAqAIj9gdgAiAXQlHwA4gtAvBGIN6yPU3tAyEyQ5xnBBB4HAC0GWVYPtRwODJ/eZLC5f4GB6/dPMP+GmDzDIwEJhptA+hsrB0hoAxA3Ah1ygWwHAC3vB1IF6OLW9y8yJJ/aiNPRRxX1GTZq2zO84QYH0gSgIwpJcgDQYpDO/dCgRgEiXz8wdG2ZRFT87lYzZ9ioYw8KEVAoOAId8gHdAUxYfI3TchDwv3qQ6ATmeuskQ9m+RSBHg8zaDzUbBTBh0YfTcpDvQcFPCpD78IKhYecsuCPwOgAa5wa4DAMlPHIA1+8fDDlHVoFoA6gdmA6ApvYCfAYZkekAWEj4XwFHXwHULowQqCdkiPor1KzNO6mFQWDLYgae9ioGjqggBkZuLoJpAhSNyHYxoRUyeH2ADNhcbBmYleQhpZmuJtABgQx88/rB4vgANBEHQO2Eh0AAwXj89RPVAc6YFoFCgKsgDa8jQIkYlCZgdsIc4E8w+F+jBj/I17gAZ2oM3uhQf/UQbifMAQakJChCcQ2SZ/f3IBSdBsgOECDFAbC4x1vL6WrglNOAhIAAroKIOtUsnigiVBJSBfy99xCn3DdWdtT2ADXBn8vXGX7tPczwa89hrPKgKnu5oTuGAz6Qkg5AvvtS2YYh9v/rN5x6QFUzqHYEYSQ74Q4AVZcOxDoAZBHIp/gAyKdvufmBDRUFcCMFxEcDF5AdsJGQA0ANDJDr5d6/xG+xoDisRUQIbER2AKj51E9IB8hgUNOLSmADPBdAG5Ab6NgYhjdakbNhIx0d0IhRDkBbrxPoYPkE5JYyRqMUWE2eJ7VuIAFcAFpuiLdRCmq9wrIItS2Hmo2/KIY2nantCKzNcqxRQEzHhIw4x9kxwVsZQTUakplFQXoMcVlOVAjQrXM6kAAgwADR0Rq9/0mR6AAAAABJRU5ErkJggg==">
+    <style>
+      * {
+        -webkit-box-sizing: border-box;
+           -moz-box-sizing: border-box;
+                box-sizing: border-box;
+      }
+      body {
+        background-color: #F5F5F5;
+        font-family: 'Source Sans Pro', Helvetica, sans-serif;
+        color: #333;
+      }
+      #logo {
+        width: 300px;
+        height: 40px;
+      }
+      #logo-link {
+        display: block;
+        padding: 20px;
+      }
+      #heading {
+        font-size: 18px;
+        font-weight: 500;
+        margin-top: 0;
+        margin-bottom: 10px;
+      }
+      #container {
+        margin: 45px auto;
+        text-align: center;
+        width: 100%;
+      }
+      @media (min-width: 800px) {
+        #container {
+          width: 50%;
+        }
+      }
+      @media (min-width: 1200px) {
+        #container {
+          width: 33.3333%;
+        }
+      }
+      #panel {
+        background-color: #fff;
+        padding: 40px 30px;
+        box-shadow: 0px 5px 15px rgba(0, 0, 0, 0.5);
+      }
+      #contact-link {
+        display: inline-block;
+        margin: 20px;
+        font-size: 13px;
+        color: #428BCA;
+        text-decoration: none;
+      }
+      #contact-link:hover {
+        color: #2A6596;
+        text-decoration: underline;
+      }
+      .btn {
+        background-color: #fff;
+        color: #666;
+        box-shadow: inset 0 1px 0px rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.25), 0 0px 1px rgba(0, 0, 0, 0.25);
+        padding: 6px 12px;
+        font-size: 14px;
+        border-radius: 4px;
+        border: none;
+        cursor: pointer;
+        fill: #666;
+        text-align: left;
+      }
+      .btn:hover {
+        color: #999;
+        fill: #999;
+      }
+      .btn:focus {
+        outline: none;
+      }
+      .btn:active {
+        outline: none;
+        box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+      }
+      .btn-icon {
+        width: 24px;
+        height: 24px;
+        float: left;
+        margin-right: 5px;
+        /* B&W CoreOS SVG logo */
+        background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiBmaWxsPSIjNjY2IiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgdmlld0JveD0iMCAwIDIxNSAyMTUiIHhtbDpzcGFjZT0icHJlc2VydmUiPg0KICA8Zz4NCiAgICA8Zz4NCiAgICAgIDxwYXRoIGQ9Ik0xMDcuNDc5LDEuMDc1Yy01OC42NzcsMC0xMDYuNDA0LDQ3LjczLTEwNi40MDQsMTA2LjM5OGMwLDU4LjY3Miw0Ny43MjcsMTA2LjM5OSwxMDYuNDA0LDEwNi4zOTkNCiAgICAgICAgICAgICAgYzU4LjY1OSwwLDEwNi4zOS00Ny43MjcsMTA2LjM5LTEwNi4zOTlDMjEzLjg2OSw0OC44MDUsMTY2LjEzOCwxLjA3NSwxMDcuNDc5LDEuMDc1eiBNMTQ3LjQ0OSwxMzQuNjI3DQogICAgICAgICAgICAgIGMtMC44OCwwLjEyOC0xLjc0OSwwLjI1MS0yLjYzMiwwLjM2NGMtOC4wMywxLjAzOC0xNi42MDIsMS43NDMtMjUuNTYxLDIuMDc4Yy0zLjg1NiwwLjE0NC03Ljc5MywwLjIzMS0xMS43NzYsMC4yMzENCiAgICAgICAgICAgICAgYy0zLjk5NSwwLTcuOTItMC4wODYtMTEuNzg4LTAuMjMxYy04Ljk0OC0wLjMzNS0xNy41MjYtMS4wNC0yNS41NDktMi4wNzhjLTAuNzE2LTUuOTg3LTEuMjAxLTEyLjIxNi0xLjQ0My0xOC42MjMNCiAgICAgICAgICAgICAgYy0wLjExNi0yLjkyNi0wLjE3My01Ljg5Ni0wLjE3My04Ljg5NWMwLTMuMDAyLDAuMDU3LTUuOTY2LDAuMTczLTguODk4YzAuMjQzLTYuNDA4LDAuNzI4LTEyLjYzMywxLjQ0My0xOC42Mg0KICAgICAgICAgICAgICBjMC4xNDQtMS4yNDYsMC4zMDYtMi40ODUsMC40NzMtMy43MDljNS4yNDEtMzguMDQsMTkuNzUyLTY1LjQwOCwzNi44NjMtNjUuNDA4YzUzLjM2NCwwLDk2LjYzMiw0My4yNjIsOTYuNjMzLDk2LjYzNQ0KICAgICAgICAgICAgICBDMjA0LjExMiwxMTkuNTQ3LDE4MC44NjYsMTI5LjkzNCwxNDcuNDQ5LDEzNC42Mjd6Ii8+DQogICAgICA8cGF0aCBkPSJNMTQ3LjQ0OCw4MC4zMTZjLTAuOTY5LTEuNDE0LTIuMDA5LTIuNzY4LTMuMTE3LTQuMDY5Yy04Ljg2Ni0xMC40NTEtMjIuMDc0LTE3LjA5Mi0zNi44NTItMTcuMDkyDQogICAgICAgICAgICAgIGMtNC43OTEsMC05LjA1Nyw3LjMzMy0xMS43ODgsMTguNzJjLTEuMDg1LDQuNTQtMS45MjgsOS43MjEtMi40NywxNS4zNDNjLTAuNDI4LDQuNTA1LTAuNjU4LDkuMjk3LTAuNjU4LDE0LjI1NQ0KICAgICAgICAgICAgICBzMC4yMzEsOS43NTEsMC42NTgsMTQuMjUyYzQuNTA4LDAuNDI4LDkuMjkzLDAuNjU3LDE0LjI1OCwwLjY1N2M0Ljk1OSwwLDkuNzQ0LTAuMjMsMTQuMjUyLTAuNjU3DQogICAgICAgICAgICAgIGM5LjkxMS0wLjk0LDE4LjQ2Ni0yLjg0NiwyNC41MjctNS4zNTdjNS45ODYtMi40NzYsOS41MjgtNS41NTksOS41MjgtOC44OTVDMTU1Ljc4Niw5Ny40MDcsMTUyLjcxMiw4OC4wNTcsMTQ3LjQ0OCw4MC4zMTZ6Ii8+DQogICAgPC9nPg0KICA8L2c+DQo8L3N2Zz4NCg==);
+        background-repeat: no-repeat;
+      }
+      .btn-text {
+        line-height: 24px;
+      }
+      .btn-link {
+        display: inline-block;
+        margin-top: 20px;
+      }
+      .input-box {
+        height: 34px;
+        padding: 6px 12px;
+        font-size: 14px;
+        line-height: 1.42857143;
+        color: #666;
+        border: 1px solid #CCC;
+        border-radius: 4px;
+        box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+        margin-bottom: 10px;
+        min-width: 200px;
+      }
+      .input-box:focus,
+      .input-box:active {
+        outline: none;
+        border-color: #66AFE9;
+      }
+      .error-box {
+        color: #DD1327;
+        margin-top: 20px;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="container">
+
+      <a id="logo-link" href="http://www.coreos.com">
+        <svg id="logo" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" preserveAspectRatio="xMidYMin" viewBox="24.5 40.5 744 224" enable-background="new 24.5 40.5 744 224" xml:space="preserve">
+          <g>
+            <g>
+              <path fill="#53A3DA" d="M136.168,45.527C76.898,45.527,28.689,93.739,28.689,153c0,59.265,48.209,107.474,107.479,107.474c59.252,0,107.465-48.209,107.465-107.474C243.633,93.739,195.42,45.527,136.168,45.527z"></path>
+              <path fill="#F1606D" d="M136.168,55.389c-17.283,0-31.941,27.645-37.235,66.069c-0.169,1.236-0.333,2.487-0.478,3.746c-0.723,6.047-1.213,12.335-1.458,18.808c-0.117,2.962-0.175,5.956-0.175,8.988c0,3.029,0.058,6.029,0.175,8.985c0.245,6.472,0.735,12.764,1.458,18.811c8.104,1.049,16.769,1.761,25.807,2.099c3.907,0.146,7.872,0.233,11.907,0.233c4.023,0,8-0.088,11.895-0.233c9.049-0.338,17.708-1.05,25.819-2.099c0.892-0.114,1.77-0.239,2.659-0.368c33.754-4.74,57.235-15.232,57.235-27.428C233.776,99.088,190.071,55.389,136.168,55.389z"></path>
+              <path fill="#FFFFFF" d="M176.541,125.569c-0.979-1.428-2.029-2.796-3.148-4.11c-8.956-10.557-22.297-17.265-37.224-17.265c-4.839,0-9.148,7.407-11.907,18.909c-1.096,4.586-1.947,9.819-2.495,15.498c-0.432,4.551-0.665,9.391-0.665,14.399s0.233,9.849,0.665,14.396c4.554,0.432,9.387,0.664,14.402,0.664c5.009,0,9.842-0.232,14.396-0.664c10.011-0.95,18.653-2.875,24.775-5.411c6.046-2.501,9.624-5.615,9.624-8.985C184.963,142.832,181.858,133.388,176.541,125.569z"></path>
+            </g>
+            <g>
+              <path fill="#231F20" d="M344.891,100.053c12.585,0,22.816,6.138,29.262,13.062l-10.064,11.326c-5.353-5.192-11.175-8.495-19.041-8.495c-16.839,0-28.953,14.16-28.953,37.291c0,23.448,11.169,37.608,28.32,37.608c9.128,0,15.895-3.775,21.717-10.228l10.067,11.169c-8.335,9.598-19.038,14.95-32.099,14.95c-26.119,0-46.731-18.88-46.731-53.025C297.37,120.036,318.454,100.053,344.891,100.053z"></path>
+              <path fill="#231F20" d="M416.961,125.701c19.352,0,36.822,14.793,36.822,40.597c0,25.647-17.471,40.439-36.822,40.439c-19.197,0-36.66-14.792-36.66-40.439C380.301,140.494,397.764,125.701,416.961,125.701z M416.961,191.945c11.33,0,18.25-10.228,18.25-25.647c0-15.577-6.92-25.804-18.25-25.804s-18.094,10.227-18.094,25.804C398.867,181.717,405.631,191.945,416.961,191.945z"></path>
+              <path fill="#231F20" d="M459.771,127.589h14.943l1.26,13.688h0.629c5.506-10.07,13.691-15.577,21.871-15.577c3.938,0,6.455,0.472,8.811,1.574l-3.148,15.734c-2.67-0.784-4.717-1.257-8.018-1.257c-6.139,0-13.539,4.245-18.256,15.893v47.203h-18.092L459.771,127.589L459.771,127.589z"></path>
+              <path fill="#231F20" d="M541.121,125.701c20.928,0,31.941,15.107,31.941,36.667c0,3.458-0.314,6.604-0.787,8.495h-49.09c1.57,14.003,10.379,21.869,22.811,21.869c6.613,0,12.273-2.041,17.941-5.662l6.135,11.326c-7.395,4.878-16.676,8.341-26.432,8.341c-21.404,0-38.08-14.95-38.08-40.439C505.561,141.12,523.023,125.701,541.121,125.701zM557.326,159.376c0-12.277-5.189-19.671-15.732-19.671c-9.125,0-16.996,6.768-18.57,19.671H557.326z"></path>
+              <path fill="#F1606D" d="M600.602,152.607c0-32.729,17.785-53.344,42.799-53.344c24.863,0,42.641,20.615,42.641,53.344c0,32.889-17.777,54.13-42.641,54.13C618.387,206.737,600.602,185.496,600.602,152.607z M678.49,152.607c0-28.639-14.158-46.731-35.09-46.731c-21.084,0-35.248,18.093-35.248,46.731c0,28.796,14.164,47.521,35.248,47.521C664.332,200.128,678.49,181.403,678.49,152.607z"></path>
+              <path fill="#53A4D9" d="M699.738,186.125c7.557,8.495,18.412,14.003,30.529,14.003c15.732,0,25.807-8.499,25.807-20.767c0-12.904-8.494-17.154-18.723-21.717l-15.736-7.082c-8.969-3.936-20.934-10.385-20.934-25.808c0-14.947,12.904-25.492,30.059-25.492c12.588,0,22.658,5.665,28.949,12.435l-4.244,4.878c-5.982-6.452-14.32-10.7-24.705-10.7c-13.691,0-22.816,7.239-22.816,18.565c0,11.962,10.385,16.521,17.936,19.985l15.738,6.921c11.486,5.195,21.713,11.647,21.713,27.539s-13.061,27.851-33.201,27.851c-15.107,0-26.75-6.451-34.932-15.576L699.738,186.125z"></path>
+            </g>
+          </g>
+        </svg>
+      </a>
+
+      <div id="panel">
+        <h2 id="heading">Verify Your Identity</h2>
+        <div id="button-container">
+          <div>
+            <form method="post" action="{{.PostURL}}">
+              <div><input name="userid" type="text" class="input-box" placeholder="user id" autofocus/></div>
+              Forgot? <a href="/send-reset-password?session_key={{ .SessionKey }}">Reset Password</a>
+              <div><input name="password" type="password" class="input-box" placeholder="password"/></div>
+              <button type="submit" class="btn">
+                <span class="btn-icon">
+                </span>
+                <span class="btn-text">Login {{ .Name }}</span>
+              </button>
+            </form>
+          </div>
+        </div>
+        {{ if .Error }}
+          <div class="error-box">{{ .Message }}</div>
+        {{ end }}
+      </div>
+
+      <a id="contact-link" href="mailto:support@coreos.com">Contact CoreOS</a>
+    </div>
+
+  </body>
+</html>
+
diff --git a/static/html/login.html b/static/html/login.html
new file mode 100644
index 00000000..479ec4b5
--- /dev/null
+++ b/static/html/login.html
@@ -0,0 +1,207 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <title>Login · CoreOS</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="apple-touch-icon-precomposed" sizes="144x144" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJAAAACQCAYAAADnRuK4AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDoxOTlBODc3OEVCNTAxMUUyQkIzQUMyRkYwM0VCQkJBRSIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDoxOTlBODc3OUVCNTAxMUUyQkIzQUMyRkYwM0VCQkJBRSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjE5OUE4Nzc2RUI1MDExRTJCQjNBQzJGRjAzRUJCQkFFIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjE5OUE4Nzc3RUI1MDExRTJCQjNBQzJGRjAzRUJCQkFFIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+k0boOwAAC9hJREFUeNrsnV1sHNUVx68XJyF2VTaCOJFC4qEP2a0AsYaHgAB53TZNX9qs+9CqCMWxEHlq6/iFSqiSnadKeXGD8pRK+ENVUfuA12pfUKp6oxKVVAK7qipsP8DaKRKEoJiHmI8U3DmTM/FkPTufd+6cO3P+0jAJcta7M7/9n/+5985Mx+bmpmCxoqoT/tPR0ZGbDzw4s1I1dwZuvbgHVUO+VAP3TXNbxX1z9sThRl6OJZhPh/WfjAKEsFTMrR/3hqJfDTAtmtsl2GcVqswBZAIDgNQQmBqxt1dHoOomUE0GiA404CxDCIyhydtuIlDTJkyLDJB6aIrm7iSCU9H8iwwATZvblAnTOgOUvNuMIDxZ1JS5ndPFlbQBCMPwWIROKbS6bn0uStdWxaH1D9v+zMaOe8XV4n7rz0s9vUm8DQjdZ6iHb/IAqQSnbEJzdOUt0ffBcqR/v9xjiOvd94k1EyyASxJYpEEiC5Bqx3nhylxkcPygApCW9xpxgSIJEjmAsA2fUNWCQ5l66W8zFkRJC8rewoMl8c6Bslg4UIozFDBKZRiAFEAmPOMYkIsqft/T7/9L/GzhDSXwtIPpslGJ4kzrGLTHGaCtzmpSZTsO5eoXb/6RhOte7y6KuYf7LaAArJDt/3CaHVvqAKHrjKn8nSrLVlhXulg6Ii4ePhIWpDNpuVFqAGHWmRWKBwEBmrN/foUcPBJAAhcaVJ2NUgHIhKeGJauo+uT8an5GlK41hQ6yQYLyFiIbQUmrZxagNEqWraMrV6zQrJsgI73WdyxM56aspCkDCOeuJkVKM+QP3FwX429cIF26/AQAAUgAVMB2fzjpuTUlACE88yLFSU+dSpdfWQOILj/0WNBcNJAkRMBOQUGLvpAmPDBFkQV47CbghX/OWUMQAdzUOvZ4DhJTYg6Eb3w+jbDs1Nm/vGKVsKwJStn5Z35izb0FCNcDSYwXJeZAVOCB0eYswuPMdfAZfWRFiKScqJBVeEDH/3NJZF1Q0mBLC6JCVuGB6Yqsuo+b0wbIRYlAVJAID7zBWQrwgL6/ckXkSfCFCTBFY50jPFd0AHK06gaVfJCVziuMAs7zGehERTIACcWz6Zx9YkNkr4BIHyCcniB1DVbff5dFnhUQohqeu/QAwonRMUoHDwKlzlMWiiEaw3OoHiBckjFJ7cA9/sGSYG1BBOu9/eIHnkvlDkSm47IF37YkFsfr3p35jBPZ3bM6gLB2krsiNO/Zx6us+4xYV6LmoUIEeCrUcg+XL3+BC3ldLIl5qJI4QBRzj9OuWe318zf/5BeqJxMFiGrpYniCCQZYfUJ16FJWCAEPJPURqgennMOR56hfNJ88NBKmKwvjQBPUui52oGiCteEeE81FPNfyAMJr1WtUDwgcjLzMvMsQ5CCfCwxqeM6lOdAY5QMCt2NhhXdsH9cekwIQklilfDDKH8vPPx3dXaLz0W9v27JWyjxUDeJCnbq7D+jgjY+kvt7O7z0rdr/4vAWRmzZvboiv3lsV//v3krm9a226dmWwcsHj4kU49w3PL5rXonokcJ56PT//+lmp8HSdPhXq3wBQt956W9z6x9vWXifBpUIv/fCXXpdRD7S7L1GQRfXk3eeQRPeBEhUWHrvc7fzus6L716fFN1+dEPc+9+O27kXxC3jUe/XmWKQMhMPaVeoHoCQx/3SNnor9GoWeB0yABu+ApIOOLl/xGqGuek1xeDnQiA4f/tCND6WVLjj5MkO4DRL18B3AhUZCAeS4DzN53X/zUymvk5RbAJTf+M3LnqFcAxc62W4NdTsH0gIey4HW4zsQOIRM93HTruPHLJDu+VYvyeNoraXyXg5zMgxAQ3mBxy5fKgTwAERUS5rPxQhDgQDCwKTF4wNkla8dTz6h7D1DGQOIVEEbRjAuVG4/ql9xC9MFXd1HlgMBPGlkExguoAjR083FUC7kBlBNG4BuyMk/qeUOEyJq5cwnB9U8AcJ1IIYuAHXd+kICQOVUPwMMPlIK1j4XJhita4UKuroP6GBMB4LSlfbJg/fQdfpFUi2+z9rymhdA/ToBFPcCQirlAyDefep5XcpYfyYcSEaAplQ6YC6NCtDwxfToxtwdKOgKNDLu8+UXEgA6ROszjZ4iU8q85hidrDgdSKtHR+6WcP07tVFhGA3fdfwHJN5L2XuVZ8UNIK3yj4wSlvT0RRTBlAcFF/K5v1K/9g6UNfdxdmUauJCrAxk6ARD3KgzKM+NURqgPtnd54y6AdAvQtwGKNw9GeY0OlFaV83NRYoLNTEFH98mDdjz1BPUvqZFrgKi18NsAIuBAPkH6LoB6dQNAxjQGZdnXpRFWr9YOlIf7IFIAyKMTM1q7sFypsG+vBgCV6R9H3FdzBxDBQcTtOS39ZOHRyldz7UA6iEJO84sKDBDnICkljMVigFgMEIsBYjFALBKyb2SVpjzuG8QAUddnv/u9BVGaWjhQYoB01MZvL4gv//r31OGBx4t7qZNPFS19fe262Ji4kPp9F6F0vdZ3zPfnGCBC4Hz+h9dTdx1bZ79zwtd9nAA1RM7mw+CEpT0fZt+cE6ChcqdXcJ7zz/xUrBX3+/1oI9cO9PVHH6cCkPP2wNTu6ArQvHrkR0Hg2eZATe1CpvlNob4mCFwOQAVgboPzbupdVTtdPHxEzD3S79u2O9R0AqTdswKu7tkf69nwX723ttWK7tsb2o1sOOxSZL+eXYp0ufn4co9h3Wh8qSf00pFVrR0ormCMJc+CgAzgXH7osagv0cw1QHlVDMdxBejOow4GZ1Y2dToQ8AxQnwensRx5EZwGck6Q1jyIZk8cttjpbCHK0MmCWd7QLDxYEu8cKPtOR0R1n9Y2flHwBYba5xqAZcGERkKJ8tKiG0Bwk2BtbjAVZqwiy8Asm6As7TWsvUJXvtTOgfTpooKPV2QqAK8V95nuYoir5j7FMr7dgeCZUGaQ1qfG79yVWVDAXT/pvk+s7dm/9WdCjut8fljrVEZdlzIGBxRGTu0rJ+FSZ12uVoWACwOhIMgq1t/NzwNfCg1Kc935l06X2qZNDoLxjLmH7/5/AJH9ELr74WnOG1v3EXK7TLcU83nzUFZa5Qyw17uKpoPcLjVre/aFmSqgqkteAAFdEzp/OjhBWyewtwU47tRkO1ChpbY1BY9Ks9qriYy4A+RGGIvlxYYbQNN8nFhtNO0LkGlRi0KzMSGWEi0iG74OxC7ECsxEO4Cm+HixgjDhCpBpVesMEcsJDzIR2IFA5/i4sfxYaAsQBqYGH7vcq+EWnoM4EOgMH7/cy5MBT4Bw1pVdKN/u04gMELsQu4/fD/gCxC7E7hPXgdiF2H3iAYQk8iRrflQP4j5hHAg0am7rfGwzr3U810IqQLgOhAcXs69zrWt+vHTnytSgGpxZWRA5e75qjgQz7n1BfxjYiXKPxGE+zplV6HMbGiAc1uauLINdl9eUhbQSxqWMS1fcEnaHIe7KMtN1DUb9x5EBwqTOeSgDuSdM1yUNIISoznlI+9wTa4A4cgZqyUOzQqMrWlmWYLR5MM4LxM1Are0fX8mhUWiWFT+kOBC6EFwADp2ZweeHtCDv9LVb45yWA9kL8bkz06DjkgGPlBDtAhFY4wBDRBaegSiDhcoAYojyBU8iADFE+YEnMYBaIGryOUw1MCcGj9QuzKc7mxc8b5ZGqz4gMzAn2oX5dGfgRLwkVp3qScOjzIFa3Gjc3I3x+U1UMD0xruIXWeyoBAghgimPSXPjZxXID8vDcee2yAOEEBlQ3TgXSc07g3Fm1bUCiEuaniWLHEAIUQVLGrtReNcZTrJF1wKgFjca4WwUKOucS8t1yALkyEZwo3NeW9S+PR9VnXW0AcgBUhWzUZWZsdTArNOg9KbIAsQg0QZHG4ByDBJpcLQDqKVjg6B9MqPgTGFA1mJ5sHYAOUAqIkRDGWj/ARa4ifeUirkrBsjdlYawczM0edtN7KimdXGbzALkMgwAIPUTHAoAYOBhbXUqbTgDFCx8VxCoikKHamJpAmAWqYdhBig8VAZuvQ6ownZ4DQcsq7hvZhUWT4BYrKj6vwADAPdLkcDegrLvAAAAAElFTkSuQmCC">
+    <link rel="apple-touch-icon-precomposed" sizes="114x114" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHIAAAByCAYAAACP3YV9AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDoxOTlBODc3NEVCNTAxMUUyQkIzQUMyRkYwM0VCQkJBRSIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDoxOTlBODc3NUVCNTAxMUUyQkIzQUMyRkYwM0VCQkJBRSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjE5OUE4NzcyRUI1MDExRTJCQjNBQzJGRjAzRUJCQkFFIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjE5OUE4NzczRUI1MDExRTJCQjNBQzJGRjAzRUJCQkFFIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+3CoQeQAACXlJREFUeNrsnUtsVFUYx88M76mPIZRCgnYGFlCDhhYWaIy2FQ07h7pCY+oQIisNZePCTcvCmHQzhbjCKA0x8bGQjrohikwF4iPBliiRsoABJRGsYVxQXgKe/+25OL3c99x7HrfnS27vTDvTuXN+9/89zj3n3NTdu3eJNvVtLn6kUinlDrznwJl2usvTDfsce2xufqzKthrdTtJtHM8P9q4eV60tIMaU8UMBkBRcF91h62T7OK1Ct1HsKdiKBtkYuCzdbaFbgYHLCjqUGgNbptsIBVvTIP0BNOEVJRXAMKBSoCMapL36AG5ngBgn2hBf9wCsaJUKB8kA9jGAkbnOjosTZP3F02TN5fOk+erMNp5sypK/m6Y/6kJ2GZmav5BMLM3T3z9s/C2k6wXQIVFAhYGMC2AbBbd17BBprf0Z6v1T8yjUlhy5sHg5GVuxhoJergRQISApRLjQUtTJywtnfiQvU4hRGsCOPbKG/LyizQAbAOguCnM4kSBZ3VeKo3TY/lOZPH3uZKzHD6jHV64jX6/e6NcFVxjQ8cSApBAH6K4/jv/NA6LVJlrypLy2k5xuyfl5+W4Kc0BpkBQgMtCDrPclcgNAgBRliKGfdGz2AxSq7KFAq8qBZPXg/rgKeSQ0b317gGRuXRdeh/hUKGLntjjqz9hAxulKTRs4tC90dhqXIYZ+TBWKeMrT1UYOkpUVpbh7ZQqnRknh11EpewkA8YONBa8sd5glQjXpQDKIR+KKh6bBlQ5+uVcKl+pmAAmgLupE3OyOAiYYpiNUYuwQYagVZYdo9i55uH+01RHWdg1bWiWI6G7jXWo0erxIyFyOOTKYaVUgmrFRNYP3QInkcuyRwEyrAhEN0vHHBFHVkJy51LwNw2xEkSVeEM3iX4XY2EAHhtmFyQ8kqxOLPBsBneJJMA+YRda28YNkPTb9PL88Mj/rdcUEw+xnbRwfSNZ3up/3F0+KGq0wXRKg/aytY1MkOsC5D4JSOcnxSoAcSpMsa+voQTLf3c77y+Kqv+pJjlcHh0OnQXuQeJn2CbGdd1z8v4fkNEmy4SR949hnTidrP2v7yBRZEvVF0dWVdEMit/3HckNtn/ahRpQZXaK+YJKyVa8T1uGk7WIMwoOsuywlxDCccTYZVOngYktevT5eiuwj4obqk7a/qrMKJCA6jAQ0h486muP1SHYGnBMJcvCrvQ251vSyZjJ/07Mzfnf77Hly5/KksZfVBrtfsxs2goZYaXf9EgznyqrGRuPj/OefIZm+Ha6v+feX38itH04Y251Lk/LUl6dGKcheJ1UO+FakDGpE4H/z2Keh3jv3icfIA+++Heg9gHrz8FFy85ujyqnSbYRAUSREWCMDqzK7doSCDwU/9GHJULNo2+ocK4tBkp2dor9IW8iMFRDSLc3h4yp9L4BC0YixIk9khzbY6Qsk63nPiwb56JVwilzw4uZIPh8KfXDvO0LV6dCpnre7OmKnyIIMaXiY/tU5q3LGFpWlmjKGOsO46mjq6KpTwldwBVk34VSotV65FM6tbopHPfi/omA6XMIrWjsIrIrcQiSwJSHLjnlPbYjtmETBdBmBt8UNZEEGkM1TwUEiMWkkyZEVpjHozL4PtuAGsksGkK0hEh0kJzwMMHknQOvtL+V12YJk69hkZQCZuXUjeKKzMsft+Ba9/irX0sRhhESWMbtPkVKoMWzpMWdVK7fjM7NZnu7VoYPEFmSnLCDDlB68XGv95/F0sQ5xslNaRYaBKKoHZuErL4nOG2Yq0u+4EFlryHTLUiHHiiyZlyqdLrKb7ExF5onCxjM+8uqEsPNUDr08+XqQ7SqDTDU1CftsxEperr356j92v56hyHWyQFkTYniHSEXC5j25QWTb5OpBZtVWZGZWgMzcvO7pWpWOkaKNV+nTWruUbJCiFTnt3nOiPjpvrSMVzlpzwo8h7g57mNtVoUSAnC0nU7MGmXzTIDVIbRpkAu3m4e9i/wy3pbk1yAhsamgflykHWL3ZsZbVGMIbJgNNlfYZ0w14qBHLiCYaJGZW8awl8Xk3vjjEbZ4IIA4+1+v6GhNklSjcu3P36hQX9d36/oQx0YfnlDwTostyodXEgIzD4C4BD3vjsYBpd4iJ5cc7vVZkngFS6Yn6t89euPcY/a5ebhaKMlWMvfl+AJt+LnYSbMC7GMwAieHMUowyx+2Npu/459+uvf9RIrwA3ChU6JbU2Nj5epDjRJswA7jj+Xa/CrTauDVGauOsPgMg3TxioC/Xem/qec+BM1LcbBmDjN77fDB5nQbsBmq4zxb2Ie+Md58d7F2dsi4GUSESjG1t8OyUDhzufIe4H9JtelnFrkNglEgySBmNoNJCgjje3ykwwJrMZCNVnIeN2oEE3X4ZGgZxA+NTlki0hJl5A9GpeQsMlQEYnsektMCKnLE8C42TV4iEI+qMSSxsBPoimwktbQ0udWaFgUTkGnPxFxYvk9Xd12h8XGzUwjYLJlVkqSetrqu+sa23KyqvnZWJb6X+ifUyVploU8XKbiBHdPsoYyOOINnSWMO6jaS3YesyZmkvyWqT363el7WaRrNXLCiY1+0lpVWpGlfW/8JtUcE9ur2kNVs2TiARJ2u6zeSrHZ1yGFuQLJBqVUqoRqc7wLoNhxzSqpROjUNOf3QEqVWpjhq9FKlVqYgaPUGyM2CXbkfh5nmre1+3r6d1JW7B26XbU4hVKMRutxcEuX29VqVANfp5kS+Q9IzASK3duk25227W9p7my7XWudgxovjiSgrZOIXY4eeFQVzrPZY6i+WWpfYEeUMgkPQMqdLdNt3Osds21tbxgGQwR3S8jD0uBr7AHyhGWuIl7n5e1O0eqeGCcWCPFyZGWtNiPWckwuSmkTIvNEjW09CtYUYGsdur9yYWkBqmPBAbBqlhygExEpAapniIkYG0wBzWjLyz0yghNlR+eJQmA0SSCUGS1okDUf5Dg2EcIBlMzCFBrZnV7AyD+raFKfaFgmQw8/C6RHe0Ix72BO12kwakdrXxuFJhIBlMqLJEZs9IgwqZHqIReybPFWQd0CIDmtTYWWMAuWXvQkAymIDYR6ZvxZ5NEEAMHx2KsqyQGmTCgAoDKA1IC9AiA5pXBGCVARwWBVA6kDb1Z4HIe60Tsa8cRz2YKJAWlZpQuwS63hrLQDG5dES0+pQDaQO2iwHt5FDCABwWI8Lg4IrsbaMUSIe6FPEU+xx7nA8QY6t123nW+1LlUffFBlKb+vafAAMAbnyDAztTLO8AAAAASUVORK5CYII=">
+    <link rel="apple-touch-icon-precomposed" sizes="72x72" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAABICAYAAABV7bNHAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpEMUQzNTREQkVCNEYxMUUyQkIzQUMyRkYwM0VCQkJBRSIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpEMUQzNTREQ0VCNEYxMUUyQkIzQUMyRkYwM0VCQkJBRSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkQxRDM1NEQ5RUI0RjExRTJCQjNBQzJGRjAzRUJCQkFFIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkQxRDM1NERBRUI0RjExRTJCQjNBQzJGRjAzRUJCQkFFIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+mWYVywAABg5JREFUeNrsnE9oHFUcx99ut2n+KE5pmhQ0deIhG6mluwpG0LIJKr3Z5CIopUkI9ia7vfQggvQggpcm6k1K/iCKp3TFSykaiwqmIFnpwWwONm0t2DSl00PT2NbG93t5E2Ynb/6+38zszu4XXnaT3cnOfPb3+73f+733JrGxsUEaslYKfiQSiVA+bGhmSaUPGd5ytCn8uZ1KtGm0XeTPS7PHe5bDOF8wngT7ESAgCgUADNM2SJuK9G8B0DnapimsUs0BolDAMkZoyyNCsYM1QdsUhaVVNSAO5gy3FsXtca9e+YO8eGORpFeuktaH62RtZzO5vnsfe2217SnaFFLeq5JruzvZaxYCOFO0ncYChQaIgylwi3ENBmCc+nGG7Nf+cf1Z15R9ZOGZNFl4Os2eW4ACixqXBYUCiMLppw+TXl0JoAAcgORXAOhCTx8DJrAscL1RCumnyABROGe45XiSH8uxE8C5kO5jsASgwJJOhgqIu9Sciy5aqPd/+ZZkb5TRozXA+SZ7hPzafUiUKgx4dTlfgHi3Pecl1hjVSwPxqbnpQLu1codKzr78Fgvuptg04CUt8AxIFg7o0+8/I+33NBK0wJrO9h1lwdwvJGCTDMty9O48DDh6nANXfmfhvPHPLDTwa3GlZFhwQG8uzYc+loLPHLtU9A0p6QKOggEHeiysXsuP5VpAUjAsSBpOVNbjBpIUIJ7nZDBOMPt3mUQtgGSKSRl+jd4B8Qy5gAKH5jwyGTN2TDLlYAV+re4Bcd+cxDqp3pVlUk0amy+ae9NJq3hkZUEFzDJFEFmzbAowduk7459UK29JWlhPHutk4JsKK/fxojS1aohJBuVFVpQSHPsRRq+lq0u76ep9TW8cJi3vHSOJtlb2+39/XSWPV1bJw99+J48u/0ke31xFhwQB21AJUPi1VwxsK4YanOAVTEBwEk5dfOrg8+SJTz6wfQ+A+rd4nsHCVPGFHCkeyBmHIt36oFY01BjBhLOZIDpbUPO7Q47v2fnKSwxi68kTW1aG0quV5409rF4qtoxBeWwz7rpjnz3veO5ZZkFu1fT6YfLk5x+z47ACtilHywsB8bGJigkHPtwp/4EL9qpkRzuzJixIphCgGsdpRgsaxrae/Xec3St1sNfX/wY3w4IkGCcOiwANYgPa49C9w0XKXCAc3/ZhASUmmXK1wQpAfMZTxQbUvqY5xh9Zgbu1nDiGPVZUOZMtC8qQCOQlODvFMdn/BS5mipeZwAFB/dn22+9sR/usXUePYMfMCkC5KCwI3ANLkCfJAk/fqhhU54yAFBIDybqZacyoBO5iLQ/WQ4lBRiuSA3TX0sUCUdg1aEyXdaoH1aRk0wbRsChWgDCGRrEGtHFvTep401R1/ADd//IrqePLHdtdNBUHMFBEW/96VqqYBtYDK0NCBQQLnILqyaAk++jyInnww8/suex5fvHa28LlfTqgUhC50P2mZtvXoYTqNETQrQLq01CXht8BiGy80QWLrqDsKoBTMgLSoooZsnHDr2CRFdSiRYHZyEQHBIu0++PejTusaTTrotnF0LVIe4V0hLOqbPkwPYfFvSp7tLEWkUqBAwobxm3a4EsBS7mudHoFIgS0NS82NLME82Eq5klvzqreJV2GYpS5RrTHZuZVv2izVYLYYnMKYq1pl9V6aRktzx7v6QY2xm4e9j4UsL/VVf6t6ioeqAmDPCfKpKdJQ9tYmKee0d2sBsXci43tBFPPEw3jqWRgBjQVVdJYJdJ3DIkB8VUNU3UMaNueM1G543SdWpHGr53YAuIE6zEWTYg2u1gVzMbJ5n6ruum5+DUTV4A4ydE6AjRqtVXKsuTKd+qN1wGccbtdiY7boWjyuEAiWtwQgmAPftbqRbfboQZi2qtp/Nps5QiI+2bcIOkb6zRpQBxSKUaQPO06dD0vFhNInvetepo4rHFInuF4BmSABOWAWirTsnP2cyOUSG4sEEGeE+6NBUyQ+omPW1OENHyQvjWF9OIFfgLZKqoC6KPyrAwcFBcTWJO+pWiEhL/usXpvj2MBCiA1brDkAlbjFl0eYKmkFm/y1pC1/hdgAAMA2vh8S7PiAAAAAElFTkSuQmCC">
+    <link rel="apple-touch-icon-precomposed" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADkAAAA5CAYAAACMGIOFAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpEMUQzNTREN0VCNEYxMUUyQkIzQUMyRkYwM0VCQkJBRSIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpEMUQzNTREOEVCNEYxMUUyQkIzQUMyRkYwM0VCQkJBRSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkQxRDM1NEQ1RUI0RjExRTJCQjNBQzJGRjAzRUJCQkFFIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkQxRDM1NEQ2RUI0RjExRTJCQjNBQzJGRjAzRUJCQkFFIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+z2OEzwAABLdJREFUeNrsm01ME0EUgF8L+ANRa4JookDxQDFqAE38CRJq1Oit6MFEY0grkTNe9GJSOHg20RsJgXDxCPUk0QhEjWJCgKiRcpD6QwJIQj1AVASct5nW2e3udmd2tpTqS4alpZ19376fefODa21tDXJd8vGHy+WS2unFnkk/uWCrJs1LWo3Jx8dIi5E2Ttpgb1PloExd0Igu5YcESALWSC4B0vDqsdFVnLQ+0iIEuC8rIAlckFzC1GKGUrwYh7rYeMr70V1emC/aQZruc0ELtxPY7nWBtAqHcmW0H85NDpt+ZqlgC4zu88EEgX5ZUS0NVgiSwCFUF425tNL8JgJ1U+NciiWAIwcbtBbGeA0R2JhjkDTuuqzGXOD9EATeDdmKKbTqw9rzCjgTsyGr8coFSQDbqHtakrL4DLT1d0jJkAgYOdQATyqPs2+j+7ZJgySAaL0gj2K3B3rANxcDmTK61wedxwOsVbsJaCgdpNuCBbkBq+Y+SQdEqZ2Owq1nPYqXUAlS/UzFbcFFg7zK1MXGHKteEFAHtE0IkiaZMK8Shcs/uLOpyD00oGGqr3VIZpjgd6mv0YzUowh6ffiRcqXSRfW2bEnLw4RWjkxPZKzwRks2D0cSLz1GhnEbVDJ+O8khk4L3Y6opP9U/rSXDojfErLoeggUH47Zh3amWxope0Zv5vhkPG66iQii60wr5hw8k3/v99gMsvx5R2ursvK34xPq48xhOgsCLHGyd65ZlRSVGFmYM/7Y5cEEFqDxh8nrrjWuwvfMeFN5sAffuYuF7Y0bHmY4eh1szZHjtQJbGZ00gz5t+d9OZeth2/y4UnDgq7rbvk3Wylx1SWEsG7MYG8yRVgoqju6aThEtvOlsvloTUw1dAD7LRDqBZ0ik4yWedwtYWIYtqChG1JemajMep7JdXUcavsGCMVv1Nfh7KlbSk3y5Iadw46eTtL+fuD113y9VLdl1WBVkto8ySBcgmI15roh5MbqhmIb1OuaqVhGMmIrFZvPgdWK4EZI1TmdXO2CcKyRQlNWnnk4JPTw1ZsstWv9oCQkTc8A/If8hskJWP/DMbZqErdRaSTbK2uAQ/I/2kPeb63mfPnpQVeGmQuJ/h03l/de4bl9VWpj7D8qsRZRqGoDwSLfHCg1OXDS05ZncYMdiwURRegg7dLIsPAOeRCCPiluy9cUtBZw9ljIWMO+l2v54+d6RvXGx+UVGjXA0kxkIO2a1ftS7ihGC8RUvKYYK4pQkYK+Ms5KDdVQG8OcaEjJVz7AdlgvSJD+8LgcPfBWRQKS0TeyFkWrIgc7qFZZ5RFWSUuIziWlDivU2VO5GPza64FRaUl209spXmlT69YiCSY4VOkke1dUdcdsrJaVcGJUZctULJ7jpbd+05YkUVR8ombA5YM2lFI0vmgjVT9NfdTifWHAAJi1vrIHii67Sq4jLZTg85Weo5JHGqt7X5JD0nE9pgkIbnewwnzfSczEaJz3azcz1pj7iInP7IsJgec7F0xIV20L0RAbnWeGhH7VnoopbyhqNn65zMojxn67hW62jHtYl52nqMg3h/3sO+GTnvKqNUg0yed80wrDCcVEhNvObmGXQDYD9k238T5Lr8EWAAKzkwStOSY78AAAAASUVORK5CYII=">
+    <link rel="shortcut icon" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDoxOTlBODc3Q0VCNTAxMUUyQkIzQUMyRkYwM0VCQkJBRSIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDozQTdBQzgzMEVCNTAxMUUyQkIzQUMyRkYwM0VCQkJBRSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjE5OUE4NzdBRUI1MDExRTJCQjNBQzJGRjAzRUJCQkFFIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjE5OUE4NzdCRUI1MDExRTJCQjNBQzJGRjAzRUJCQkFFIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+Mt83BAAAAsFJREFUeNpi/P//P8NAAhYQwcjISFBh4KJbCkAqAIj9gdgAiAXQlHwA4gtAvBGIN6yPU3tAyEyQ5xnBBB4HAC0GWVYPtRwODJ/eZLC5f4GB6/dPMP+GmDzDIwEJhptA+hsrB0hoAxA3Ah1ygWwHAC3vB1IF6OLW9y8yJJ/aiNPRRxX1GTZq2zO84QYH0gSgIwpJcgDQYpDO/dCgRgEiXz8wdG2ZRFT87lYzZ9ioYw8KEVAoOAId8gHdAUxYfI3TchDwv3qQ6ATmeuskQ9m+RSBHg8zaDzUbBTBh0YfTcpDvQcFPCpD78IKhYecsuCPwOgAa5wa4DAMlPHIA1+8fDDlHVoFoA6gdmA6ApvYCfAYZkekAWEj4XwFHXwHULowQqCdkiPor1KzNO6mFQWDLYgae9ioGjqggBkZuLoJpAhSNyHYxoRUyeH2ADNhcbBmYleQhpZmuJtABgQx88/rB4vgANBEHQO2Eh0AAwXj89RPVAc6YFoFCgKsgDa8jQIkYlCZgdsIc4E8w+F+jBj/I17gAZ2oM3uhQf/UQbifMAQakJChCcQ2SZ/f3IBSdBsgOECDFAbC4x1vL6WrglNOAhIAAroKIOtUsnigiVBJSBfy99xCn3DdWdtT2ADXBn8vXGX7tPczwa89hrPKgKnu5oTuGAz6Qkg5AvvtS2YYh9v/rN5x6QFUzqHYEYSQ74Q4AVZcOxDoAZBHIp/gAyKdvufmBDRUFcCMFxEcDF5AdsJGQA0ANDJDr5d6/xG+xoDisRUQIbER2AKj51E9IB8hgUNOLSmADPBdAG5Ab6NgYhjdakbNhIx0d0IhRDkBbrxPoYPkE5JYyRqMUWE2eJ7VuIAFcAFpuiLdRCmq9wrIItS2Hmo2/KIY2nantCKzNcqxRQEzHhIw4x9kxwVsZQTUakplFQXoMcVlOVAjQrXM6kAAgwADR0Rq9/0mR6AAAAABJRU5ErkJggg==">
+    <style>
+      * {
+        -webkit-box-sizing: border-box;
+           -moz-box-sizing: border-box;
+                box-sizing: border-box;
+      }
+      body {
+        background-color: #F5F5F5;
+        font-family: 'Source Sans Pro', Helvetica, sans-serif;
+        color: #333;
+      }
+      #logo {
+        width: 300px;
+        height: 40px;
+      }
+      #logo-link {
+        display: inline-block;
+        padding: 20px;
+      }
+      #heading {
+        font-size: 18px;
+        font-weight: 500;
+        margin-top: 0;
+        margin-bottom: 5px;
+      }
+      #container {
+        margin: 45px auto;
+        text-align: center;
+        width: 320px;
+      }
+      #panel {
+        background-color: #fff;
+        padding: 30px;
+        box-shadow: 0px 5px 15px rgba(0, 0, 0, 0.5);
+      }
+      #contact-link {
+        display: inline-block;
+        margin: 20px;
+        font-size: 13px;
+        color: #428BCA;
+        text-decoration: none;
+      }
+      #contact-link:hover {
+        color: #2A6596;
+        text-decoration: underline;
+      }
+      .btn {
+        background-color: #fff;
+        color: #666;
+        box-shadow: inset 0 1px 0px rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.25), 0 0px 1px rgba(0, 0, 0, 0.25);
+        padding: 6px 12px;
+        font-size: 14px;
+        border-radius: 4px;
+        border: none;
+        cursor: pointer;
+        fill: #666;
+        text-align: left;
+      }
+      .btn:hover {
+        color: #999;
+        fill: #999;
+      }
+      .btn:focus {
+        outline: none;
+      }
+      .btn:active {
+        outline: none;
+        box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+      }
+      .btn-icon {
+        width: 24px;
+        height: 24px;
+        float: left;
+        margin-right: 5px;
+        background-repeat: no-repeat;
+      }
+      .btn-icon-google {
+        background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPCFET0NUWVBFIHN2ZyBQVUJMSUMgIi0vL1czQy8vRFREIFNWRyAxLjEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvR3JhcGhpY3MvU1ZHLzEuMS9EVEQvc3ZnMTEuZHRkIj4KPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAzMiAzMiIgZmlsbD0iIzY2NiI+CiAgPHBhdGggZD0iTTAgMjQuNTcxdi0xNy4xNDNxMC0yLjEyNSAxLjUwOS0zLjYzNHQzLjYzNC0xLjUwOWgxNy4xNDNxMi4xMjUgMCAzLjYzNCAxLjUwOXQxLjUwOSAzLjYzNHYxNy4xNDNxMCAyLjEyNS0xLjUwOSAzLjYzNHQtMy42MzQgMS41MDloLTE3LjE0M3EtMi4xMjUgMC0zLjYzNC0xLjUwOXQtMS41MDktMy42MzR6TTQuOTI5IDIxLjkxMXEwIDAuNzY4IDAuMzMgMS4zODR0MC44NjYgMS4wMDkgMS4yMzIgMC42NjEgMS4zODQgMC4zNzUgMS4zNjYgMC4xMDdxMS4wNzEgMCAyLjE1Mi0wLjI3N3QyLjAyNy0wLjgyMSAxLjUzNi0xLjQ3MyAwLjU4OS0yLjA4OXEwLTAuODc1LTAuMzU3LTEuNTk4dC0wLjg3NS0xLjE4OC0xLjAzNi0wLjg0OC0wLjg3NS0wLjc4Ni0wLjM1Ny0wLjc5NSAwLjI3Ny0wLjc1OSAwLjY3LTAuNzA1IDAuNzg2LTAuNzUgMC42Ny0xLjA2MyAwLjI3Ny0xLjQ3M3EwLTEuMDcxLTAuNDAyLTEuNzc3dC0xLjI5NS0xLjYxNmgxLjQ4MmwxLjU3MS0xLjE0M2gtNC43MzJxLTEuNTE4IDAtMi44NzUgMC41NzF0LTIuMjc3IDEuNzUtMC45MiAyLjczMnEwIDEuNjYxIDEuMTUyIDIuNzU5dDIuODMgMS4wOThxMC4zOTMgMCAwLjc2OC0wLjA1NC0wLjIzMiAwLjUxOC0wLjIzMiAwLjk2NCAwIDAuNzg2IDAuNzE0IDEuNjc5LTMuMTI1IDAuMjE0LTQuNTg5IDEuMTI1LTAuODM5IDAuNTE4LTEuMzQ4IDEuMzA0dC0wLjUwOSAxLjY5NnpNNy4wNTQgMjEuMzkzcTAtMC44MjEgMC40NDYtMS40Mjl0MS4xNy0wLjkyIDEuNDY0LTAuNDQ2IDEuNTA5LTAuMTM0cTAuMzU3IDAgMC41NTQgMC4wMzYgMC4wMzYgMC4wMTggMC40MTEgMC4yOTV0MC40NjQgMC4zMzkgMC40MTEgMC4zMjEgMC40MzggMC4zOTMgMC4zMzkgMC40MDIgMC4zMDQgMC40NjQgMC4xNjEgMC40NzMgMC4wODAgMC41NjNxMCAxLjM1Ny0xLjA0NSAyLjAwOXQtMi40OTEgMC42NTJxLTAuNzMyIDAtMS40MzgtMC4xN3QtMS4zNDgtMC41MDktMS4wMzYtMC45NDYtMC4zOTMtMS4zOTN6TTguMjUgMTAuMTI1cTAtMS4wODkgMC41NzEtMS44NTd0MS42NDMtMC43NjhxMC45NDYgMCAxLjY3IDAuODA0dDEuMDM2IDEuODA0IDAuMzEzIDEuOTExcTAgMS4wNzEtMC41ODkgMS43Nzd0LTEuNjQzIDAuNzA1cS0wLjk0NiAwLTEuNjYxLTAuNzU5dC0xLjAyNy0xLjcyMy0wLjMxMy0xLjg5M3pNMTcuMTQzIDE1LjQyOWgyLjI4NnYyLjg1N2gxLjE0M3YtMi44NTdoMi4yODZ2LTEuMTQzaC0yLjI4NnYtMi4yODZoLTEuMTQzdjIuMjg2aC0yLjI4NnYxLjE0M3oiPjwvcGF0aD4KPC9zdmc+Cg==);
+      }
+      .btn-icon-coreos {
+        background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiBmaWxsPSIjNjY2IiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgdmlld0JveD0iMCAwIDIxNSAyMTUiIHhtbDpzcGFjZT0icHJlc2VydmUiPg0KICA8Zz4NCiAgICA8Zz4NCiAgICAgIDxwYXRoIGQ9Ik0xMDcuNDc5LDEuMDc1Yy01OC42NzcsMC0xMDYuNDA0LDQ3LjczLTEwNi40MDQsMTA2LjM5OGMwLDU4LjY3Miw0Ny43MjcsMTA2LjM5OSwxMDYuNDA0LDEwNi4zOTkNCiAgICAgICAgICAgICAgYzU4LjY1OSwwLDEwNi4zOS00Ny43MjcsMTA2LjM5LTEwNi4zOTlDMjEzLjg2OSw0OC44MDUsMTY2LjEzOCwxLjA3NSwxMDcuNDc5LDEuMDc1eiBNMTQ3LjQ0OSwxMzQuNjI3DQogICAgICAgICAgICAgIGMtMC44OCwwLjEyOC0xLjc0OSwwLjI1MS0yLjYzMiwwLjM2NGMtOC4wMywxLjAzOC0xNi42MDIsMS43NDMtMjUuNTYxLDIuMDc4Yy0zLjg1NiwwLjE0NC03Ljc5MywwLjIzMS0xMS43NzYsMC4yMzENCiAgICAgICAgICAgICAgYy0zLjk5NSwwLTcuOTItMC4wODYtMTEuNzg4LTAuMjMxYy04Ljk0OC0wLjMzNS0xNy41MjYtMS4wNC0yNS41NDktMi4wNzhjLTAuNzE2LTUuOTg3LTEuMjAxLTEyLjIxNi0xLjQ0My0xOC42MjMNCiAgICAgICAgICAgICAgYy0wLjExNi0yLjkyNi0wLjE3My01Ljg5Ni0wLjE3My04Ljg5NWMwLTMuMDAyLDAuMDU3LTUuOTY2LDAuMTczLTguODk4YzAuMjQzLTYuNDA4LDAuNzI4LTEyLjYzMywxLjQ0My0xOC42Mg0KICAgICAgICAgICAgICBjMC4xNDQtMS4yNDYsMC4zMDYtMi40ODUsMC40NzMtMy43MDljNS4yNDEtMzguMDQsMTkuNzUyLTY1LjQwOCwzNi44NjMtNjUuNDA4YzUzLjM2NCwwLDk2LjYzMiw0My4yNjIsOTYuNjMzLDk2LjYzNQ0KICAgICAgICAgICAgICBDMjA0LjExMiwxMTkuNTQ3LDE4MC44NjYsMTI5LjkzNCwxNDcuNDQ5LDEzNC42Mjd6Ii8+DQogICAgICA8cGF0aCBkPSJNMTQ3LjQ0OCw4MC4zMTZjLTAuOTY5LTEuNDE0LTIuMDA5LTIuNzY4LTMuMTE3LTQuMDY5Yy04Ljg2Ni0xMC40NTEtMjIuMDc0LTE3LjA5Mi0zNi44NTItMTcuMDkyDQogICAgICAgICAgICAgIGMtNC43OTEsMC05LjA1Nyw3LjMzMy0xMS43ODgsMTguNzJjLTEuMDg1LDQuNTQtMS45MjgsOS43MjEtMi40NywxNS4zNDNjLTAuNDI4LDQuNTA1LTAuNjU4LDkuMjk3LTAuNjU4LDE0LjI1NQ0KICAgICAgICAgICAgICBzMC4yMzEsOS43NTEsMC42NTgsMTQuMjUyYzQuNTA4LDAuNDI4LDkuMjkzLDAuNjU3LDE0LjI1OCwwLjY1N2M0Ljk1OSwwLDkuNzQ0LTAuMjMsMTQuMjUyLTAuNjU3DQogICAgICAgICAgICAgIGM5LjkxMS0wLjk0LDE4LjQ2Ni0yLjg0NiwyNC41MjctNS4zNTdjNS45ODYtMi40NzYsOS41MjgtNS41NTksOS41MjgtOC44OTVDMTU1Ljc4Niw5Ny40MDcsMTUyLjcxMiw4OC4wNTcsMTQ3LjQ0OCw4MC4zMTZ6Ii8+DQogICAgPC9nPg0KICA8L2c+DQo8L3N2Zz4NCg==);
+      }
+      .btn-text {
+        line-height: 24px;
+      }
+      .btn-link {
+        display: inline-block;
+        margin-top: 20px;
+      }
+      .input-box {
+        height: 34px;
+        padding: 6px 12px;
+        font-size: 14px;
+        line-height: 1.42857143;
+        color: #666;
+        border: 1px solid #CCC;
+        border-radius: 4px;
+        box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+        margin-bottom: 10px;
+        min-width: 200px;
+      }
+      .instruction-block {
+        font-size: 14px;
+      }
+      .detail-block {
+        color: #777;
+        font-size: 12px;
+        margin-top: 20px;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="container">
+
+      <a id="logo-link" href="http://www.coreos.com">
+        <svg id="logo" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" preserveAspectRatio="xMidYMin" viewBox="24.5 40.5 744 224" enable-background="new 24.5 40.5 744 224" xml:space="preserve">
+          <g>
+            <g>
+              <path fill="#53A3DA" d="M136.168,45.527C76.898,45.527,28.689,93.739,28.689,153c0,59.265,48.209,107.474,107.479,107.474c59.252,0,107.465-48.209,107.465-107.474C243.633,93.739,195.42,45.527,136.168,45.527z"></path>
+              <path fill="#F1606D" d="M136.168,55.389c-17.283,0-31.941,27.645-37.235,66.069c-0.169,1.236-0.333,2.487-0.478,3.746c-0.723,6.047-1.213,12.335-1.458,18.808c-0.117,2.962-0.175,5.956-0.175,8.988c0,3.029,0.058,6.029,0.175,8.985c0.245,6.472,0.735,12.764,1.458,18.811c8.104,1.049,16.769,1.761,25.807,2.099c3.907,0.146,7.872,0.233,11.907,0.233c4.023,0,8-0.088,11.895-0.233c9.049-0.338,17.708-1.05,25.819-2.099c0.892-0.114,1.77-0.239,2.659-0.368c33.754-4.74,57.235-15.232,57.235-27.428C233.776,99.088,190.071,55.389,136.168,55.389z"></path>
+              <path fill="#FFFFFF" d="M176.541,125.569c-0.979-1.428-2.029-2.796-3.148-4.11c-8.956-10.557-22.297-17.265-37.224-17.265c-4.839,0-9.148,7.407-11.907,18.909c-1.096,4.586-1.947,9.819-2.495,15.498c-0.432,4.551-0.665,9.391-0.665,14.399s0.233,9.849,0.665,14.396c4.554,0.432,9.387,0.664,14.402,0.664c5.009,0,9.842-0.232,14.396-0.664c10.011-0.95,18.653-2.875,24.775-5.411c6.046-2.501,9.624-5.615,9.624-8.985C184.963,142.832,181.858,133.388,176.541,125.569z"></path>
+            </g>
+            <g>
+              <path fill="#231F20" d="M344.891,100.053c12.585,0,22.816,6.138,29.262,13.062l-10.064,11.326c-5.353-5.192-11.175-8.495-19.041-8.495c-16.839,0-28.953,14.16-28.953,37.291c0,23.448,11.169,37.608,28.32,37.608c9.128,0,15.895-3.775,21.717-10.228l10.067,11.169c-8.335,9.598-19.038,14.95-32.099,14.95c-26.119,0-46.731-18.88-46.731-53.025C297.37,120.036,318.454,100.053,344.891,100.053z"></path>
+              <path fill="#231F20" d="M416.961,125.701c19.352,0,36.822,14.793,36.822,40.597c0,25.647-17.471,40.439-36.822,40.439c-19.197,0-36.66-14.792-36.66-40.439C380.301,140.494,397.764,125.701,416.961,125.701z M416.961,191.945c11.33,0,18.25-10.228,18.25-25.647c0-15.577-6.92-25.804-18.25-25.804s-18.094,10.227-18.094,25.804C398.867,181.717,405.631,191.945,416.961,191.945z"></path>
+              <path fill="#231F20" d="M459.771,127.589h14.943l1.26,13.688h0.629c5.506-10.07,13.691-15.577,21.871-15.577c3.938,0,6.455,0.472,8.811,1.574l-3.148,15.734c-2.67-0.784-4.717-1.257-8.018-1.257c-6.139,0-13.539,4.245-18.256,15.893v47.203h-18.092L459.771,127.589L459.771,127.589z"></path>
+              <path fill="#231F20" d="M541.121,125.701c20.928,0,31.941,15.107,31.941,36.667c0,3.458-0.314,6.604-0.787,8.495h-49.09c1.57,14.003,10.379,21.869,22.811,21.869c6.613,0,12.273-2.041,17.941-5.662l6.135,11.326c-7.395,4.878-16.676,8.341-26.432,8.341c-21.404,0-38.08-14.95-38.08-40.439C505.561,141.12,523.023,125.701,541.121,125.701zM557.326,159.376c0-12.277-5.189-19.671-15.732-19.671c-9.125,0-16.996,6.768-18.57,19.671H557.326z"></path>
+              <path fill="#F1606D" d="M600.602,152.607c0-32.729,17.785-53.344,42.799-53.344c24.863,0,42.641,20.615,42.641,53.344c0,32.889-17.777,54.13-42.641,54.13C618.387,206.737,600.602,185.496,600.602,152.607z M678.49,152.607c0-28.639-14.158-46.731-35.09-46.731c-21.084,0-35.248,18.093-35.248,46.731c0,28.796,14.164,47.521,35.248,47.521C664.332,200.128,678.49,181.403,678.49,152.607z"></path>
+              <path fill="#53A4D9" d="M699.738,186.125c7.557,8.495,18.412,14.003,30.529,14.003c15.732,0,25.807-8.499,25.807-20.767c0-12.904-8.494-17.154-18.723-21.717l-15.736-7.082c-8.969-3.936-20.934-10.385-20.934-25.808c0-14.947,12.904-25.492,30.059-25.492c12.588,0,22.658,5.665,28.949,12.435l-4.244,4.878c-5.982-6.452-14.32-10.7-24.705-10.7c-13.691,0-22.816,7.239-22.816,18.565c0,11.962,10.385,16.521,17.936,19.985l15.738,6.921c11.486,5.195,21.713,11.647,21.713,27.539s-13.061,27.851-33.201,27.851c-15.107,0-26.75-6.451-34.932-15.576L699.738,186.125z"></path>
+            </g>
+          </g>
+        </svg>
+      </a>
+
+      <div id="panel">
+        {{ if .ShowEmailVerifiedMessage }}
+        <h2 id="heading">Your email has been verified! Now Log in to continue to the site.</h2>
+        {{ end }}
+        {{ if .Error }}
+          <h2 id="heading">{{ .Message }}</h2>
+        {{ else }}
+          {{ if .Register }}
+            <h2 id="heading">Create Your Account</h2>
+          {{ else }}
+            <h2 id="heading">Verify Your Identity</h2>
+          {{ end}}
+        {{ end }}
+        <div id="button-container">
+          {{ if .Error }}
+            <div class="instruction-block">{{ .Instruction }}</div>
+            <div class="detail-block">{{ .Detail }}</div>
+          {{ else }}
+
+            {{ if eq .MsgCode  "login-maybe" }}
+              <div class="instruction-block">This email address is already in use.</div>
+              <div class="detail-block">Looks like you've already registered. Try logging in instead:</div>
+            {{ end }}
+
+            {{ if eq .MsgCode  "register-maybe" }}
+              <div class="instruction-block">There's no account for this user.</div>
+              <div class="detail-block">Try registering with this first:</div>
+            {{ end }}
+
+            {{ if eq .MsgCode  "wrong-connector" }}
+              <div class="instruction-block">Wrong login method.</div>
+              <div class="detail-block">Try logging in again with this instead:</div>
+            {{ end }}
+          
+
+            {{ range $c := .Links }}
+                <div>
+                  <a class="btn-link" href="{{ $c.URL }}" target="_self">
+                    <button class="btn">
+                      <span class="btn-icon btn-icon-google"></span>
+                      <span class="btn-text">Login with {{ $c.ID }}</span>
+                    </button>
+                  </a>
+                </div>
+            {{ end }}
+          {{ end }}
+
+        </div>
+      </div>
+
+      {{ if .Register }}
+        Already have an account? <a href="{{ .RegisterOrLoginURL }}">Log in</a>
+      {{ else }}
+        Don't have an account yet? <a href="{{ .RegisterOrLoginURL }}">Register</a>
+      {{ end }}
+      <a id="contact-link" href="mailto:support@coreos.com">Contact CoreOS</a>
+    </div>
+
+  </body>
+</html>
+
diff --git a/static/html/register.html b/static/html/register.html
new file mode 100644
index 00000000..5d2408b1
--- /dev/null
+++ b/static/html/register.html
@@ -0,0 +1,35 @@
+<html>
+
+  <body>
+    {{ if .Error }}
+    <div>
+      {{ .Message }}
+    </div>
+    {{ else }}
+
+    <ul>
+    {{ range $fe := .FormErrors }}
+       <li>{{ $fe.Field }}: {{ $fe.Error }} </li>
+    {{ end }}
+    </ul>
+    
+    <h2>Please Register </h2>
+    <form id="registerForm" method="POST" action="/register">
+      <label for="email">Email</label>
+      <input type="text" name="email" value="{{.Email}}" />
+      <br>
+
+      <!-- The client side should be responsible for making sure password is entered correctly twice -->
+      {{ if .Local }}
+        <label for="password">Password</label>
+        <input type="text" name="password" value="{{.Password}}" />
+        <br>
+      {{ end }}
+
+      <input type="hidden" name="code" value="{{.Code}}"/>
+      <input type="hidden" name="validate" value="1"/>
+      <button>Submit</submit>
+    </form>
+    {{ end }}
+  </body>
+</html>
diff --git a/static/html/reset-password.html b/static/html/reset-password.html
new file mode 100644
index 00000000..5d8c5046
--- /dev/null
+++ b/static/html/reset-password.html
@@ -0,0 +1,28 @@
+<html>
+  <body>
+    {{ if .Success }}
+      Yay, you changed your password!
+    {{ else }}
+      {{ $lenError := len .Error }}
+      {{ $hasError := ne $lenError 0 }}
+      {{ if $hasError }}
+        <h3>
+          {{ .Error }}
+        </h3>
+        <div>
+          {{ .Message }}
+        </div>
+      {{ end }}
+
+      {{ if not .DontShowForm }}
+        <form id="resetPasswordForm" method="POST" action="/reset-password">
+          <label for="password">Password</label>
+          <input type="password" name="password" value="" />
+          <br/>
+          <button>Submit</button>
+          <input type="hidden" name="token" value="{{ .Token }}" />
+        </form>
+        {{ end }}
+      {{ end }}
+  <body>
+</html>
diff --git a/static/html/send-reset-password.html b/static/html/send-reset-password.html
new file mode 100644
index 00000000..c2d115ff
--- /dev/null
+++ b/static/html/send-reset-password.html
@@ -0,0 +1,30 @@
+<html>
+
+  <body>
+    {{ if .EmailSent }}
+
+    <h1>Thank you, please check your email!</h1>
+    {{ .Email }} has been sent an email with instructions to reset your password.
+
+    {{ else }}
+
+    {{ if .Error }}
+      <div>
+        {{ .Message }}
+      </div>
+    {{ end }}
+
+    <h2>Reset Your Password </h2>
+    <P>We will send you an email with a link to reset your password.</p>
+    <form id="sendResetPasswordForm" method="POST" action="/send-reset-password">
+      <label for="email">Email</label>
+      <input type="text" name="email" value="" />
+      <br/>
+      <button>Submit</button>
+      <input type="hidden" name="redirect_uri" value="{{ .RedirectURL }}" />
+      <input type="hidden" name="client_id" value="{{ .ClientID }}" />
+    </form>
+  {{ end }}
+ 
+  </body>
+</html>
diff --git a/static/html/verify-email.html b/static/html/verify-email.html
new file mode 100644
index 00000000..e10d3bb1
--- /dev/null
+++ b/static/html/verify-email.html
@@ -0,0 +1,10 @@
+<html>
+  <body>
+    <h3>
+      {{ .Error }}
+    </h3>
+    <div>
+      {{ .Message }}
+    </div>
+  <body>
+</html>
diff --git a/static/img/coreos.svg b/static/img/coreos.svg
new file mode 100644
index 00000000..503f58ab
--- /dev/null
+++ b/static/img/coreos.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" fill="#666" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 215 215" xml:space="preserve">
+  <g>
+    <g>
+      <path d="M107.479,1.075c-58.677,0-106.404,47.73-106.404,106.398c0,58.672,47.727,106.399,106.404,106.399
+              c58.659,0,106.39-47.727,106.39-106.399C213.869,48.805,166.138,1.075,107.479,1.075z M147.449,134.627
+              c-0.88,0.128-1.749,0.251-2.632,0.364c-8.03,1.038-16.602,1.743-25.561,2.078c-3.856,0.144-7.793,0.231-11.776,0.231
+              c-3.995,0-7.92-0.086-11.788-0.231c-8.948-0.335-17.526-1.04-25.549-2.078c-0.716-5.987-1.201-12.216-1.443-18.623
+              c-0.116-2.926-0.173-5.896-0.173-8.895c0-3.002,0.057-5.966,0.173-8.898c0.243-6.408,0.728-12.633,1.443-18.62
+              c0.144-1.246,0.306-2.485,0.473-3.709c5.241-38.04,19.752-65.408,36.863-65.408c53.364,0,96.632,43.262,96.633,96.635
+              C204.112,119.547,180.866,129.934,147.449,134.627z"/>
+      <path d="M147.448,80.316c-0.969-1.414-2.009-2.768-3.117-4.069c-8.866-10.451-22.074-17.092-36.852-17.092
+              c-4.791,0-9.057,7.333-11.788,18.72c-1.085,4.54-1.928,9.721-2.47,15.343c-0.428,4.505-0.658,9.297-0.658,14.255
+              s0.231,9.751,0.658,14.252c4.508,0.428,9.293,0.657,14.258,0.657c4.959,0,9.744-0.23,14.252-0.657
+              c9.911-0.94,18.466-2.846,24.527-5.357c5.986-2.476,9.528-5.559,9.528-8.895C155.786,97.407,152.712,88.057,147.448,80.316z"/>
+    </g>
+  </g>
+</svg>
diff --git a/static/img/google.svg b/static/img/google.svg
new file mode 100644
index 00000000..c3674562
--- /dev/null
+++ b/static/img/google.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100%" height="100%" viewBox="0 0 32 32" fill="#666">
+  <path d="M0 24.571v-17.143q0-2.125 1.509-3.634t3.634-1.509h17.143q2.125 0 3.634 1.509t1.509 3.634v17.143q0 2.125-1.509 3.634t-3.634 1.509h-17.143q-2.125 0-3.634-1.509t-1.509-3.634zM4.929 21.911q0 0.768 0.33 1.384t0.866 1.009 1.232 0.661 1.384 0.375 1.366 0.107q1.071 0 2.152-0.277t2.027-0.821 1.536-1.473 0.589-2.089q0-0.875-0.357-1.598t-0.875-1.188-1.036-0.848-0.875-0.786-0.357-0.795 0.277-0.759 0.67-0.705 0.786-0.75 0.67-1.063 0.277-1.473q0-1.071-0.402-1.777t-1.295-1.616h1.482l1.571-1.143h-4.732q-1.518 0-2.875 0.571t-2.277 1.75-0.92 2.732q0 1.661 1.152 2.759t2.83 1.098q0.393 0 0.768-0.054-0.232 0.518-0.232 0.964 0 0.786 0.714 1.679-3.125 0.214-4.589 1.125-0.839 0.518-1.348 1.304t-0.509 1.696zM7.054 21.393q0-0.821 0.446-1.429t1.17-0.92 1.464-0.446 1.509-0.134q0.357 0 0.554 0.036 0.036 0.018 0.411 0.295t0.464 0.339 0.411 0.321 0.438 0.393 0.339 0.402 0.304 0.464 0.161 0.473 0.080 0.563q0 1.357-1.045 2.009t-2.491 0.652q-0.732 0-1.438-0.17t-1.348-0.509-1.036-0.946-0.393-1.393zM8.25 10.125q0-1.089 0.571-1.857t1.643-0.768q0.946 0 1.67 0.804t1.036 1.804 0.313 1.911q0 1.071-0.589 1.777t-1.643 0.705q-0.946 0-1.661-0.759t-1.027-1.723-0.313-1.893zM17.143 15.429h2.286v2.857h1.143v-2.857h2.286v-1.143h-2.286v-2.286h-1.143v2.286h-2.286v1.143z"></path>
+</svg>
diff --git a/test b/test
new file mode 100755
index 00000000..6d8e5b51
--- /dev/null
+++ b/test
@@ -0,0 +1,56 @@
+#!/bin/bash -e
+#
+# Run all tests (not including functional)
+#   ./test
+#   ./test -v
+#
+# Run tests for one package
+#   PKG=./unit ./test
+#   PKG=ssh ./test
+#
+
+# Invoke ./cover for HTML output
+COVER=${COVER:-"-cover"}
+
+source ./build
+
+TESTABLE="connector db integration pkg/crypto pkg/flag pkg/http pkg/net pkg/time pkg/html functional/repo server session user/api"
+FORMATTABLE="$TESTABLE cmd/dexctl cmd/dex-worker cmd/dex-overlord examples/app functional pkg/log"
+
+# user has not provided PKG override
+if [ -z "$PKG" ]; then
+	TEST=$TESTABLE
+	FMT=$FORMATTABLE
+
+# user has provided PKG override
+else
+	# strip out slashes and dots from PKG=./foo/
+	TEST=${PKG//\//}
+	TEST=${TEST//./}
+
+	# only run gofmt on packages provided by user
+	FMT="$TEST"
+fi
+
+# split TEST into an array and prepend repo path to each local package
+split=(${TEST// / })
+TEST=${split[@]/#/github.com/coreos/dex/}
+
+echo "Running tests..."
+go test ${COVER} $@ ${TEST}
+
+echo "Checking gofmt..."
+fmtRes=$(gofmt -l $FMT)
+if [ -n "${fmtRes}" ]; then
+	echo -e "gofmt checking failed:\n${fmtRes}"
+	exit 255
+fi
+
+echo "Checking govet..."
+vetRes=$(go vet $TEST)
+if [ -n "${vetRes}" ]; then
+	echo -e "govet checking failed:\n${vetRes}"
+	exit 255
+fi
+
+echo "Success"
diff --git a/test-functional b/test-functional
new file mode 100755
index 00000000..92c8d8dd
--- /dev/null
+++ b/test-functional
@@ -0,0 +1,4 @@
+#!/bin/bash -e
+
+source ./build
+go test $@ github.com/coreos/dex/functional
diff --git a/user/api/api.go b/user/api/api.go
new file mode 100644
index 00000000..11cef802
--- /dev/null
+++ b/user/api/api.go
@@ -0,0 +1,240 @@
+package api
+
+import (
+	"crypto/rand"
+	"encoding/base64"
+	"errors"
+	"fmt"
+	"net/http"
+	"net/url"
+	"time"
+
+	"github.com/coreos/dex/client"
+	"github.com/coreos/dex/pkg/log"
+	schema "github.com/coreos/dex/schema/workerschema"
+	"github.com/coreos/dex/user"
+)
+
+var (
+	errorMap = map[error]Error{
+		user.ErrorNotFound:       ErrorResourceNotFound,
+		user.ErrorDuplicateEmail: ErrorDuplicateEmail,
+		user.ErrorInvalidEmail:   ErrorInvalidEmail,
+		client.ErrorNotFound:     ErrorInvalidClient,
+	}
+
+	ErrorInvalidEmail = newError("invalid_email", "invalid email.", http.StatusBadRequest)
+
+	ErrorInvalidClient = newError("invalid_client", "invalid email.", http.StatusBadRequest)
+
+	ErrorDuplicateEmail   = newError("duplicate_email", "Email already in use.", http.StatusBadRequest)
+	ErrorResourceNotFound = newError("resource_not_found", "Resource could not be found.", http.StatusNotFound)
+
+	ErrorUnauthorized = newError("unauthorized", "The given user and client are not authorized to make this request.", http.StatusUnauthorized)
+
+	ErrorMaxResultsTooHigh = newError("max_results_too_high", fmt.Sprintf("The max number of results per page is %d", maxUsersPerPage), http.StatusBadRequest)
+
+	ErrorInvalidRedirectURL = newError("invalid_redirect_url", "The provided redirect URL is invalid for the given client", http.StatusBadRequest)
+)
+
+const (
+	maxUsersPerPage = 100
+)
+
+func internalError(internal error) Error {
+	return Error{
+		Code:     http.StatusInternalServerError,
+		Type:     "server_error",
+		Desc:     "",
+		Internal: internal,
+	}
+}
+
+func newError(typ string, desc string, code int) Error {
+	return Error{
+		Code: code,
+		Type: typ,
+		Desc: desc,
+	}
+}
+
+// Error is the error type returned by AdminAPI methods.
+type Error struct {
+	Type string
+
+	// The HTTP Code to return for this type of error.
+	Code int
+
+	Desc string
+
+	// The underlying error - not to be consumed by external users.
+	Internal error
+}
+
+func (e Error) Error() string {
+	return fmt.Sprintf("%v: Desc: %v Internal: %v", e.Type, e.Desc, e.Internal)
+}
+
+// UsersAPI is the user management API for Dex administrators.
+
+// All calls take a Creds object with the ClientID of the calling app and the
+// calling User. It is assumed that the clientID has already validated as an
+// admin app before calling.
+type UsersAPI struct {
+	manager            *user.Manager
+	localConnectorID   string
+	clientIdentityRepo client.ClientIdentityRepo
+	emailer            Emailer
+}
+
+type Emailer interface {
+	SendResetPasswordEmail(string, url.URL, string) (*url.URL, error)
+}
+
+type Creds struct {
+	ClientID string
+	User     user.User
+}
+
+func NewUsersAPI(manager *user.Manager, cir client.ClientIdentityRepo, emailer Emailer, localConnectorID string) *UsersAPI {
+	return &UsersAPI{
+		manager:            manager,
+		clientIdentityRepo: cir,
+		localConnectorID:   localConnectorID,
+		emailer:            emailer,
+	}
+}
+
+func (u *UsersAPI) GetUser(creds Creds, id string) (schema.User, error) {
+	log.Infof("userAPI: GetUser")
+
+	if !u.Authorize(creds) {
+		return schema.User{}, ErrorUnauthorized
+	}
+
+	usr, err := u.manager.Get(id)
+
+	if err != nil {
+		return schema.User{}, mapError(err)
+	}
+
+	return userToSchemaUser(usr), nil
+}
+
+func (u *UsersAPI) CreateUser(creds Creds, usr schema.User, redirURL url.URL) (schema.UserCreateResponse, error) {
+	log.Infof("userAPI: CreateUser")
+	if !u.Authorize(creds) {
+		return schema.UserCreateResponse{}, ErrorUnauthorized
+	}
+
+	hash, err := generateTempHash()
+	if err != nil {
+		return schema.UserCreateResponse{}, mapError(err)
+	}
+
+	id, err := u.manager.CreateUser(schemaUserToUser(usr), user.Password(hash), u.localConnectorID)
+	if err != nil {
+		return schema.UserCreateResponse{}, mapError(err)
+	}
+
+	userUser, err := u.manager.Get(id)
+	if err != nil {
+		return schema.UserCreateResponse{}, mapError(err)
+	}
+
+	usr = userToSchemaUser(userUser)
+
+	metadata, err := u.clientIdentityRepo.Metadata(creds.ClientID)
+	if err != nil {
+		return schema.UserCreateResponse{}, mapError(err)
+	}
+	validRedirURL, err := client.ValidRedirectURL(&redirURL, metadata.RedirectURLs)
+
+	if err != nil {
+		return schema.UserCreateResponse{}, ErrorInvalidRedirectURL
+	}
+
+	url, err := u.emailer.SendResetPasswordEmail(usr.Email, validRedirURL, creds.ClientID)
+
+	// An email is sent only if we don't get a link and there's no error.
+	emailSent := err == nil && url == nil
+
+	var resetLink string
+	if url != nil {
+		resetLink = url.String()
+	}
+
+	return schema.UserCreateResponse{
+		User:              &usr,
+		EmailSent:         emailSent,
+		ResetPasswordLink: resetLink,
+	}, nil
+}
+
+func (u *UsersAPI) ListUsers(creds Creds, maxResults int, nextPageToken string) ([]*schema.User, string, error) {
+	log.Infof("userAPI: ListUsers")
+
+	if !u.Authorize(creds) {
+		return nil, "", ErrorUnauthorized
+	}
+
+	if maxResults > maxUsersPerPage {
+		return nil, "", ErrorMaxResultsTooHigh
+	}
+
+	users, tok, err := u.manager.List(user.UserFilter{}, maxResults, nextPageToken)
+	if err != nil {
+		return nil, "", mapError(err)
+	}
+
+	list := []*schema.User{}
+	for _, usr := range users {
+		schemaUsr := userToSchemaUser(usr)
+		list = append(list, &schemaUsr)
+	}
+
+	return list, tok, nil
+}
+
+func (u *UsersAPI) Authorize(creds Creds) bool {
+	return creds.User.Admin
+}
+
+func userToSchemaUser(usr user.User) schema.User {
+	return schema.User{
+		Id:            usr.ID,
+		Email:         usr.Email,
+		EmailVerified: usr.EmailVerified,
+		DisplayName:   usr.DisplayName,
+		Admin:         usr.Admin,
+		CreatedAt:     usr.CreatedAt.UTC().Format(time.RFC3339),
+	}
+}
+
+func schemaUserToUser(usr schema.User) user.User {
+	return user.User{
+		ID:            usr.Id,
+		Email:         usr.Email,
+		EmailVerified: usr.EmailVerified,
+		DisplayName:   usr.DisplayName,
+		Admin:         usr.Admin,
+	}
+}
+
+func mapError(e error) error {
+	if mapped, ok := errorMap[e]; ok {
+		return mapped
+	}
+	return internalError(e)
+}
+
+func generateTempHash() (string, error) {
+	b := make([]byte, 32)
+	n, err := rand.Read(b)
+	if err != nil {
+		return "", err
+	} else if n != 32 {
+		return "", errors.New("unable to read enough random bytes")
+	}
+	return base64.URLEncoding.EncodeToString(b), nil
+}
diff --git a/user/api/api_test.go b/user/api/api_test.go
new file mode 100644
index 00000000..a48a220a
--- /dev/null
+++ b/user/api/api_test.go
@@ -0,0 +1,344 @@
+package api
+
+import (
+	"net/url"
+	"testing"
+	"time"
+
+	"github.com/coreos/go-oidc/oidc"
+	"github.com/jonboulle/clockwork"
+	"github.com/kylelemons/godebug/pretty"
+
+	"github.com/coreos/dex/client"
+	"github.com/coreos/dex/repo"
+	schema "github.com/coreos/dex/schema/workerschema"
+	"github.com/coreos/dex/user"
+)
+
+type testEmailer struct {
+	cantEmail       bool
+	lastEmail       string
+	lastClientID    string
+	lastRedirectURL url.URL
+}
+
+// SendResetPasswordEmail returns resetPasswordURL when it can't email, mimicking the behavior of the real UserEmailer.
+func (t *testEmailer) SendResetPasswordEmail(email string, redirectURL url.URL, clientID string) (*url.URL, error) {
+	t.lastEmail = email
+	t.lastRedirectURL = redirectURL
+	t.lastClientID = clientID
+
+	var retURL *url.URL
+	if t.cantEmail {
+		retURL = &resetPasswordURL
+	}
+	return retURL, nil
+}
+
+var (
+	clock = clockwork.NewFakeClock()
+
+	goodCreds = Creds{
+		User: user.User{
+			ID:    "ID-1",
+			Admin: true,
+		},
+		ClientID: "XXX",
+	}
+
+	badCreds = Creds{
+		User: user.User{
+			ID: "ID-2",
+		},
+	}
+
+	resetPasswordURL = url.URL{
+		Host: "dex.example.com",
+		Path: "resetPassword",
+	}
+
+	validRedirURL = url.URL{
+		Scheme: "http",
+		Host:   "client.example.com",
+		Path:   "/callback",
+	}
+)
+
+func makeTestFixtures() (*UsersAPI, *testEmailer) {
+	ur := user.NewUserRepoFromUsers([]user.UserWithRemoteIdentities{
+		{
+			User: user.User{
+				ID:        "ID-1",
+				Email:     "id1@example.com",
+				Admin:     true,
+				CreatedAt: clock.Now(),
+			},
+		}, {
+			User: user.User{
+				ID:        "ID-2",
+				Email:     "id2@example.com",
+				CreatedAt: clock.Now(),
+			},
+		}, {
+			User: user.User{
+				ID:        "ID-3",
+				Email:     "id3@example.com",
+				CreatedAt: clock.Now(),
+			},
+		},
+	})
+	pwr := user.NewPasswordInfoRepoFromPasswordInfos([]user.PasswordInfo{
+		{
+			UserID:   "ID-1",
+			Password: []byte("password-1"),
+		},
+		{
+			UserID:   "ID-2",
+			Password: []byte("password-2"),
+		},
+	})
+	mgr := user.NewManager(ur, pwr, repo.InMemTransactionFactory, user.ManagerOptions{})
+	mgr.Clock = clock
+	ci := oidc.ClientIdentity{
+		Credentials: oidc.ClientCredentials{
+			ID:     "XXX",
+			Secret: "secrete",
+		},
+		Metadata: oidc.ClientMetadata{
+			RedirectURLs: []url.URL{
+				validRedirURL,
+			},
+		},
+	}
+	cir := client.NewClientIdentityRepo([]oidc.ClientIdentity{ci})
+
+	emailer := &testEmailer{}
+	api := NewUsersAPI(mgr, cir, emailer, "local")
+	return api, emailer
+
+}
+
+func TestGetUser(t *testing.T) {
+	tests := []struct {
+		creds   Creds
+		id      string
+		wantErr error
+	}{
+		{
+			creds: goodCreds,
+			id:    "ID-1",
+		},
+		{
+			creds:   badCreds,
+			id:      "ID-1",
+			wantErr: ErrorUnauthorized,
+		},
+		{
+			creds:   goodCreds,
+			id:      "NO_ID",
+			wantErr: ErrorResourceNotFound,
+		},
+	}
+
+	for i, tt := range tests {
+		api, _ := makeTestFixtures()
+		usr, err := api.GetUser(tt.creds, tt.id)
+		if tt.wantErr != nil {
+			if err != tt.wantErr {
+				t.Errorf("case %d: want=%q, got=%q", i, tt.wantErr, err)
+			}
+			continue
+		}
+		if err != nil {
+			t.Errorf("case %d: want nil err, got: %q ", i, err)
+		}
+
+		if usr.Id != tt.id {
+			t.Errorf("case %d: want=%v, got=%v ", i, tt.id, usr.Id)
+		}
+	}
+}
+
+func TestListUsers(t *testing.T) {
+	tests := []struct {
+		creds      Creds
+		filter     user.UserFilter
+		maxResults int
+		pages      int
+		wantErr    error
+		wantIDs    [][]string
+	}{
+		{
+			creds:      goodCreds,
+			pages:      3,
+			maxResults: 1,
+			wantIDs:    [][]string{{"ID-1"}, {"ID-2"}, {"ID-3"}},
+		},
+		{
+			creds:      goodCreds,
+			pages:      1,
+			maxResults: 3,
+			wantIDs:    [][]string{{"ID-1", "ID-2", "ID-3"}},
+		},
+		{
+			creds:      badCreds,
+			pages:      3,
+			maxResults: 1,
+			wantErr:    ErrorUnauthorized,
+		},
+		{
+			creds:      goodCreds,
+			pages:      3,
+			maxResults: 10000,
+			wantErr:    ErrorMaxResultsTooHigh,
+		},
+	}
+
+	for i, tt := range tests {
+		api, _ := makeTestFixtures()
+
+		gotIDs := [][]string{}
+		var next string
+		var err error
+		var users []*schema.User
+		for x := 0; x < tt.pages; x++ {
+			users, next, err = api.ListUsers(tt.creds, tt.maxResults, next)
+			if tt.wantErr != nil {
+				if err != tt.wantErr {
+					t.Errorf("case %d: want=%q, got=%q", i, tt.wantErr, err)
+				}
+				goto NextTest
+			}
+
+			var ids []string
+			for _, usr := range users {
+				ids = append(ids, usr.Id)
+			}
+			gotIDs = append(gotIDs, ids)
+		}
+
+		if diff := pretty.Compare(tt.wantIDs, gotIDs); diff != "" {
+			t.Errorf("case %d: Compare(want, got) = %v", i,
+				diff)
+		}
+	NextTest:
+	}
+}
+
+func TestCreateUser(t *testing.T) {
+	tests := []struct {
+		creds     Creds
+		usr       schema.User
+		redirURL  url.URL
+		cantEmail bool
+
+		wantResponse schema.UserCreateResponse
+		wantErr      error
+	}{
+		{
+			creds: goodCreds,
+			usr: schema.User{
+				Email:         "newuser@example.com",
+				DisplayName:   "New User",
+				EmailVerified: true,
+				Admin:         false,
+			},
+			redirURL: validRedirURL,
+
+			wantResponse: schema.UserCreateResponse{
+				EmailSent: true,
+				User: &schema.User{
+					Email:         "newuser@example.com",
+					DisplayName:   "New User",
+					EmailVerified: true,
+					Admin:         false,
+					CreatedAt:     clock.Now().Format(time.RFC3339),
+				},
+			},
+		},
+		{
+			creds: goodCreds,
+			usr: schema.User{
+				Email:         "newuser@example.com",
+				DisplayName:   "New User",
+				EmailVerified: true,
+				Admin:         false,
+			},
+			redirURL:  validRedirURL,
+			cantEmail: true,
+
+			wantResponse: schema.UserCreateResponse{
+				User: &schema.User{
+					Email:         "newuser@example.com",
+					DisplayName:   "New User",
+					EmailVerified: true,
+					Admin:         false,
+					CreatedAt:     clock.Now().Format(time.RFC3339),
+				},
+				ResetPasswordLink: resetPasswordURL.String(),
+			},
+		},
+		{
+			creds: goodCreds,
+			usr: schema.User{
+				Email:         "newuser@example.com",
+				DisplayName:   "New User",
+				EmailVerified: true,
+				Admin:         false,
+			},
+			redirURL: url.URL{Host: "scammers.com"},
+
+			wantErr: ErrorInvalidRedirectURL,
+		},
+		{
+			creds: badCreds,
+			usr: schema.User{
+				Email:         "newuser@example.com",
+				DisplayName:   "New User",
+				EmailVerified: true,
+				Admin:         false,
+			},
+			redirURL: validRedirURL,
+
+			wantErr: ErrorUnauthorized,
+		},
+	}
+
+	for i, tt := range tests {
+		api, emailer := makeTestFixtures()
+		emailer.cantEmail = tt.cantEmail
+
+		response, err := api.CreateUser(tt.creds, tt.usr, tt.redirURL)
+		if tt.wantErr != nil {
+			if err != tt.wantErr {
+				t.Errorf("case %d: want=%q, got=%q", i, tt.wantErr, err)
+			}
+			continue
+		}
+		if err != nil {
+			t.Errorf("case %d: want nil err, got: %q ", i, err)
+		}
+
+		newID := response.User.Id
+		if newID == "" {
+			t.Errorf("case %d: expected non-empty newID", i)
+		}
+
+		tt.wantResponse.User.Id = newID
+		if diff := pretty.Compare(tt.wantResponse, response); diff != "" {
+			t.Errorf("case %d: Compare(want, got) = %v", i,
+				diff)
+		}
+
+		wantEmalier := testEmailer{
+			cantEmail:       tt.cantEmail,
+			lastEmail:       tt.usr.Email,
+			lastClientID:    tt.creds.ClientID,
+			lastRedirectURL: tt.redirURL,
+		}
+		if diff := pretty.Compare(wantEmalier, emailer); diff != "" {
+			t.Errorf("case %d: Compare(want, got) = %v", i,
+				diff)
+		}
+	}
+}
diff --git a/user/email/email.go b/user/email/email.go
new file mode 100644
index 00000000..ab6377e8
--- /dev/null
+++ b/user/email/email.go
@@ -0,0 +1,161 @@
+package email
+
+import (
+	"net/url"
+	"time"
+
+	"github.com/coreos/go-oidc/jose"
+
+	"github.com/coreos/dex/email"
+	"github.com/coreos/dex/pkg/log"
+	"github.com/coreos/dex/user"
+)
+
+// UserEmailer provides functions for sending emails to Users.
+type UserEmailer struct {
+	ur                  user.UserRepo
+	pwi                 user.PasswordInfoRepo
+	signerFn            signerFunc
+	tokenValidityWindow time.Duration
+	issuerURL           url.URL
+	emailer             *email.TemplatizedEmailer
+	fromAddress         string
+
+	passwordResetURL url.URL
+	verifyEmailURL   url.URL
+}
+
+// NewUserEmailer creates a new UserEmailer.
+func NewUserEmailer(ur user.UserRepo,
+	pwi user.PasswordInfoRepo,
+	signerFn signerFunc,
+	tokenValidityWindow time.Duration,
+	issuerURL url.URL,
+	emailer *email.TemplatizedEmailer,
+	fromAddress string,
+	passwordResetURL url.URL,
+	verifyEmailURL url.URL,
+) *UserEmailer {
+	return &UserEmailer{
+		ur:                  ur,
+		pwi:                 pwi,
+		signerFn:            signerFn,
+		tokenValidityWindow: tokenValidityWindow,
+		issuerURL:           issuerURL,
+		emailer:             emailer,
+		fromAddress:         fromAddress,
+		passwordResetURL:    passwordResetURL,
+		verifyEmailURL:      verifyEmailURL,
+	}
+}
+
+// SendResetPasswordEmail sends a password reset email to the user specified by the email addresss, containing a link with a signed token which can be visitied to initiate the password change/reset process.
+// This method DOES NOT check for client ID, redirect URL validity - it is expected that upstream users have already done so.
+// If there is no emailer is configured, the URL of the aforementioned link is returned, otherwise nil is returned.
+func (u *UserEmailer) SendResetPasswordEmail(email string, redirectURL url.URL, clientID string) (*url.URL, error) {
+	usr, err := u.ur.GetByEmail(nil, email)
+	if err == user.ErrorNotFound {
+		log.Errorf("No Such user for email: %q", email)
+		return nil, err
+	}
+	if err != nil {
+		log.Errorf("Error getting user: %q", err)
+		return nil, err
+	}
+
+	pwi, err := u.pwi.Get(nil, usr.ID)
+	if err == user.ErrorNotFound {
+		// TODO(bobbyrullo): In this case, maybe send a different email explaining that
+		// they don't have a local password.
+		log.Errorf("No Password for userID: %q", usr.ID)
+		return nil, err
+	}
+	if err != nil {
+		log.Errorf("Error getting password: %q", err)
+		return nil, err
+	}
+
+	signer, err := u.signerFn()
+	if err != nil {
+		log.Errorf("error getting signer: %v", err)
+		return nil, err
+	}
+
+	passwordReset := user.NewPasswordReset(usr, pwi.Password, u.issuerURL,
+		clientID, redirectURL, u.tokenValidityWindow)
+	token, err := passwordReset.Token(signer)
+	if err != nil {
+		log.Errorf("error getting tokenizing PasswordReset: %v", err)
+		return nil, err
+	}
+
+	resetURL := u.passwordResetURL
+	q := resetURL.Query()
+	q.Set("token", token)
+	resetURL.RawQuery = q.Encode()
+
+	if u.emailer != nil {
+		err = u.emailer.SendMail(u.fromAddress, "Reset your password.", "password-reset",
+			map[string]interface{}{
+				"email": usr.Email,
+				"link":  resetURL.String(),
+			}, usr.Email)
+		if err != nil {
+			log.Errorf("error sending password reset email %v: ", err)
+		}
+		return nil, err
+	}
+	return &resetURL, nil
+}
+
+// SendEmailVerification sends an email to the user with the given userID containing a link which when visited marks the user as having had their email verified.
+// If there is no emailer is configured, the URL of the aforementioned link is returned, otherwise nil is returned.
+func (u *UserEmailer) SendEmailVerification(userID, clientID string, redirectURL url.URL) (*url.URL, error) {
+	usr, err := u.ur.Get(nil, userID)
+	if err == user.ErrorNotFound {
+		log.Errorf("No Such user for ID: %q", userID)
+		return nil, err
+	}
+	if err != nil {
+		log.Errorf("Error getting user: %q", err)
+		return nil, err
+	}
+
+	ev := user.NewEmailVerification(usr, clientID, u.issuerURL, redirectURL, u.tokenValidityWindow)
+
+	signer, err := u.signerFn()
+	if err != nil {
+		log.Errorf("error getting signer: %v", err)
+		return nil, err
+	}
+
+	token, err := ev.Token(signer)
+	if err != nil {
+		return nil, err
+	}
+
+	verifyURL := u.verifyEmailURL
+	q := verifyURL.Query()
+	q.Set("token", token)
+	verifyURL.RawQuery = q.Encode()
+
+	if u.emailer != nil {
+		err = u.emailer.SendMail(u.fromAddress, "Please verify your email address.", "verify-email",
+			map[string]interface{}{
+				"email": usr.Email,
+				"link":  verifyURL.String(),
+			}, usr.Email)
+		if err != nil {
+			log.Errorf("error sending email verification email %v: ", err)
+		}
+		return nil, err
+
+	}
+	return &verifyURL, nil
+}
+
+func (u *UserEmailer) SetEmailer(emailer *email.TemplatizedEmailer) {
+	u.emailer = emailer
+}
+
+type signerFunc func() (jose.Signer, error)
diff --git a/user/email/email_test.go b/user/email/email_test.go
new file mode 100644
index 00000000..9ed6c804
--- /dev/null
+++ b/user/email/email_test.go
@@ -0,0 +1,313 @@
+package email
+
+import (
+	"fmt"
+	htmltemplate "html/template"
+	"net/url"
+	"testing"
+	"text/template"
+	"time"
+
+	"github.com/coreos/go-oidc/jose"
+	"github.com/coreos/go-oidc/key"
+	"github.com/kylelemons/godebug/pretty"
+
+	"github.com/coreos/dex/email"
+	"github.com/coreos/dex/user"
+)
+
+var (
+	validityWindow   = time.Hour * 1
+	issuerURL        = url.URL{Host: "dex.example.com"}
+	fromAddress      = "dex@example.com"
+	passwordResetURL = url.URL{Host: "dex.example.com", Path: "passwordReset"}
+	verifyEmailURL   = url.URL{Host: "dex.example.com", Path: "verifyEmail"}
+	redirURL         = url.URL{Host: "client.example.com", Path: "/redirURL"}
+	clientID         = "XXX"
+)
+
+type testEmailer struct {
+	from, subject, text, html string
+	to                        []string
+	sent                      bool
+}
+
+func (t *testEmailer) SendMail(from, subject, text, html string, to ...string) error {
+	t.from = from
+	t.subject = subject
+	t.text = text
+	t.html = html
+	t.to = to
+	t.sent = true
+
+	return nil
+}
+
+func makeTestFixtures() (*UserEmailer, *testEmailer, *key.PublicKey) {
+	ur := user.NewUserRepoFromUsers([]user.UserWithRemoteIdentities{
+		{
+			User: user.User{
+				ID:    "ID-1",
+				Email: "id1@example.com",
+				Admin: true,
+			},
+		}, {
+			User: user.User{
+				ID:    "ID-2",
+				Email: "id2@example.com",
+			},
+		}, {
+			User: user.User{
+				ID:    "ID-3",
+				Email: "id3@example.com",
+			},
+		},
+	})
+	pwr := user.NewPasswordInfoRepoFromPasswordInfos([]user.PasswordInfo{
+		{
+			UserID:   "ID-1",
+			Password: []byte("password-1"),
+		},
+		{
+			UserID:   "ID-2",
+			Password: []byte("password-2"),
+		},
+	})
+
+	privKey, err := key.GeneratePrivateKey()
+	if err != nil {
+		panic(fmt.Sprintf("Failed to generate private key, error=%v", err))
+	}
+
+	publicKey := key.NewPublicKey(privKey.JWK())
+	signer := privKey.Signer()
+	signerFn := func() (jose.Signer, error) {
+		return signer, nil
+	}
+
+	textTemplateString := `{{define "password-reset.txt"}}{{.link}}{{end}}
+{{define "verify-email.txt"}}{{.link}}{{end}}"`
+	textTemplates := template.New("text")
+	_, err = textTemplates.Parse(textTemplateString)
+	if err != nil {
+		panic(fmt.Sprintf("error parsing text templates: %v", err))
+	}
+
+	htmlTemplates := htmltemplate.New("html")
+
+	emailer := &testEmailer{}
+	tEmailer := email.NewTemplatizedEmailerFromTemplates(textTemplates, htmlTemplates, emailer)
+
+	userEmailer := NewUserEmailer(ur, pwr, signerFn, validityWindow, issuerURL, tEmailer, fromAddress, passwordResetURL, verifyEmailURL)
+
+	return userEmailer, emailer, publicKey
+}
+
+func TestSendResetPasswordEmail(t *testing.T) {
+	tests := []struct {
+		email      string
+		hasEmailer bool
+
+		wantUserID   string
+		wantPassword string
+		wantURL      bool
+		wantEmail    bool
+		wantErr      bool
+	}{
+		{
+			// typical case with an emailer.
+			email:      "id1@example.com",
+			hasEmailer: true,
+
+			wantURL:      false,
+			wantUserID:   "ID-1",
+			wantPassword: "password-1",
+			wantEmail:    true,
+		},
+		{
+
+			// typical case without an emailer.
+			email:      "id1@example.com",
+			hasEmailer: false,
+
+			wantURL:      true,
+			wantUserID:   "ID-1",
+			wantPassword: "password-1",
+			wantEmail:    false,
+		},
+		{
+			// no such user.
+			email:      "noone@example.com",
+			hasEmailer: false,
+			wantErr:    true,
+		},
+		{
+			// user with no local password.
+			email:      "id3@example.com",
+			hasEmailer: false,
+			wantErr:    true,
+		},
+	}
+
+	for i, tt := range tests {
+		ue, emailer, pubKey := makeTestFixtures()
+		if !tt.hasEmailer {
+			ue.SetEmailer(nil)
+		}
+		resetLink, err := ue.SendResetPasswordEmail(tt.email, redirURL, clientID)
+		if tt.wantErr {
+			if err == nil {
+				t.Errorf("case %d: want non-nil err.", i)
+			}
+			continue
+		}
+
+		if tt.wantURL {
+			if resetLink == nil {
+				t.Errorf("case %d: want non-nil resetLink", i)
+				continue
+			}
+		} else if resetLink != nil {
+			t.Errorf("case %d: want resetLink==nil, got==%v", i, resetLink.String())
+			continue
+		}
+
+		if tt.wantEmail {
+			if !emailer.sent {
+				t.Errorf("case %d: want emailer.sent", i)
+				continue
+			}
+
+			// In this case the link is in the email.
+			resetLink, err = url.Parse(emailer.text)
+			if err != nil {
+				t.Errorf("case %d: want non-nil err, got: %q", i, err)
+			}
+			if tt.email != emailer.to[0] {
+				t.Errorf("case %d: want==%v, got==%v", i, tt.email, emailer.to[0])
+			}
+
+			if fromAddress != emailer.from {
+				t.Errorf("case %d: want==%v, got==%v", i, fromAddress, emailer.from)
+			}
+
+		} else if emailer.sent {
+			t.Errorf("case %d: want !emailer.sent", i)
+		}
+
+		token := resetLink.Query().Get("token")
+		pr, err := user.ParseAndVerifyPasswordResetToken(token, issuerURL,
+			[]key.PublicKey{*pubKey})
+
+		if diff := pretty.Compare(redirURL, pr.Callback()); diff != "" {
+			t.Errorf("case %d: Compare(want, got) = %v", i, diff)
+		}
+
+		if tt.wantUserID != pr.UserID() {
+			t.Errorf("case %d: want==%v, got==%v", i, tt.wantUserID, pr.UserID())
+		}
+	}
+}
+
+func TestSendEmailVerificationEmail(t *testing.T) {
+	tests := []struct {
+		userID     string
+		hasEmailer bool
+
+		wantEmailAddress string
+		wantURL          bool
+		wantEmail        bool
+		wantErr          bool
+	}{
+		{
+			// typical case with an emailer.
+			userID:     "ID-1",
+			hasEmailer: true,
+
+			wantURL:          false,
+			wantEmailAddress: "id1@example.com",
+			wantEmail:        true,
+		},
+		{
+
+			// typical case without an emailer.
+			userID:     "ID-1",
+			hasEmailer: false,
+
+			wantURL:          true,
+			wantEmailAddress: "id1@example.com",
+			wantEmail:        false,
+		},
+		{
+			// no such user.
+			userID:     "noone@example.com",
+			hasEmailer: false,
+			wantErr:    true,
+		},
+		{
+			// user with no local password.
+			userID:     "id3@example.com",
+			hasEmailer: false,
+			wantErr:    true,
+		},
+	}
+
+	for i, tt := range tests {
+		ue, emailer, pubKey := makeTestFixtures()
+		if !tt.hasEmailer {
+			ue.SetEmailer(nil)
+		}
+		verifyLink, err := ue.SendEmailVerification(tt.userID, clientID, redirURL)
+		if tt.wantErr {
+			if err == nil {
+				t.Errorf("case %d: want non-nil err.", i)
+			}
+			continue
+		}
+
+		if tt.wantURL {
+			if verifyLink == nil {
+				t.Errorf("case %d: want non-nil verifyLink", i)
+				continue
+			}
+		} else if verifyLink != nil {
+			t.Errorf("case %d: want verifyLink==nil, got==%v", i, verifyLink.String())
+			continue
+		}
+
+		if tt.wantEmail {
+			if !emailer.sent {
+				t.Errorf("case %d: want emailer.sent", i)
+				continue
+			}
+
+			// In this case the link is in the email.
+			verifyLink, err = url.Parse(emailer.text)
+			if err != nil {
+				t.Errorf("case %d: want non-nil err, got: %q", i, err)
+			}
+			if tt.wantEmailAddress != emailer.to[0] {
+				t.Errorf("case %d: want==%v, got==%v", i, tt.wantEmailAddress, emailer.to[0])
+			}
+
+			if fromAddress != emailer.from {
+				t.Errorf("case %d: want==%v, got==%v", i, fromAddress, emailer.from)
+			}
+
+		} else if emailer.sent {
+			t.Errorf("case %d: want !emailer.sent", i)
+		}
+
+		token := verifyLink.Query().Get("token")
+		ev, err := user.ParseAndVerifyEmailVerificationToken(token, issuerURL,
+			[]key.PublicKey{*pubKey})
+
+		if diff := pretty.Compare(redirURL, ev.Callback()); diff != "" {
+			t.Errorf("case %d: Compare(want, got) = %v", i, diff)
+		}
+
+		if tt.wantEmailAddress != ev.Email() {
+			t.Errorf("case %d: want==%v, got==%v", i, tt.wantEmailAddress, ev.UserID())
+		}
+	}
+}
diff --git a/user/email_verification.go b/user/email_verification.go
new file mode 100644
index 00000000..991941f9
--- /dev/null
+++ b/user/email_verification.go
@@ -0,0 +1,149 @@
+package user
+
+import (
+	"errors"
+	"fmt"
+	"net/url"
+	"time"
+
+	"github.com/jonboulle/clockwork"
+
+	"github.com/coreos/go-oidc/jose"
+	"github.com/coreos/go-oidc/key"
+	"github.com/coreos/go-oidc/oidc"
+)
+
+const (
+	// Claim representing where a user should be sent after verifying their email address.
+	ClaimEmailVerificationCallback = "http://coreos.com/email/verification-callback"
+
+	// ClaimEmailVerificationEmail represents the email to be verified. Note
+	// that we are intentionally not using the "email" claim for this purpose.
+	ClaimEmailVerificationEmail = "http://coreos.com/email/verificationEmail"
+)
+
+var (
+	clock = clockwork.NewRealClock()
+)
+
+// NewEmailVerification creates an object which can be sent to a user in serialized form to verify that they control an email address.
+// The clientID is the ID of the registering user. The callback is where a user should land after verifying their email.
+func NewEmailVerification(user User, clientID string, issuer url.URL, callback url.URL, expires time.Duration) EmailVerification {
+
+	claims := oidc.NewClaims(issuer.String(), user.ID, clientID, clock.Now(), clock.Now().Add(expires))
+	claims.Add(ClaimEmailVerificationCallback, callback.String())
+	claims.Add(ClaimEmailVerificationEmail, user.Email)
+	return EmailVerification{claims}
+}
+
+type EmailVerification struct {
+	claims jose.Claims
+}
+
+// Token serializes the EmailVerification into a signed JWT.
+func (e EmailVerification) Token(signer jose.Signer) (string, error) {
+	if signer == nil {
+		return "", errors.New("no signer")
+	}
+
+	jwt, err := jose.NewSignedJWT(e.claims, signer)
+	if err != nil {
+		return "", err
+	}
+
+	return jwt.Encode(), nil
+}
+
+// ParseAndVerifyEmailVerificationToken parses a string into a an EmailVerification, verifies the signature, and ensures that required claims are present.
+// In addition to the usual claims required by the OIDC spec, "aud" and "sub" must be present as well as ClaimEmailVerificationCallback and ClaimEmailVerificationEmail.
+func ParseAndVerifyEmailVerificationToken(token string, issuer url.URL, keys []key.PublicKey) (EmailVerification, error) {
+	jwt, err := jose.ParseJWT(token)
+	if err != nil {
+		return EmailVerification{}, err
+	}
+
+	claims, err := jwt.Claims()
+	if err != nil {
+		return EmailVerification{}, err
+	}
+
+	clientID, ok, err := claims.StringClaim("aud")
+	if err != nil {
+		return EmailVerification{}, err
+	}
+	if !ok {
+		return EmailVerification{}, errors.New("no aud(client ID) claim")
+	}
+
+	cb, ok, err := claims.StringClaim(ClaimEmailVerificationCallback)
+	if err != nil {
+		return EmailVerification{}, err
+	}
+	if cb == "" {
+		return EmailVerification{}, fmt.Errorf("no %q claim", ClaimEmailVerificationCallback)
+	}
+	if _, err := url.Parse(cb); err != nil {
+		return EmailVerification{}, fmt.Errorf("callback URL not parseable: %v", cb)
+	}
+
+	email, ok, err := claims.StringClaim(ClaimEmailVerificationEmail)
+	if err != nil {
+		return EmailVerification{}, err
+	}
+	if email == "" {
+		return EmailVerification{}, fmt.Errorf("no %q claim", ClaimEmailVerificationEmail)
+	}
+
+	sub, ok, err := claims.StringClaim("sub")
+	if err != nil {
+		return EmailVerification{}, err
+	}
+	if sub == "" {
+		return EmailVerification{}, errors.New("no sub claim")
+	}
+
+	noop := func() error { return nil }
+
+	keysFunc := func() []key.PublicKey {
+		return keys
+	}
+
+	verifier := oidc.NewJWTVerifier(issuer.String(), clientID, noop, keysFunc)
+	if err := verifier.Verify(jwt); err != nil {
+		return EmailVerification{}, err
+	}
+
+	return EmailVerification{
+		claims: claims,
+	}, nil
+
+}
+
+func (e EmailVerification) UserID() string {
+	uid, ok, err := e.claims.StringClaim("sub")
+	if !ok || err != nil {
+		panic("EmailVerification: no sub claim. This should be impossible.")
+	}
+	return uid
+}
+
+func (e EmailVerification) Email() string {
+	email, ok, err := e.claims.StringClaim(ClaimEmailVerificationEmail)
+	if !ok || err != nil {
+		panic("EmailVerification: no email claim. This should be impossible.")
+	}
+	return email
+}
+
+func (e EmailVerification) Callback() *url.URL {
+	cb, ok, err := e.claims.StringClaim(ClaimEmailVerificationCallback)
+	if !ok || err != nil {
+		panic("EmailVerification: no callback claim. This should be impossible.")
+	}
+
+	cbURL, err := url.Parse(cb)
+	if err != nil {
+		panic("EmailVerificaiton: can't parse callback. This should be impossible.")
+	}
+	return cbURL
+}
diff --git a/user/email_verification_test.go b/user/email_verification_test.go
new file mode 100644
index 00000000..7704dc25
--- /dev/null
+++ b/user/email_verification_test.go
@@ -0,0 +1,155 @@
+package user
+
+import (
+	"net/url"
+	"testing"
+	"time"
+
+	"github.com/jonboulle/clockwork"
+	"github.com/kylelemons/godebug/pretty"
+
+	"github.com/coreos/go-oidc/jose"
+	"github.com/coreos/go-oidc/key"
+)
+
+func TestNewEmailVerification(t *testing.T) {
+	clock = clockwork.NewFakeClock()
+	defer func() {
+		clock = clockwork.NewRealClock()
+	}()
+
+	now := clock.Now()
+
+	issuer, _ := url.Parse("http://example.com")
+	clientID := "myclient"
+	usr := User{ID: "123456", Email: "user@example.com"}
+	callback := "http://client.example.com/callback"
+	expires := time.Hour * 3
+
+	tests := []struct {
+		issuer   url.URL
+		user     User
+		clientID string
+		callback string
+		expires  time.Duration
+		want     jose.Claims
+	}{
+		{
+			issuer:   *issuer,
+			clientID: clientID,
+			user:     usr,
+			callback: callback,
+			expires:  expires,
+			want: map[string]interface{}{
+				"iss": issuer.String(),
+				"aud": clientID,
+				ClaimEmailVerificationCallback: callback,
+				ClaimEmailVerificationEmail:    usr.Email,
+				"exp": float64(now.Add(expires).Unix()),
+				"sub": usr.ID,
+				"iat": float64(now.Unix()),
+			},
+		},
+	}
+
+	for i, tt := range tests {
+		cbURL, err := url.Parse(tt.callback)
+		if err != nil {
+			t.Fatalf("case %d: non-nil err: %q", i, err)
+		}
+		ev := NewEmailVerification(tt.user, tt.clientID, tt.issuer, *cbURL, tt.expires)
+
+		if diff := pretty.Compare(tt.want, ev.claims); diff != "" {
+			t.Errorf("case %d: Compare(want, got): %v", i, diff)
+		}
+
+	}
+}
+
+func TestEmailVerificationParseAndVerify(t *testing.T) {
+
+	issuer, _ := url.Parse("http://example.com")
+	otherIssuer, _ := url.Parse("http://bad.example.com")
+	client := "myclient"
+	user := User{ID: "1234", Email: "user@example.com"}
+	callback, _ := url.Parse("http://client.example.com")
+	expires := time.Hour * 3
+
+	goodEV := NewEmailVerification(user, client, *issuer, *callback, expires)
+	expiredEV := NewEmailVerification(user, client, *issuer, *callback, -expires)
+	wrongIssuerEV := NewEmailVerification(user, client, *otherIssuer, *callback, expires)
+	noSubEV := NewEmailVerification(User{}, client, *issuer, *callback, expires)
+
+	privKey, err := key.GeneratePrivateKey()
+	if err != nil {
+		t.Fatalf("Failed to generate private key, error=%v", err)
+	}
+	signer := privKey.Signer()
+
+	privKey2, err := key.GeneratePrivateKey()
+	if err != nil {
+		t.Fatalf("Failed to generate private key, error=%v", err)
+	}
+	otherSigner := privKey2.Signer()
+
+	tests := []struct {
+		ev      EmailVerification
+		wantErr bool
+		signer  jose.Signer
+	}{
+
+		{
+			ev:      goodEV,
+			signer:  signer,
+			wantErr: false,
+		},
+		{
+			ev:      expiredEV,
+			signer:  signer,
+			wantErr: true,
+		},
+		{
+			ev:      wrongIssuerEV,
+			signer:  signer,
+			wantErr: true,
+		},
+		{
+			ev:      goodEV,
+			signer:  otherSigner,
+			wantErr: true,
+		},
+		{
+			ev:      noSubEV,
+			signer:  signer,
+			wantErr: true,
+		},
+	}
+
+	for i, tt := range tests {
+
+		token, err := tt.ev.Token(tt.signer)
+		if err != nil {
+			t.Errorf("case %d: non-nil error creating token: %v", i, err)
+		}
+
+		ev, err := ParseAndVerifyEmailVerificationToken(token, *issuer,
+			[]key.PublicKey{*key.NewPublicKey(privKey.JWK())})
+
+		if tt.wantErr {
+			t.Logf("err: %v", err)
+			if err == nil {
+				t.Errorf("case %d: want non-nil err, got nil", i)
+			}
+			continue
+		}
+
+		if err != nil {
+			t.Errorf("case %d: non-nil err: %q", i, err)
+
+		}
+
+		if diff := pretty.Compare(tt.ev.claims, ev.claims); diff != "" {
+			t.Errorf("case %d: Compare(want, got): %v", i, diff)
+		}
+	}
+}
diff --git a/user/manager.go b/user/manager.go
new file mode 100644
index 00000000..cc09444c
--- /dev/null
+++ b/user/manager.go
@@ -0,0 +1,317 @@
+package user
+
+import (
+	"errors"
+	"net/url"
+
+	"github.com/jonboulle/clockwork"
+
+	"github.com/coreos/dex/pkg/log"
+	"github.com/coreos/dex/repo"
+)
+
+var (
+	ErrorEVEmailDoesntMatch   = errors.New("email in EV doesn't match user email")
+	ErrorEmailAlreadyVerified = errors.New("email already verified")
+
+	ErrorPasswordAlreadyChanged = errors.New("password has already been changed")
+)
+
+// Manager performs user-related "business-logic" functions on user and related objects.
+// This is in contrast to the Repos which perform little more than CRUD operations.
+type Manager struct {
+	Clock clockwork.Clock
+
+	userRepo        UserRepo
+	pwRepo          PasswordInfoRepo
+	begin           repo.TransactionFactory
+	userIDGenerator UserIDGenerator
+}
+
+type ManagerOptions struct {
+	// This is empty right now but will soon contain configuration information
+	// such as passowrd length, name length, password expiration time and other
+	// variable policies
+}
+
+func NewManager(userRepo UserRepo, pwRepo PasswordInfoRepo, txnFactory repo.TransactionFactory, options ManagerOptions) *Manager {
+	return &Manager{
+		Clock: clockwork.NewRealClock(),
+
+		userRepo:        userRepo,
+		pwRepo:          pwRepo,
+		begin:           txnFactory,
+		userIDGenerator: DefaultUserIDGenerator,
+	}
+}
+
+func (m *Manager) Get(id string) (User, error) {
+	return m.userRepo.Get(nil, id)
+}
+
+func (m *Manager) List(filter UserFilter, maxResults int, nextPageToken string) ([]User, string, error) {
+	return m.userRepo.List(nil, filter, maxResults, nextPageToken)
+}
+
+// CreateUser creates a new user with the given hashedPassword; the connID should be the ID of the local connector.
+// The userID of the created user is returned as the first argument.
+func (m *Manager) CreateUser(user User, hashedPassword Password, connID string) (string, error) {
+	tx, err := m.begin()
+	if err != nil {
+		return "", err
+	}
+
+	insertedUser, err := m.insertNewUser(tx, user.Email, user.EmailVerified)
+	if err != nil {
+		rollback(tx)
+		return "", err
+	}
+
+	user.ID = insertedUser.ID
+	user.CreatedAt = insertedUser.CreatedAt
+	err = m.userRepo.Update(tx, user)
+	if err != nil {
+		rollback(tx)
+		return "", err
+	}
+
+	rid := RemoteIdentity{
+		ConnectorID: connID,
+		ID:          user.ID,
+	}
+	if err := m.userRepo.AddRemoteIdentity(tx, user.ID, rid); err != nil {
+		rollback(tx)
+		return "", err
+	}
+
+	pwi := PasswordInfo{
+		UserID:   user.ID,
+		Password: hashedPassword,
+	}
+	err = m.pwRepo.Create(tx, pwi)
+	if err != nil {
+		rollback(tx)
+		return "", err
+	}
+
+	err = tx.Commit()
+	if err != nil {
+		rollback(tx)
+		return "", err
+	}
+	return user.ID, nil
+}
+
+// RegisterWithRemoteIdentity creates new user and attaches the given remote identity.
+func (m *Manager) RegisterWithRemoteIdentity(email string, emailVerified bool, rid RemoteIdentity) (string, error) {
+	tx, err := m.begin()
+	if err != nil {
+		return "", err
+	}
+
+	if _, err = m.userRepo.GetByRemoteIdentity(tx, rid); err == nil {
+		rollback(tx)
+		return "", ErrorDuplicateRemoteIdentity
+	}
+	if err != ErrorNotFound {
+		rollback(tx)
+		return "", err
+	}
+
+	user, err := m.insertNewUser(tx, email, emailVerified)
+	if err != nil {
+		rollback(tx)
+		return "", err
+	}
+
+	if err := m.userRepo.AddRemoteIdentity(tx, user.ID, rid); err != nil {
+		rollback(tx)
+		return "", err
+	}
+
+	err = tx.Commit()
+	if err != nil {
+		rollback(tx)
+		return "", err
+	}
+	return user.ID, nil
+}
+
+// RegisterWithPassword creates a new user with the given name and password.
+// connID is the connector ID of the ConnectorLocal connector.
+func (m *Manager) RegisterWithPassword(email, plaintext, connID string) (string, error) {
+	tx, err := m.begin()
+	if err != nil {
+		return "", err
+	}
+
+	if !ValidPassword(plaintext) {
+		rollback(tx)
+		return "", ErrorInvalidPassword
+	}
+
+	user, err := m.insertNewUser(tx, email, false)
+	if err != nil {
+		rollback(tx)
+		return "", err
+	}
+
+	rid := RemoteIdentity{
+		ConnectorID: connID,
+		ID:          user.ID,
+	}
+	if err := m.userRepo.AddRemoteIdentity(tx, user.ID, rid); err != nil {
+		rollback(tx)
+		return "", err
+	}
+
+	password, err := NewPasswordFromPlaintext(plaintext)
+	if err != nil {
+		rollback(tx)
+		return "", err
+	}
+	pwi := PasswordInfo{
+		UserID:   user.ID,
+		Password: password,
+	}
+
+	err = m.pwRepo.Create(tx, pwi)
+	if err != nil {
+		rollback(tx)
+		return "", err
+	}
+
+	err = tx.Commit()
+	if err != nil {
+		rollback(tx)
+		return "", err
+	}
+	return user.ID, nil
+}
+
+// VerifyEmail sets EmailVerified to true for the user for the given EmailVerification.
+// The email in the EmailVerification must match the User's email in the
+// repository, and it must not already be verified.
+// This function expects that ParseAndVerifyEmailVerificationToken was used to
+// create it, ensuring that the token was signed and that the JWT was not
+// expired.
+// The callback url (i.e. where to send the user after the verification) is returned.
+func (m *Manager) VerifyEmail(ev EmailVerification) (*url.URL, error) {
+	tx, err := m.begin()
+	if err != nil {
+		return nil, err
+	}
+
+	user, err := m.userRepo.Get(tx, ev.UserID())
+	if err != nil {
+		rollback(tx)
+		return nil, err
+	}
+
+	if user.Email != ev.Email() {
+		rollback(tx)
+		return nil, ErrorEVEmailDoesntMatch
+	}
+
+	if user.EmailVerified {
+		rollback(tx)
+		return nil, ErrorEmailAlreadyVerified
+	}
+
+	user.EmailVerified = true
+
+	err = m.userRepo.Update(tx, user)
+	if err != nil {
+		rollback(tx)
+		return nil, err
+	}
+
+	err = tx.Commit()
+	if err != nil {
+		rollback(tx)
+		return nil, err
+	}
+	return ev.Callback(), nil
+}
+
+func (m *Manager) ChangePassword(pwr PasswordReset, plaintext string) (*url.URL, error) {
+	tx, err := m.begin()
+	if err != nil {
+		return nil, err
+	}
+
+	if !ValidPassword(plaintext) {
+		rollback(tx)
+		return nil, ErrorInvalidPassword
+	}
+
+	pwi, err := m.pwRepo.Get(tx, pwr.UserID())
+	if err != nil {
+		rollback(tx)
+		return nil, err
+	}
+
+	if string(pwi.Password) != string(pwr.Password()) {
+		rollback(tx)
+		return nil, ErrorPasswordAlreadyChanged
+	}
+
+	newPass, err := NewPasswordFromPlaintext(plaintext)
+	if err != nil {
+		rollback(tx)
+		return nil, err
+	}
+
+	pwi.Password = newPass
+	err = m.pwRepo.Update(tx, pwi)
+	if err != nil {
+		rollback(tx)
+		return nil, err
+	}
+
+	err = tx.Commit()
+	if err != nil {
+		rollback(tx)
+		return nil, err
+	}
+	return pwr.Callback(), nil
+}
+
+func (m *Manager) insertNewUser(tx repo.Transaction, email string, emailVerified bool) (User, error) {
+	if !ValidEmail(email) {
+		return User{}, ErrorInvalidEmail
+	}
+
+	var err error
+	if _, err = m.userRepo.GetByEmail(tx, email); err == nil {
+		return User{}, ErrorDuplicateEmail
+	}
+	if err != ErrorNotFound {
+		return User{}, err
+	}
+
+	userID, err := m.userIDGenerator()
+	if err != nil {
+		return User{}, err
+	}
+
+	user := User{
+		ID:            userID,
+		Email:         email,
+		EmailVerified: emailVerified,
+		CreatedAt:     m.Clock.Now(),
+	}
+
+	err = m.userRepo.Create(tx, user)
+	if err != nil {
+		return User{}, err
+	}
+	return user, nil
+}
+
+func rollback(tx repo.Transaction) {
+	err := tx.Rollback()
+	if err != nil {
+		log.Errorf("unable to rollback: %v", err)
+	}
+}
diff --git a/user/manager_test.go b/user/manager_test.go
new file mode 100644
index 00000000..5e9db7b2
--- /dev/null
+++ b/user/manager_test.go
@@ -0,0 +1,436 @@
+package user
+
+import (
+	"net/url"
+	"testing"
+	"time"
+
+	"github.com/coreos/go-oidc/jose"
+	"github.com/jonboulle/clockwork"
+	"github.com/kylelemons/godebug/pretty"
+
+	"github.com/coreos/dex/repo"
+)
+
+type testFixtures struct {
+	ur    UserRepo
+	pwr   PasswordInfoRepo
+	mgr   *Manager
+	clock clockwork.Clock
+}
+
+func makeTestFixtures() *testFixtures {
+	f := &testFixtures{}
+	f.clock = clockwork.NewFakeClock()
+
+	f.ur = NewUserRepoFromUsers([]UserWithRemoteIdentities{
+		{
+			User: User{
+				ID:    "ID-1",
+				Email: "Email-1@example.com",
+			},
+			RemoteIdentities: []RemoteIdentity{
+				{
+					ConnectorID: "local",
+					ID:          "1",
+				},
+			},
+		}, {
+			User: User{
+				ID:            "ID-2",
+				Email:         "Email-2@example.com",
+				EmailVerified: true,
+			},
+			RemoteIdentities: []RemoteIdentity{
+				{
+					ConnectorID: "local",
+					ID:          "2",
+				},
+			},
+		},
+	})
+	f.pwr = NewPasswordInfoRepoFromPasswordInfos([]PasswordInfo{
+		{
+			UserID:   "ID-1",
+			Password: []byte("password-1"),
+		},
+		{
+			UserID:   "ID-2",
+			Password: []byte("password-2"),
+		},
+	})
+	f.mgr = NewManager(f.ur, f.pwr, repo.InMemTransactionFactory, ManagerOptions{})
+	f.mgr.Clock = f.clock
+	return f
+}
+
+func TestRegisterWithRemoteIdentity(t *testing.T) {
+	tests := []struct {
+		email         string
+		emailVerified bool
+		rid           RemoteIdentity
+		err           error
+	}{
+		{
+			email:         "email@example.com",
+			emailVerified: false,
+			rid: RemoteIdentity{
+				ConnectorID: "local",
+				ID:          "1234",
+			},
+			err: nil,
+		},
+		{
+			emailVerified: false,
+			rid: RemoteIdentity{
+				ConnectorID: "local",
+				ID:          "1234",
+			},
+			err: ErrorInvalidEmail,
+		},
+		{
+			email:         "email@example.com",
+			emailVerified: false,
+			rid: RemoteIdentity{
+				ConnectorID: "local",
+				ID:          "1",
+			},
+			err: ErrorDuplicateRemoteIdentity,
+		},
+	}
+
+	for i, tt := range tests {
+		f := makeTestFixtures()
+		userID, err := f.mgr.RegisterWithRemoteIdentity(
+			tt.email,
+			tt.emailVerified,
+			tt.rid)
+
+		if tt.err != nil {
+			if tt.err != err {
+				t.Errorf("case %d: want=%q, got=%q", i, tt.err, err)
+			}
+			continue
+		}
+
+		usr, err := f.ur.Get(nil, userID)
+		if err != nil {
+			t.Errorf("case %d: err != nil: %q", i, err)
+		}
+
+		if usr.Email != tt.email {
+			t.Errorf("case %d: user.Email: want=%q, got=%q", i, tt.email, usr.Email)
+		}
+		if usr.EmailVerified != tt.emailVerified {
+			t.Errorf("case %d: user.EmailVerified: want=%v, got=%v", i, tt.emailVerified, usr.EmailVerified)
+		}
+
+		ridUSR, err := f.ur.GetByRemoteIdentity(nil, tt.rid)
+		if err != nil {
+			t.Errorf("case %d: err != nil: %q", i, err)
+		}
+		if diff := pretty.Compare(usr, ridUSR); diff != "" {
+			t.Errorf("case %d: Compare(want, got) = %v", i, diff)
+		}
+	}
+}
+
+func TestRegisterWithPassword(t *testing.T) {
+	tests := []struct {
+		email     string
+		plaintext string
+		err       error
+	}{
+		{
+			email:     "email@example.com",
+			plaintext: "secretpassword123",
+			err:       nil,
+		},
+		{
+			plaintext: "secretpassword123",
+			err:       ErrorInvalidEmail,
+		},
+		{
+			email: "email@example.com",
+			err:   ErrorInvalidPassword,
+		},
+	}
+
+	for i, tt := range tests {
+		f := makeTestFixtures()
+		connID := "connID"
+		userID, err := f.mgr.RegisterWithPassword(
+			tt.email,
+			tt.plaintext,
+			connID)
+
+		if tt.err != nil {
+			if tt.err != err {
+				t.Errorf("case %d: want=%q, got=%q", i, tt.err, err)
+			}
+			continue
+		}
+
+		usr, err := f.ur.Get(nil, userID)
+		if err != nil {
+			t.Errorf("case %d: err != nil: %q", i, err)
+		}
+
+		if usr.Email != tt.email {
+			t.Errorf("case %d: user.Email: want=%q, got=%q", i, tt.email, usr.Email)
+		}
+		if usr.EmailVerified != false {
+			t.Errorf("case %d: user.EmailVerified: want=%v, got=%v", i, false, usr.EmailVerified)
+		}
+
+		ridUSR, err := f.ur.GetByRemoteIdentity(nil, RemoteIdentity{
+			ID:          userID,
+			ConnectorID: connID,
+		})
+		if err != nil {
+			t.Errorf("case %d: err != nil: %q", i, err)
+		}
+		if diff := pretty.Compare(usr, ridUSR); diff != "" {
+			t.Errorf("case %d: Compare(want, got) = %v", i, diff)
+		}
+
+		pwi, err := f.pwr.Get(nil, userID)
+		if err != nil {
+			t.Errorf("case %d: err != nil: %q", i, err)
+		}
+		ident, err := pwi.Authenticate(tt.plaintext)
+		if err != nil {
+			t.Errorf("case %d: err != nil: %q", i, err)
+		}
+		if ident.ID != userID {
+			t.Errorf("case %d: ident.ID: want=%q, got=%q", i, userID, ident.ID)
+		}
+
+		_, err = pwi.Authenticate(tt.plaintext + "WRONG")
+		if err == nil {
+			t.Errorf("case %d: want non-nil err", i)
+		}
+	}
+}
+
+func TestVerifyEmail(t *testing.T) {
+	now := time.Now()
+	issuer, _ := url.Parse("http://example.com")
+	clientID := "myclient"
+	callback := "http://client.example.com/callback"
+	expires := time.Hour * 3
+
+	makeClaims := func(usr User) jose.Claims {
+		return map[string]interface{}{
+			"iss": issuer.String(),
+			"aud": clientID,
+			ClaimEmailVerificationCallback: callback,
+			ClaimEmailVerificationEmail:    usr.Email,
+			"exp": float64(now.Add(expires).Unix()),
+			"sub": usr.ID,
+			"iat": float64(now.Unix()),
+		}
+	}
+
+	tests := []struct {
+		evClaims jose.Claims
+		wantErr  bool
+	}{
+		{
+			// happy path
+			evClaims: makeClaims(User{ID: "ID-1", Email: "Email-1@example.com"}),
+		},
+		{
+			// non-matching email
+			evClaims: makeClaims(User{ID: "ID-1", Email: "Email-2@example.com"}),
+			wantErr:  true,
+		},
+		{
+			// already verified email
+			evClaims: makeClaims(User{ID: "ID-2", Email: "Email-2@example.com"}),
+			wantErr:  true,
+		},
+		{
+			// non-existent user.
+			evClaims: makeClaims(User{ID: "ID-UNKNOWN", Email: "noone@example.com"}),
+			wantErr:  true,
+		},
+	}
+
+	for i, tt := range tests {
+		f := makeTestFixtures()
+		cb, err := f.mgr.VerifyEmail(EmailVerification{tt.evClaims})
+		if tt.wantErr {
+			if err == nil {
+				t.Errorf("case %d: want non-nil err", i)
+			}
+			continue
+		}
+
+		if err != nil {
+			t.Errorf("case %d: want err=nil got=%q", i, err)
+		}
+
+		if cb.String() != tt.evClaims[ClaimEmailVerificationCallback] {
+			t.Errorf("case %d: want=%q, got=%q", i, cb.String(),
+				tt.evClaims[ClaimEmailVerificationCallback])
+		}
+	}
+}
+
+func TestChangePassword(t *testing.T) {
+	now := time.Now()
+	issuer, _ := url.Parse("http://example.com")
+	clientID := "myclient"
+	callback := "http://client.example.com/callback"
+	expires := time.Hour * 3
+	password := "password-1"
+
+	makeClaims := func(usrID, callback string) jose.Claims {
+		return map[string]interface{}{
+			"iss": issuer.String(),
+			"aud": clientID,
+			ClaimPasswordResetCallback: callback,
+			ClaimPasswordResetPassword: password,
+			"exp": float64(now.Add(expires).Unix()),
+			"sub": usrID,
+			"iat": float64(now.Unix()),
+		}
+	}
+
+	tests := []struct {
+		pwrClaims   jose.Claims
+		newPassword string
+		wantErr     bool
+	}{
+		{
+			// happy path
+			pwrClaims:   makeClaims("ID-1", callback),
+			newPassword: "password-1.1",
+		},
+		{
+			// happy path with no callback
+			pwrClaims:   makeClaims("ID-1", ""),
+			newPassword: "password-1.1",
+		},
+		{
+			// passwords don't match changed
+			pwrClaims:   makeClaims("ID-2", callback),
+			newPassword: "password-1.1",
+			wantErr:     true,
+		},
+		{
+			// user doesn't exist
+			pwrClaims:   makeClaims("ID-123", callback),
+			newPassword: "password-1.1",
+			wantErr:     true,
+		},
+	}
+
+	for i, tt := range tests {
+		f := makeTestFixtures()
+		cb, err := f.mgr.ChangePassword(PasswordReset{tt.pwrClaims}, tt.newPassword)
+		if tt.wantErr {
+			if err == nil {
+				t.Errorf("case %d: want non-nil err", i)
+			}
+			continue
+		}
+
+		if err != nil {
+			t.Errorf("case %d: want err=nil got=%q", i, err)
+			continue
+		}
+
+		var cbString string
+		if cb != nil {
+			cbString = cb.String()
+		}
+		if cbString != tt.pwrClaims[ClaimPasswordResetCallback] {
+			t.Errorf("case %d: want=%q, got=%q", i, cb.String(),
+				tt.pwrClaims[ClaimPasswordResetCallback])
+		}
+	}
+}
+
+func TestCreateUser(t *testing.T) {
+	tests := []struct {
+		usr      User
+		hashedPW Password
+
+		wantErr bool
+	}{
+		{
+			usr: User{
+				DisplayName: "Bob Exampleson",
+				Email:       "bob@example.com",
+			},
+			hashedPW: Password("I am a hash"),
+		},
+		{
+			usr: User{
+				DisplayName: "Al Adminson",
+				Email:       "al@example.com",
+				Admin:       true,
+			},
+			hashedPW: Password("I am a hash"),
+		},
+		{
+			usr: User{
+				DisplayName: "Ed Emailless",
+			},
+			hashedPW: Password("I am a hash"),
+			wantErr:  true,
+		},
+	}
+
+	for i, tt := range tests {
+		f := makeTestFixtures()
+		id, err := f.mgr.CreateUser(tt.usr, tt.hashedPW, "local")
+		if tt.wantErr {
+			if err == nil {
+				t.Errorf("case %d: want non-nil err", i)
+			}
+			continue
+		}
+		if id == "" {
+			t.Errorf("case %d: want non-empty id", i)
+		}
+
+		if err != nil {
+			t.Errorf("case %d: unexpected err: %v", i, err)
+			continue
+		}
+
+		gotUsr, err := f.ur.Get(nil, id)
+		if err != nil {
+			t.Errorf("case %d: unexpected err: %v", i, err)
+		}
+
+		tt.usr.ID = id
+		tt.usr.CreatedAt = f.clock.Now()
+		if diff := pretty.Compare(tt.usr, gotUsr); diff != "" {
+			t.Errorf("case %d: Compare(want, got) = %v", i, diff)
+		}
+
+		pwi, err := f.pwr.Get(nil, id)
+		if err != nil {
+			t.Errorf("case %d: unexpected err: %v", i, err)
+		}
+
+		if string(pwi.Password) != string(tt.hashedPW) {
+			t.Errorf("case %d: want=%q, got=%q", i, tt.hashedPW, pwi.Password)
+		}
+
+		ridUser, err := f.ur.GetByRemoteIdentity(nil, RemoteIdentity{
+			ID:          id,
+			ConnectorID: "local",
+		})
+		if err != nil {
+			t.Errorf("case %d: err != nil: %q", i, err)
+		}
+		if diff := pretty.Compare(gotUsr, ridUser); diff != "" {
+			t.Errorf("case %d: Compare(want, got) = %v", i, diff)
+		}
+	}
+}
diff --git a/user/password.go b/user/password.go
new file mode 100644
index 00000000..d2f966e9
--- /dev/null
+++ b/user/password.go
@@ -0,0 +1,344 @@
+package user
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"net/url"
+	"os"
+	"time"
+
+	"golang.org/x/crypto/bcrypt"
+
+	"github.com/coreos/go-oidc/jose"
+	"github.com/coreos/go-oidc/key"
+	"github.com/coreos/go-oidc/oidc"
+
+	"github.com/coreos/dex/repo"
+)
+
+const (
+	bcryptHashCost = 10
+
+	// Blowfish, the algorithm underlying bcrypt, has a maximum
+	// password length of 72. We explicitly track and check this
+	// since the bcrypt library will silently ignore portions of
+	// a password past the first 72 characters.
+	maxSecretLength = 72
+
+	// ClaimPasswordResetCallback represents where a user should be sent after
+	// resetting their password.
+	ClaimPasswordResetCallback = "http://coreos.com/password/reset-callback"
+
+	// ClaimPasswordResetPassword represents the hash of the password to be
+	// reset; in other words, the old password.
+	ClaimPasswordResetPassword = "http://coreos.com/password/old-hash"
+)
+
+var (
+	PasswordHasher = DefaultPasswordHasher
+
+	ErrorInvalidPassword     = errors.New("invalid Password")
+	ErrorPasswordHashNoMatch = errors.New("password and hash don't match")
+	ErrorPasswordExpired     = errors.New("password has expired")
+)
+
+type Hasher func(string) ([]byte, error)
+
+func DefaultPasswordHasher(s string) ([]byte, error) {
+	pwHash, err := bcrypt.GenerateFromPassword([]byte(s), bcryptHashCost)
+	if err != nil {
+		return nil, err
+	}
+	return Password(pwHash), nil
+}
+
+type Password []byte
+
+func NewPasswordFromPlaintext(plaintext string) (Password, error) {
+	return PasswordHasher(plaintext)
+}
+
+type PasswordInfo struct {
+	UserID string
+
+	Password Password
+
+	PasswordExpires time.Time
+}
+
+func (p PasswordInfo) Authenticate(plaintext string) (*oidc.Identity, error) {
+	if err := bcrypt.CompareHashAndPassword(p.Password, []byte(plaintext)); err != nil {
+		return nil, ErrorPasswordHashNoMatch
+	}
+
+	if !p.PasswordExpires.IsZero() && time.Now().After(p.PasswordExpires) {
+		return nil, ErrorPasswordExpired
+	}
+
+	ident := p.Identity()
+	return &ident, nil
+}
+
+func (p PasswordInfo) Identity() oidc.Identity {
+	return oidc.Identity{
+		ID: p.UserID,
+	}
+}
+
+type PasswordInfoRepo interface {
+	Get(tx repo.Transaction, id string) (PasswordInfo, error)
+	Update(repo.Transaction, PasswordInfo) error
+	Create(repo.Transaction, PasswordInfo) error
+}
+
+func NewPasswordInfoRepo() PasswordInfoRepo {
+	return &memPasswordInfoRepo{
+		pws: make(map[string]PasswordInfo),
+	}
+}
+
+type memPasswordInfoRepo struct {
+	pws map[string]PasswordInfo
+}
+
+func (m *memPasswordInfoRepo) Get(_ repo.Transaction, id string) (PasswordInfo, error) {
+	pw, ok := m.pws[id]
+	if !ok {
+		return PasswordInfo{}, ErrorNotFound
+	}
+	return pw, nil
+}
+
+func (m *memPasswordInfoRepo) Create(_ repo.Transaction, pw PasswordInfo) error {
+	_, ok := m.pws[pw.UserID]
+	if ok {
+		return ErrorDuplicateID
+	}
+
+	if pw.UserID == "" {
+		return ErrorInvalidID
+	}
+
+	if len(pw.Password) == 0 {
+		return ErrorInvalidPassword
+	}
+
+	m.pws[pw.UserID] = pw
+	return nil
+}
+
+func (m *memPasswordInfoRepo) Update(_ repo.Transaction, pw PasswordInfo) error {
+	if pw.UserID == "" {
+		return ErrorInvalidID
+	}
+
+	_, ok := m.pws[pw.UserID]
+	if !ok {
+		return ErrorNotFound
+	}
+
+	if len(pw.Password) == 0 {
+		return ErrorInvalidPassword
+	}
+
+	m.pws[pw.UserID] = pw
+	return nil
+}
+
+func (u *PasswordInfo) UnmarshalJSON(data []byte) error {
+	var dec struct {
+		UserID            string    `json:"userId"`
+		PasswordHash      string    `json:"passwordHash"`
+		PasswordPlaintext string    `json:"passwordPlaintext"`
+		PasswordExpires   time.Time `json:"passwordExpires"`
+	}
+
+	err := json.Unmarshal(data, &dec)
+	if err != nil {
+		return fmt.Errorf("invalid User entry: %v", err)
+	}
+
+	u.UserID = dec.UserID
+
+	u.PasswordExpires = dec.PasswordExpires
+
+	if len(dec.PasswordHash) != 0 {
+		if dec.PasswordPlaintext != "" {
+			return ErrorInvalidPassword
+		}
+		u.Password = Password(dec.PasswordHash)
+	} else if dec.PasswordPlaintext != "" {
+		u.Password, err = NewPasswordFromPlaintext(dec.PasswordPlaintext)
+		if err != nil {
+			return err
+		}
+
+	}
+	return nil
+}
+
+func newPasswordInfosFromReader(r io.Reader) ([]PasswordInfo, error) {
+	var pws []PasswordInfo
+	err := json.NewDecoder(r).Decode(&pws)
+	return pws, err
+}
+
+func readPasswordInfosFromFile(loc string) ([]PasswordInfo, error) {
+	pwf, err := os.Open(loc)
+	if err != nil {
+		return nil, fmt.Errorf("unable to read password info from file %q: %v", loc, err)
+	}
+
+	return newPasswordInfosFromReader(pwf)
+}
+
+func LoadPasswordInfos(repo PasswordInfoRepo, pws []PasswordInfo) error {
+	for i, pw := range pws {
+		err := repo.Create(nil, pw)
+		if err != nil {
+			return fmt.Errorf("error loading PasswordInfo[%d]: %q", i, err)
+		}
+	}
+	return nil
+}
+
+func NewPasswordInfoRepoFromPasswordInfos(pws []PasswordInfo) PasswordInfoRepo {
+	memRepo := NewPasswordInfoRepo().(*memPasswordInfoRepo)
+	for _, pw := range pws {
+		memRepo.pws[pw.UserID] = pw
+	}
+	return memRepo
+}
+
+func NewPasswordInfoRepoFromFile(loc string) (PasswordInfoRepo, error) {
+	pws, err := readPasswordInfosFromFile(loc)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewPasswordInfoRepoFromPasswordInfos(pws), nil
+}
+
+func NewPasswordReset(user User, password Password, issuer url.URL, clientID string, callback url.URL, expires time.Duration) PasswordReset {
+	claims := oidc.NewClaims(issuer.String(), user.ID, clientID, clock.Now(), clock.Now().Add(expires))
+	claims.Add(ClaimPasswordResetCallback, callback.String())
+	claims.Add(ClaimPasswordResetPassword, string(password))
+	return PasswordReset{claims}
+}
+
+type PasswordReset struct {
+	claims jose.Claims
+}
+
+// Token serializes the PasswordReset into a signed JWT.
+func (e PasswordReset) Token(signer jose.Signer) (string, error) {
+	if signer == nil {
+		return "", errors.New("no signer")
+	}
+
+	jwt, err := jose.NewSignedJWT(e.claims, signer)
+	if err != nil {
+		return "", err
+	}
+
+	return jwt.Encode(), nil
+}
+
+// ParseAndVerifyPasswordResetToken parses a string into a an PasswordReset, verifies the signature, and ensures that required claims are present.
+// In addition to the usual claims required by the OIDC spec, "aud" and "sub" must be present as well as ClaimPasswordResetCallback, ClaimPasswordResetEmail and ClaimPasswordResetPassword.
+func ParseAndVerifyPasswordResetToken(token string, issuer url.URL, keys []key.PublicKey) (PasswordReset, error) {
+	jwt, err := jose.ParseJWT(token)
+	if err != nil {
+		return PasswordReset{}, err
+	}
+
+	claims, err := jwt.Claims()
+	if err != nil {
+		return PasswordReset{}, err
+	}
+
+	cb, ok, err := claims.StringClaim(ClaimPasswordResetCallback)
+	if err != nil {
+		return PasswordReset{}, err
+	}
+	var clientID string
+	if ok && cb != "" {
+		clientID, ok, err = claims.StringClaim("aud")
+		if err != nil {
+			return PasswordReset{}, err
+		}
+		if !ok || clientID == "" {
+			return PasswordReset{}, errors.New("no aud(client ID) claim")
+		}
+	}
+	if _, err := url.Parse(cb); err != nil {
+		return PasswordReset{}, fmt.Errorf("callback URL not parseable: %v", cb)
+	}
+
+	pw, ok, err := claims.StringClaim(ClaimPasswordResetPassword)
+	if err != nil {
+		return PasswordReset{}, err
+	}
+	if pw == "" {
+		return PasswordReset{}, fmt.Errorf("no %q claim", ClaimPasswordResetPassword)
+	}
+
+	sub, ok, err := claims.StringClaim("sub")
+	if err != nil {
+		return PasswordReset{}, err
+	}
+	if sub == "" {
+		return PasswordReset{}, errors.New("no sub claim")
+	}
+
+	noop := func() error { return nil }
+
+	keysFunc := func() []key.PublicKey {
+		return keys
+	}
+
+	verifier := oidc.NewJWTVerifier(issuer.String(), clientID, noop, keysFunc)
+	if err := verifier.Verify(jwt); err != nil {
+		return PasswordReset{}, err
+	}
+
+	return PasswordReset{
+		claims: claims,
+	}, nil
+
+}
+
+func (e PasswordReset) UserID() string {
+	uid, ok, err := e.claims.StringClaim("sub")
+	if !ok || err != nil {
+		panic("PasswordReset: no sub claim. This should be impossible.")
+	}
+	return uid
+}
+
+func (e PasswordReset) Password() Password {
+	pw, ok, err := e.claims.StringClaim(ClaimPasswordResetPassword)
+	if !ok || err != nil {
+		panic("PasswordReset: no password claim. This should be impossible.")
+	}
+	return Password(pw)
+}
+
+func (e PasswordReset) Callback() *url.URL {
+	cb, ok, err := e.claims.StringClaim(ClaimPasswordResetCallback)
+	if err != nil {
+		panic("PasswordReset: error getting string claim. This should be impossible.")
+	}
+
+	if !ok || cb == "" {
+		return nil
+	}
+
+	cbURL, err := url.Parse(cb)
+	if err != nil {
+		panic("EmailVerificaiton: can't parse callback. This should be impossible.")
+	}
+	return cbURL
+}
diff --git a/user/password_test.go b/user/password_test.go
new file mode 100644
index 00000000..264eafbe
--- /dev/null
+++ b/user/password_test.go
@@ -0,0 +1,243 @@
+package user
+
+import (
+	"net/url"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/jonboulle/clockwork"
+	"github.com/kylelemons/godebug/pretty"
+	"golang.org/x/crypto/bcrypt"
+
+	"github.com/coreos/go-oidc/jose"
+	"github.com/coreos/go-oidc/key"
+)
+
+func TestNewPasswordInfosFromReader(t *testing.T) {
+	PasswordHasher = func(plaintext string) ([]byte, error) {
+		return []byte(strings.ToUpper(plaintext)), nil
+	}
+	defer func() {
+		PasswordHasher = DefaultPasswordHasher
+	}()
+
+	tests := []struct {
+		json string
+		want []PasswordInfo
+	}{
+		{
+			json: `[{"userId":"12345","passwordPlaintext":"password"},{"userId":"78901","passwordHash":"WORDPASS", "passwordExpires":"2006-01-01T15:04:05Z"}]`,
+			want: []PasswordInfo{
+				{
+					UserID:   "12345",
+					Password: []byte("PASSWORD"),
+				},
+				{
+					UserID:   "78901",
+					Password: []byte("WORDPASS"),
+					PasswordExpires: time.Date(2006,
+						1, 1, 15, 4, 5, 0, time.UTC),
+				},
+			},
+		},
+	}
+
+	for i, tt := range tests {
+		r := strings.NewReader(tt.json)
+		us, err := newPasswordInfosFromReader(r)
+		if err != nil {
+			t.Errorf("case %d: want nil err: %v", i, err)
+			continue
+		}
+		if diff := pretty.Compare(tt.want, us); diff != "" {
+			t.Errorf("case %d: Compare(want, got): %v", i, diff)
+		}
+	}
+}
+
+func TestNewPasswordFromHash(t *testing.T) {
+	tests := []string{
+		"test",
+		"1",
+	}
+
+	for i, plaintext := range tests {
+		p, err := NewPasswordFromPlaintext(plaintext)
+		if err != nil {
+			t.Errorf("case %d: unexpected error: %q", i, err)
+			continue
+		}
+		if err = bcrypt.CompareHashAndPassword([]byte(p), []byte(plaintext)); err != nil {
+			t.Errorf("case %d: err comparing hash and plaintext: %q", i, err)
+		}
+	}
+}
+
+func TestNewPasswordReset(t *testing.T) {
+	clock = clockwork.NewFakeClock()
+	defer func() {
+		clock = clockwork.NewRealClock()
+	}()
+
+	now := clock.Now()
+
+	issuer, _ := url.Parse("http://example.com")
+	clientID := "myclient"
+	usr := User{ID: "123456", Email: "user@example.com"}
+	callback := "http://client.example.com/callback"
+	expires := time.Hour * 3
+	password := Password("passy")
+
+	tests := []struct {
+		user     User
+		password Password
+		issuer   url.URL
+		clientID string
+		callback string
+		expires  time.Duration
+		want     jose.Claims
+	}{
+		{
+			issuer:   *issuer,
+			clientID: clientID,
+			user:     usr,
+			callback: callback,
+			expires:  expires,
+			password: password,
+			want: map[string]interface{}{
+				"iss": issuer.String(),
+				"aud": clientID,
+				ClaimPasswordResetCallback: callback,
+				ClaimPasswordResetPassword: string(password),
+				"exp": float64(now.Add(expires).Unix()),
+				"sub": usr.ID,
+				"iat": float64(now.Unix()),
+			},
+		},
+	}
+
+	for i, tt := range tests {
+		cbURL, err := url.Parse(tt.callback)
+		if err != nil {
+			t.Fatalf("case %d: non-nil err: %q", i, err)
+		}
+		ev := NewPasswordReset(tt.user, tt.password, tt.issuer, tt.clientID, *cbURL, tt.expires)
+
+		if diff := pretty.Compare(tt.want, ev.claims); diff != "" {
+			t.Errorf("case %d: Compare(want, got): %v", i, diff)
+		}
+
+		if diff := pretty.Compare(ev.Password(), password); diff != "" {
+			t.Errorf("case %d: Compare(want, got): %v", i, diff)
+		}
+	}
+}
+
+func TestPasswordResetParseAndVerify(t *testing.T) {
+
+	issuer, _ := url.Parse("http://example.com")
+	otherIssuer, _ := url.Parse("http://bad.example.com")
+	client := "myclient"
+	user := User{ID: "1234", Email: "user@example.com"}
+	callback, _ := url.Parse("http://client.example.com")
+	expires := time.Hour * 3
+	password := Password("passy")
+
+	goodPR := NewPasswordReset(user, password, *issuer, client, *callback, expires)
+	goodPRNoCB := NewPasswordReset(user, password, *issuer, "", url.URL{}, expires)
+	expiredPR := NewPasswordReset(user, password, *issuer, client, *callback, -expires)
+	wrongIssuerPR := NewPasswordReset(user, password, *otherIssuer, client, *callback, expires)
+	noSubPR := NewPasswordReset(User{}, password, *issuer, client, *callback, expires)
+	noPWPR := NewPasswordReset(user, Password(""), *issuer, client, *callback, expires)
+	noClientPR := NewPasswordReset(user, password, *issuer, "", *callback, expires)
+
+	privKey, err := key.GeneratePrivateKey()
+	if err != nil {
+		t.Fatalf("Failed to generate private key, error=%v", err)
+	}
+	signer := privKey.Signer()
+
+	privKey2, err := key.GeneratePrivateKey()
+	if err != nil {
+		t.Fatalf("Failed to generate private key, error=%v", err)
+	}
+	otherSigner := privKey2.Signer()
+
+	tests := []struct {
+		ev      PasswordReset
+		wantErr bool
+		signer  jose.Signer
+	}{
+
+		{
+			ev:      goodPR,
+			signer:  signer,
+			wantErr: false,
+		},
+		{
+			ev:      goodPRNoCB,
+			signer:  signer,
+			wantErr: false,
+		},
+
+		{
+			ev:      expiredPR,
+			signer:  signer,
+			wantErr: true,
+		},
+		{
+			ev:      wrongIssuerPR,
+			signer:  signer,
+			wantErr: true,
+		},
+		{
+			ev:      goodPR,
+			signer:  otherSigner,
+			wantErr: true,
+		},
+		{
+			ev:      noSubPR,
+			signer:  signer,
+			wantErr: true,
+		},
+		{
+			ev:      noPWPR,
+			signer:  signer,
+			wantErr: true,
+		},
+		{
+			ev:      noClientPR,
+			signer:  signer,
+			wantErr: true,
+		},
+	}
+
+	for i, tt := range tests {
+
+		token, err := tt.ev.Token(tt.signer)
+		if err != nil {
+			t.Errorf("case %d: non-nil error creating token: %v", i, err)
+		}
+
+		ev, err := ParseAndVerifyPasswordResetToken(token, *issuer,
+			[]key.PublicKey{*key.NewPublicKey(privKey.JWK())})
+
+		if tt.wantErr {
+			t.Logf("err: %v", err)
+			if err == nil {
+				t.Errorf("case %d: want non-nil err, got nil", i)
+			}
+			continue
+		}
+
+		if err != nil {
+			t.Errorf("case %d: non-nil err: %q", i, err)
+
+		}
+
+		if diff := pretty.Compare(tt.ev.claims, ev.claims); diff != "" {
+			t.Errorf("case %d: Compare(want, got): %v", i, diff)
+		}
+	}
+}
diff --git a/user/user.go b/user/user.go
new file mode 100644
index 00000000..97963c65
--- /dev/null
+++ b/user/user.go
@@ -0,0 +1,407 @@
+package user
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"time"
+
+	"net/mail"
+	"os"
+	"sort"
+
+	"code.google.com/p/go-uuid/uuid"
+
+	"github.com/coreos/dex/repo"
+	"github.com/coreos/go-oidc/jose"
+)
+
+const (
+	MaxEmailLength = 200
+)
+
+type UserIDGenerator func() (string, error)
+
+func DefaultUserIDGenerator() (string, error) {
+	return uuid.New(), nil
+}
+
+type User struct {
+	// ID is the machine-generated, stable, unique identifier for this User.
+	ID string
+
+	// DisplayName is human readable name meant for display purposes.
+	// DisplayName is not neccesarily unique with a UserRepo.
+	DisplayName string
+
+	Email string
+
+	EmailVerified bool
+
+	Admin bool
+
+	CreatedAt time.Time
+}
+
+type UserFilter struct {
+	// TODO(bobbyrullo): actually put stuff in here.
+}
+
+// AddToClaims adds basic information about the user to the given Claims.
+// http://openid.net/specs/openid-connect-core-1_0.html#StandardClaims
+func (u *User) AddToClaims(claims jose.Claims) {
+	claims.Add("name", u.DisplayName)
+	if u.Email != "" {
+		claims.Add("email", u.Email)
+		if u.EmailVerified {
+			claims.Add("email_verified", true)
+		}
+	}
+}
+
+// UserRepo implementations maintain a persistent set of users.
+// The following invariants must be maintained:
+//  * Users must have a unique Email and ID
+//  * No other Users may have the same RemoteIdentity as one of the
+//    users. (This constraint may be relaxed in the future)
+type UserRepo interface {
+	Get(tx repo.Transaction, id string) (User, error)
+
+	// List returns a list of users meeting the given conditions.
+	// A nextPageToken is returned when there are further results to be had,
+	// with the expectation that it will be passed into a subsequent List
+	// call. When nextPageToken is non-empty filter and maxResults are ignored.
+	List(tx repo.Transaction, filter UserFilter, maxResults int, nextPageToken string) ([]User, string, error)
+
+	Create(repo.Transaction, User) error
+
+	GetByEmail(tx repo.Transaction, email string) (User, error)
+
+	Update(repo.Transaction, User) error
+
+	GetByRemoteIdentity(repo.Transaction, RemoteIdentity) (User, error)
+
+	AddRemoteIdentity(tx repo.Transaction, userID string, remoteID RemoteIdentity) error
+
+	RemoveRemoteIdentity(tx repo.Transaction, userID string, remoteID RemoteIdentity) error
+
+	GetRemoteIdentities(tx repo.Transaction, userID string) ([]RemoteIdentity, error)
+
+	GetAdminCount(repo.Transaction) (int, error)
+}
+
+var (
+	ErrorDuplicateID    = errors.New("ID not available")
+	ErrorDuplicateEmail = errors.New("email not available")
+
+	ErrorDuplicateRemoteIdentity = errors.New("remote identity already in use for another user")
+	ErrorInvalidEmail            = errors.New("invalid Email")
+	ErrorInvalidID               = errors.New("invalid ID")
+	ErrorNotFound                = errors.New("user not found in repository")
+)
+
+// RemoteIdentity represents a User's identity at an IDP.
+type RemoteIdentity struct {
+	// IDPCID is the identifier of the IDP which hosts this identity.
+	ConnectorID string
+
+	// ID is the identifier of this User at the IDP.
+	ID string
+}
+
+func ValidEmail(email string) bool {
+	address, err := mail.ParseAddress(email)
+	if err != nil {
+		return false
+	}
+
+	if address.Name != "" || address.Address == "" {
+		return false
+	}
+	return true
+}
+
+func ValidPassword(plaintext string) bool {
+	return len(plaintext) > 5
+}
+
+// NewUserRepo returns an in-memory UserRepo useful for development.
+func NewUserRepo() UserRepo {
+	return &memUserRepo{
+		usersByID:         make(map[string]User),
+		userIDsByEmail:    make(map[string]string),
+		userIDsByRemoteID: make(map[RemoteIdentity]string),
+		remoteIDsByUserID: make(map[string]map[RemoteIdentity]struct{}),
+	}
+}
+
+type memUserRepo struct {
+	usersByID         map[string]User
+	userIDsByEmail    map[string]string
+	userIDsByRemoteID map[RemoteIdentity]string
+	remoteIDsByUserID map[string]map[RemoteIdentity]struct{}
+}
+
+func (r *memUserRepo) Get(_ repo.Transaction, id string) (User, error) {
+	user, ok := r.usersByID[id]
+	if !ok {
+		return User{}, ErrorNotFound
+	}
+	return user, nil
+}
+
+type usersByEmail []User
+
+func (s usersByEmail) Len() int           { return len(s) }
+func (s usersByEmail) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
+func (s usersByEmail) Less(i, j int) bool { return s[i].Email < s[j].Email }
+
+func (r *memUserRepo) List(tx repo.Transaction, filter UserFilter, maxResults int, nextPageToken string) ([]User, string, error) {
+	var offset int
+	var err error
+	if nextPageToken != "" {
+		filter, maxResults, offset, err = DecodeNextPageToken(nextPageToken)
+	}
+	if err != nil {
+		return nil, "", err
+	}
+
+	users := []User{}
+	for _, usr := range r.usersByID {
+		users = append(users, usr)
+	}
+
+	sort.Sort(usersByEmail(users))
+
+	high := offset + maxResults
+
+	var tok string
+	if high >= len(users) {
+		high = len(users)
+	} else {
+		tok, err = EncodeNextPageToken(filter, maxResults, high)
+	}
+
+	if err != nil {
+		return nil, "", err
+	}
+
+	if len(users[offset:high]) == 0 {
+		return nil, "", ErrorNotFound
+	}
+	return users[offset:high], tok, nil
+}
+
+func (r *memUserRepo) GetByEmail(tx repo.Transaction, email string) (User, error) {
+	userID, ok := r.userIDsByEmail[email]
+	if !ok {
+		return User{}, ErrorNotFound
+	}
+	return r.Get(tx, userID)
+}
+
+func (r *memUserRepo) Create(_ repo.Transaction, user User) error {
+	if user.ID == "" {
+		return ErrorInvalidID
+	}
+
+	if !ValidEmail(user.Email) {
+		return ErrorInvalidEmail
+	}
+
+	// make sure no one has the same ID; if using UUID the chances of this
+	// happening are astronomically small.
+	_, ok := r.usersByID[user.ID]
+	if ok {
+		return ErrorDuplicateID
+	}
+
+	// make sure there's no other user with the same Email
+	_, ok = r.userIDsByEmail[user.Email]
+	if ok {
+		return ErrorDuplicateEmail
+	}
+
+	r.set(user)
+	return nil
+}
+
+func (r *memUserRepo) Update(_ repo.Transaction, user User) error {
+	if user.ID == "" {
+		return ErrorInvalidID
+	}
+
+	if !ValidEmail(user.Email) {
+		return ErrorInvalidEmail
+	}
+
+	// make sure this user exists already
+	_, ok := r.usersByID[user.ID]
+	if !ok {
+		return ErrorNotFound
+	}
+
+	// make sure there's no other user with the same Email
+	otherID, ok := r.userIDsByEmail[user.Email]
+	if ok && otherID != user.ID {
+		return ErrorDuplicateEmail
+	}
+
+	r.set(user)
+	return nil
+}
+
+func (r *memUserRepo) AddRemoteIdentity(_ repo.Transaction, userID string, ri RemoteIdentity) error {
+	_, ok := r.usersByID[userID]
+	if !ok {
+		return ErrorNotFound
+	}
+	_, ok = r.userIDsByRemoteID[ri]
+	if ok {
+		return ErrorDuplicateRemoteIdentity
+	}
+
+	r.userIDsByRemoteID[ri] = userID
+	rIDs, ok := r.remoteIDsByUserID[userID]
+	if !ok {
+		rIDs = make(map[RemoteIdentity]struct{})
+		r.remoteIDsByUserID[userID] = rIDs
+	}
+
+	rIDs[ri] = struct{}{}
+	return nil
+}
+
+func (r *memUserRepo) RemoveRemoteIdentity(_ repo.Transaction, userID string, ri RemoteIdentity) error {
+	otherID, ok := r.userIDsByRemoteID[ri]
+	if !ok {
+		return ErrorNotFound
+	}
+	if otherID != userID {
+		return ErrorNotFound
+	}
+	delete(r.userIDsByRemoteID, ri)
+	delete(r.remoteIDsByUserID[userID], ri)
+	return nil
+}
+
+func (r *memUserRepo) GetByRemoteIdentity(_ repo.Transaction, ri RemoteIdentity) (User, error) {
+	userID, ok := r.userIDsByRemoteID[ri]
+	if !ok {
+		return User{}, ErrorNotFound
+	}
+
+	user, ok := r.usersByID[userID]
+	if !ok {
+		return User{}, ErrorNotFound
+	}
+	return user, nil
+}
+
+func (r *memUserRepo) GetRemoteIdentities(_ repo.Transaction, userID string) ([]RemoteIdentity, error) {
+	ids := []RemoteIdentity{}
+	for id := range r.remoteIDsByUserID[userID] {
+		ids = append(ids, id)
+	}
+	return ids, nil
+}
+
+func (r *memUserRepo) GetAdminCount(_ repo.Transaction) (int, error) {
+	var i int
+	for _, usr := range r.usersByID {
+		if usr.Admin {
+			i++
+		}
+	}
+	return i, nil
+}
+
+func (r *memUserRepo) set(user User) error {
+	r.usersByID[user.ID] = user
+	r.userIDsByEmail[user.Email] = user.ID
+	return nil
+}
+
+type UserWithRemoteIdentities struct {
+	User             User             `json:"user"`
+	RemoteIdentities []RemoteIdentity `json:"remoteIdentities"`
+}
+
+// NewUserRepoFromFile returns an in-memory UserRepo useful for development given a JSON serialized file of Users.
+func NewUserRepoFromFile(loc string) (UserRepo, error) {
+	us, err := readUsersFromFile(loc)
+	if err != nil {
+		return nil, err
+	}
+	return NewUserRepoFromUsers(us), nil
+}
+
+func NewUserRepoFromUsers(us []UserWithRemoteIdentities) UserRepo {
+	memUserRepo := NewUserRepo().(*memUserRepo)
+	for _, u := range us {
+		memUserRepo.set(u.User)
+		for _, ri := range u.RemoteIdentities {
+			memUserRepo.AddRemoteIdentity(nil, u.User.ID, ri)
+		}
+	}
+	return memUserRepo
+}
+
+func newUsersFromReader(r io.Reader) ([]UserWithRemoteIdentities, error) {
+	var us []UserWithRemoteIdentities
+	err := json.NewDecoder(r).Decode(&us)
+	return us, err
+}
+
+func readUsersFromFile(loc string) ([]UserWithRemoteIdentities, error) {
+	uf, err := os.Open(loc)
+	if err != nil {
+		return nil, fmt.Errorf("unable to read users from file %q: %v", loc, err)
+	}
+	defer uf.Close()
+
+	us, err := newUsersFromReader(uf)
+	if err != nil {
+		return nil, err
+	}
+
+	return us, err
+}
+
+func (u *User) UnmarshalJSON(data []byte) error {
+	var dec struct {
+		ID            string `json:"id"`
+		DisplayName   string `json:"displayName"`
+		Email         string `json:"email"`
+		EmailVerified bool   `json:"emailVerified"`
+	}
+
+	err := json.Unmarshal(data, &dec)
+	if err != nil {
+		return fmt.Errorf("invalid User entry: %v", err)
+	}
+
+	u.ID = dec.ID
+	u.DisplayName = dec.DisplayName
+	u.Email = dec.Email
+	u.EmailVerified = dec.EmailVerified
+	return nil
+}
+
+func (u *RemoteIdentity) UnmarshalJSON(data []byte) error {
+	var dec struct {
+		ConnectorID string `json:"connectorID"`
+		ID          string `json:"id"`
+	}
+
+	err := json.Unmarshal(data, &dec)
+	if err != nil {
+		return fmt.Errorf("invalid RemoteIdentity entry: %v", err)
+	}
+
+	u.ID = dec.ID
+	u.ConnectorID = dec.ConnectorID
+
+	return nil
+}
diff --git a/user/user_test.go b/user/user_test.go
new file mode 100644
index 00000000..31eeb082
--- /dev/null
+++ b/user/user_test.go
@@ -0,0 +1,139 @@
+package user
+
+import (
+	"reflect"
+	"strings"
+	"testing"
+
+	"github.com/kylelemons/godebug/pretty"
+
+	"github.com/coreos/go-oidc/jose"
+)
+
+func TestNewUsersFromReader(t *testing.T) {
+	tests := []struct {
+		json string
+		want []UserWithRemoteIdentities
+	}{
+		{
+			json: `[{"user":{"id":"12345", "displayName": "Elroy Canis", "email":"elroy23@example.com"}, "remoteIdentities":[{"connectorID":"google", "id":"elroy@example.com"}] }]`,
+			want: []UserWithRemoteIdentities{
+				{
+					User: User{
+						ID:          "12345",
+						DisplayName: "Elroy Canis",
+						Email:       "elroy23@example.com",
+					},
+					RemoteIdentities: []RemoteIdentity{
+						{
+							ConnectorID: "google",
+							ID:          "elroy@example.com",
+						},
+					},
+				},
+			},
+		},
+	}
+
+	for i, tt := range tests {
+		r := strings.NewReader(tt.json)
+		us, err := newUsersFromReader(r)
+		if err != nil {
+			t.Errorf("case %d: want nil err: %v", i, err)
+			continue
+		}
+		if diff := pretty.Compare(tt.want, us); diff != "" {
+			t.Errorf("case %d: Compare(want, got): %v", i, diff)
+		}
+	}
+}
+
+func TestAddToClaims(t *testing.T) {
+	tests := []struct {
+		user         User
+		wantedClaims jose.Claims
+	}{
+		{
+			user: User{
+				DisplayName: "Test User Name",
+			},
+			wantedClaims: jose.Claims{
+				"name": "Test User Name",
+			},
+		},
+		{
+			user: User{
+				DisplayName: "Test User Name",
+				Email:       "unverified@example.com",
+			},
+			wantedClaims: jose.Claims{
+				"name":  "Test User Name",
+				"email": "unverified@example.com",
+			},
+		},
+		{
+			user: User{
+				DisplayName:   "Test User Name",
+				Email:         "verified@example.com",
+				EmailVerified: true,
+			},
+			wantedClaims: jose.Claims{
+				"name":           "Test User Name",
+				"email":          "verified@example.com",
+				"email_verified": true,
+			},
+		},
+	}
+
+	for i, tt := range tests {
+		claims := jose.Claims{}
+		tt.user.AddToClaims(claims)
+		if !reflect.DeepEqual(claims, tt.wantedClaims) {
+			t.Errorf("case %d: want=%#v, got=%#v", i, tt.wantedClaims, claims)
+		}
+	}
+}
+
+func TestValidEmail(t *testing.T) {
+	tests := []struct {
+		email string
+		want  bool
+	}{
+		{"example@example.com", true},
+		{"r@r.com", true},
+		{"Barry Gibbs <bg@example.com>", false},
+		{"", false},
+	}
+
+	for i, tt := range tests {
+		if ValidEmail(tt.email) != tt.want {
+			t.Errorf("case %d: want=%v, got=%v", i, tt.want, !tt.want)
+		}
+	}
+}
+
+func TestEncodeDecodeNextPageToken(t *testing.T) {
+	tests := []nextPageToken{
+		{},
+		{MaxResults: 100},
+		{Offset: 200},
+		{MaxResults: 20, Offset: 30},
+	}
+
+	for i, tt := range tests {
+		enc, err := EncodeNextPageToken(tt.Filter, tt.MaxResults, tt.Offset)
+		if err != nil {
+			t.Errorf("case %d: unexpected err encoding: %q", i, err)
+		}
+
+		dec := nextPageToken{}
+		dec.Filter, dec.MaxResults, dec.Offset, err = DecodeNextPageToken(enc)
+		if err != nil {
+			t.Errorf("case %d: unexpected err decoding: %q", i, err)
+		}
+
+		if diff := pretty.Compare(tt, dec); diff != "" {
+			t.Errorf("case %d: Compare(want, got): %v", i, diff)
+		}
+	}
+}
diff --git a/user/util.go b/user/util.go
new file mode 100644
index 00000000..f62fb2f4
--- /dev/null
+++ b/user/util.go
@@ -0,0 +1,48 @@
+package user
+
+import (
+	"encoding/base64"
+	"encoding/json"
+)
+
+// nextPageToken exists solely for JSON marshaling/unmarshaling nextPage params.
+// It is not exported because we want nextPageTokens to be opaque and not rely
+// on any specific encoding. However, because this encoding happens to be useful
+// for both the in-mem and DB repo, we export the {Encode,Decode}NextPageToken
+// functions.
+type nextPageToken struct {
+	Filter     UserFilter
+	MaxResults int
+	Offset     int
+}
+
+func EncodeNextPageToken(filter UserFilter, maxResults int, offset int) (string, error) {
+	tok := nextPageToken{
+		Filter:     filter,
+		MaxResults: maxResults,
+		Offset:     offset,
+	}
+
+	b, err := json.Marshal(&tok)
+	if err != nil {
+		return "", err
+	}
+
+	enc := base64.URLEncoding.EncodeToString(b)
+	return enc, nil
+}
+
+func DecodeNextPageToken(tok string) (UserFilter, int, int, error) {
+	b, err := base64.URLEncoding.DecodeString(tok)
+	if err != nil {
+		return UserFilter{}, 0, 0, err
+	}
+
+	var npt nextPageToken
+	err = json.Unmarshal(b, &npt)
+	if err != nil {
+		return UserFilter{}, 0, 0, err
+	}
+
+	return npt.Filter, npt.MaxResults, npt.Offset, nil
+}